diff --git a/java-common-protos/.github/CODEOWNERS b/java-common-protos/.github/CODEOWNERS
new file mode 100644
index 0000000000..db2d8ad174
--- /dev/null
+++ b/java-common-protos/.github/CODEOWNERS
@@ -0,0 +1,13 @@
+# Code owners file.
+# This file controls who is tagged for review for any given pull request.
+
+# For syntax help see:
+# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
+
+*                       @googleapis/yoshi-java
+
+# The java-samples-reviewers team is the default owner for samples changes
+samples/**/*.java       @googleapis/java-samples-reviewers
+
+# Generated snippets should not be owned by samples reviewers
+samples/snippets/generated/       @googleapis/yoshi-java
diff --git a/java-common-protos/.github/ISSUE_TEMPLATE/bug_report.md b/java-common-protos/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..9bfcd1fe02
--- /dev/null
+++ b/java-common-protos/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,51 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+Thanks for stopping by to let us know something could be better!
+
+**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response.
+
+Please run down the following list and make sure you've tried the usual "quick fixes":
+
+  - Search the issues already opened: https://github.com/googleapis/java-common-protos/issues
+  - Check for answers on StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform
+
+If you are still having issues, please include as much information as possible:
+
+#### Environment details
+
+1. Specify the API at the beginning of the title. For example, "BigQuery: ...").
+   General, Core, and Other are also allowed as types
+2. OS type and version:
+3. Java version:
+4.  version(s):
+
+#### Steps to reproduce
+
+  1. ?
+  2. ?
+
+#### Code example
+
+```java
+// example
+```
+
+#### Stack trace
+```
+Any relevant stacktrace here.
+```
+
+#### External references such as API reference guides
+
+- ?
+
+#### Any additional information below
+
+
+Following these steps guarantees the quickest resolution possible.
+
+Thanks!
diff --git a/java-common-protos/.github/ISSUE_TEMPLATE/feature_request.md b/java-common-protos/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..754e30c68a
--- /dev/null
+++ b/java-common-protos/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Suggest an idea for this library
+
+---
+
+Thanks for stopping by to let us know something could be better!
+
+**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response.
+
+**Is your feature request related to a problem? Please describe.**
+What the problem is. Example: I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+What you want to happen.
+
+**Describe alternatives you've considered**
+Any alternative solutions or features you've considered.
+
+**Additional context**
+Any other context or screenshots about the feature request.
diff --git a/java-common-protos/.github/ISSUE_TEMPLATE/support_request.md b/java-common-protos/.github/ISSUE_TEMPLATE/support_request.md
new file mode 100644
index 0000000000..9958690321
--- /dev/null
+++ b/java-common-protos/.github/ISSUE_TEMPLATE/support_request.md
@@ -0,0 +1,7 @@
+---
+name: Support request
+about: If you have a support contract with Google, please create an issue in the Google Cloud Support console.
+
+---
+
+**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response.
diff --git a/java-common-protos/.github/PULL_REQUEST_TEMPLATE.md b/java-common-protos/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..7d3626fbb5
--- /dev/null
+++ b/java-common-protos/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,10 @@
+Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
+- [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/java-common-protos/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
+- [ ] Ensure the tests and linter pass
+- [ ] Code coverage does not decrease (if any source code was changed)
+- [ ] Appropriate docs were updated (if necessary)
+
+Fixes #<issue_number_goes_here> ☕️
+
+If you write sample code, please follow the [samples format](
+https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md).
diff --git a/java-common-protos/.github/auto-label.yaml b/java-common-protos/.github/auto-label.yaml
new file mode 100644
index 0000000000..4caef688b7
--- /dev/null
+++ b/java-common-protos/.github/auto-label.yaml
@@ -0,0 +1,15 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+requestsize:
+  enabled: true
diff --git a/java-common-protos/.github/blunderbuss.yml b/java-common-protos/.github/blunderbuss.yml
new file mode 100644
index 0000000000..2176b05432
--- /dev/null
+++ b/java-common-protos/.github/blunderbuss.yml
@@ -0,0 +1,7 @@
+# Configuration for the Blunderbuss GitHub app. For more info see
+# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss
+assign_prs_by:
+- labels:
+  - samples
+  to:
+  - googleapis/java-samples-reviewers
\ No newline at end of file
diff --git a/java-common-protos/.github/generated-files-bot.yml b/java-common-protos/.github/generated-files-bot.yml
new file mode 100644
index 0000000000..c644a24e11
--- /dev/null
+++ b/java-common-protos/.github/generated-files-bot.yml
@@ -0,0 +1,12 @@
+externalManifests:
+- type: json
+  file: 'synth.metadata'
+  jsonpath: '$.generatedFiles[*]'
+- type: json
+  file: '.github/readme/synth.metadata/synth.metadata'
+  jsonpath: '$.generatedFiles[*]'
+ignoreAuthors:
+- 'renovate-bot'
+- 'yoshi-automation'
+- 'release-please[bot]'
+- 'gcf-owl-bot[bot]'
diff --git a/java-common-protos/.github/release-please.yml b/java-common-protos/.github/release-please.yml
new file mode 100644
index 0000000000..8ca7f9cabc
--- /dev/null
+++ b/java-common-protos/.github/release-please.yml
@@ -0,0 +1,3 @@
+bumpMinorPreMajor: true
+handleGHRelease: true
+releaseType: java-yoshi
diff --git a/java-common-protos/.github/release-trigger.yml b/java-common-protos/.github/release-trigger.yml
new file mode 100644
index 0000000000..d4ca94189e
--- /dev/null
+++ b/java-common-protos/.github/release-trigger.yml
@@ -0,0 +1 @@
+enabled: true
diff --git a/java-common-protos/.github/snippet-bot.yml b/java-common-protos/.github/snippet-bot.yml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/java-common-protos/.github/sync-repo-settings.yaml b/java-common-protos/.github/sync-repo-settings.yaml
new file mode 100644
index 0000000000..72acb9d8fa
--- /dev/null
+++ b/java-common-protos/.github/sync-repo-settings.yaml
@@ -0,0 +1,63 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# Whether or not rebase-merging is enabled on this repository.
+# Defaults to `true`
+rebaseMergeAllowed: false
+
+# Whether or not squash-merging is enabled on this repository.
+# Defaults to `true`
+squashMergeAllowed: true
+
+# Whether or not PRs are merged with a merge commit on this repository.
+# Defaults to `false`
+mergeCommitAllowed: false
+
+# Rules for main branch protection
+branchProtectionRules:
+# Identifies the protection rule pattern. Name of the branch to be protected.
+# Defaults to `main`
+- pattern: main
+  # Can admins overwrite branch protection.
+  # Defaults to `true`
+  isAdminEnforced: true
+  # Number of approving reviews required to update matching branches.
+  # Defaults to `1`
+  requiredApprovingReviewCount: 1
+  # Are reviews from code owners required to update matching branches.
+  # Defaults to `false`
+  requiresCodeOwnerReviews: true
+  # Require up to date branches
+  requiresStrictStatusChecks: false
+  # List of required status check contexts that must pass for commits to be accepted to matching branches.
+  requiredStatusCheckContexts:
+  - "dependencies (11)"
+  - "lint"
+  - "units (8)"
+  - "units (11)"
+  - "Kokoro - Test: Integration"
+  - "cla/google"
+  - "OwlBot Post Processor"
+  - "Kokoro - Test: Java GraalVM Native Image"
+  - "Kokoro - Test: Java 17 GraalVM Native Image"
+# List of explicit permissions to add (additive only)
+permissionRules:
+- team: yoshi-admins
+  permission: admin
+- team: yoshi-java-admins
+  permission: admin
+- team: yoshi-java
+  permission: push
+- team: java-samples-reviewers
+  permission: push
+
diff --git a/java-common-protos/.github/trusted-contribution.yml b/java-common-protos/.github/trusted-contribution.yml
new file mode 100644
index 0000000000..a0ba1f7d90
--- /dev/null
+++ b/java-common-protos/.github/trusted-contribution.yml
@@ -0,0 +1,3 @@
+trustedContributors:
+- renovate-bot
+- gcf-owl-bot[bot]
diff --git a/java-common-protos/.github/workflows/approve-readme.yaml b/java-common-protos/.github/workflows/approve-readme.yaml
new file mode 100644
index 0000000000..f5fc7d5169
--- /dev/null
+++ b/java-common-protos/.github/workflows/approve-readme.yaml
@@ -0,0 +1,69 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# Github action job to test core java library features on
+# downstream client libraries before they are released.
+on:
+  pull_request:
+name: auto-merge-readme
+jobs:
+  approve:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme'
+    steps:
+      - uses: actions/github-script@v6
+        with:
+          github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
+          script: |
+            // only approve PRs from yoshi-automation
+            if (context.payload.pull_request.user.login !== "yoshi-automation") {
+              return;
+            }
+
+            // only approve PRs like "chore: release <release version>"
+            if (!context.payload.pull_request.title === "chore: regenerate README") {
+              return;
+            }
+
+            // only approve PRs with README.md and synth.metadata changes
+            const files = new Set(
+              (
+                await github.paginate(
+                  github.pulls.listFiles.endpoint({
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    pull_number: context.payload.pull_request.number,
+                  })
+                )
+              ).map(file => file.filename)
+            );
+            if (files.size != 2 || !files.has("README.md") || !files.has(".github/readme/synth.metadata/synth.metadata")) {
+              return;
+            }
+
+            // approve README regeneration PR
+            await github.pulls.createReview({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: 'Rubber stamped PR!',
+              pull_number: context.payload.pull_request.number,
+              event: 'APPROVE'
+            });
+
+            // attach automerge label
+            await github.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.payload.pull_request.number,
+              labels: ['automerge']
+            });
diff --git a/java-common-protos/.github/workflows/ci.yaml b/java-common-protos/.github/workflows/ci.yaml
new file mode 100644
index 0000000000..e3bb26e377
--- /dev/null
+++ b/java-common-protos/.github/workflows/ci.yaml
@@ -0,0 +1,89 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# Github action job to test core java library features on
+# downstream client libraries before they are released.
+on:
+  push:
+    branches:
+    - main
+  pull_request:
+name: ci
+jobs:
+  units:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [8, 11, 17]
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v3
+      with:
+        distribution: zulu
+        java-version: ${{matrix.java}}
+    - run: java -version
+    - run: .kokoro/build.sh
+      env:
+        JOB_TYPE: test
+  windows:
+    runs-on: windows-latest
+    steps:
+    - name: Support longpaths
+      run: git config --system core.longpaths true
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v3
+      with:
+        distribution: zulu
+        java-version: 8
+    - run: java -version
+    - run: .kokoro/build.bat
+      env:
+        JOB_TYPE: test
+  dependencies:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [8, 11, 17]
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v3
+      with:
+        distribution: zulu
+        java-version: ${{matrix.java}}
+    - run: java -version
+    - run: .kokoro/dependencies.sh
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v3
+      with:
+        distribution: zulu
+        java-version: 11
+    - run: java -version
+    - run: .kokoro/build.sh
+      env:
+        JOB_TYPE: lint
+  clirr:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v3
+      with:
+        distribution: zulu
+        java-version: 8
+    - run: java -version
+    - run: .kokoro/build.sh
+      env:
+        JOB_TYPE: clirr
diff --git a/java-common-protos/.kokoro/build.bat b/java-common-protos/.kokoro/build.bat
new file mode 100644
index 0000000000..067cf4a4c4
--- /dev/null
+++ b/java-common-protos/.kokoro/build.bat
@@ -0,0 +1,18 @@
+:: Copyright 2022 Google LLC
+::
+:: Licensed under the Apache License, Version 2.0 (the "License");
+:: you may not use this file except in compliance with the License.
+:: You may obtain a copy of the License at
+::
+::      http://www.apache.org/licenses/LICENSE-2.0
+::
+:: Unless required by applicable law or agreed to in writing, software
+:: distributed under the License is distributed on an "AS IS" BASIS,
+:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+:: See the License for the specific language governing permissions and
+:: limitations under the License.
+:: Github action job to test core java library features on
+:: downstream client libraries before they are released.
+:: See documentation in type-shell-output.bat
+
+"C:\Program Files\Git\bin\bash.exe" %~dp0build.sh
diff --git a/java-common-protos/.kokoro/build.sh b/java-common-protos/.kokoro/build.sh
new file mode 100755
index 0000000000..2740275207
--- /dev/null
+++ b/java-common-protos/.kokoro/build.sh
@@ -0,0 +1,134 @@
+#!/bin/bash
+# Copyright 2019 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+## Get the directory of the build script
+scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+## cd to the parent directory, i.e. the root of the git repo
+cd ${scriptDir}/..
+
+# include common functions
+source ${scriptDir}/common.sh
+
+# Print out Maven & Java version
+mvn -version
+echo ${JOB_TYPE}
+
+# attempt to install 3 times with exponential backoff (starting with 10 seconds)
+retry_with_backoff 3 10 \
+  mvn install -B -V -ntp \
+    -DskipTests=true \
+    -Dclirr.skip=true \
+    -Denforcer.skip=true \
+    -Dmaven.javadoc.skip=true \
+    -Dgcloud.download.skip=true \
+    -T 1C
+
+# if GOOGLE_APPLICATION_CREDENTIALS is specified as a relative path, prepend Kokoro root directory onto it
+if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then
+    export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS})
+fi
+
+RETURN_CODE=0
+set +e
+
+case ${JOB_TYPE} in
+test)
+    mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true
+    RETURN_CODE=$?
+    ;;
+lint)
+    mvn com.coveo:fmt-maven-plugin:check -B -ntp
+    RETURN_CODE=$?
+    ;;
+javadoc)
+    mvn javadoc:javadoc javadoc:test-javadoc -B -ntp
+    RETURN_CODE=$?
+    ;;
+integration)
+    mvn -B ${INTEGRATION_TEST_ARGS} \
+      -ntp \
+      -Penable-integration-tests \
+      -DtrimStackTrace=false \
+      -Dclirr.skip=true \
+      -Denforcer.skip=true \
+      -fae \
+      verify
+    RETURN_CODE=$?
+    ;;
+graalvm)
+    # Run Unit and Integration Tests with Native Image
+    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
+    RETURN_CODE=$?
+    ;;
+graalvm17)
+    # Run Unit and Integration Tests with Native Image
+    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
+    RETURN_CODE=$?
+    ;;
+samples)
+    SAMPLES_DIR=samples
+    # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise.
+    if [[ ! -z ${KOKORO_GITHUB_PULL_REQUEST_NUMBER} ]]
+    then
+      SAMPLES_DIR=samples/snapshot
+    fi
+
+    if [[ -f ${SAMPLES_DIR}/pom.xml ]]
+    then
+        for FILE in ${KOKORO_GFILE_DIR}/secret_manager/*-samples-secrets; do
+          [[ -f "$FILE" ]] || continue
+          source "$FILE"
+        done
+
+        pushd ${SAMPLES_DIR}
+        mvn -B \
+          -ntp \
+          -DtrimStackTrace=false \
+          -Dclirr.skip=true \
+          -Denforcer.skip=true \
+          -fae \
+          verify
+        RETURN_CODE=$?
+        popd
+    else
+        echo "no sample pom.xml found - skipping sample tests"
+    fi
+    ;;
+clirr)
+    mvn -B -ntp -Denforcer.skip=true clirr:check
+    RETURN_CODE=$?
+    ;;
+*)
+    ;;
+esac
+
+if [ "${REPORT_COVERAGE}" == "true" ]
+then
+  bash ${KOKORO_GFILE_DIR}/codecov.sh
+fi
+
+# fix output location of logs
+bash .kokoro/coerce_logs.sh
+
+if [[ "${ENABLE_FLAKYBOT}" == "true" ]]
+then
+    chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/flakybot
+    ${KOKORO_GFILE_DIR}/linux_amd64/flakybot -repo=googleapis/java-common-protos
+fi
+
+echo "exiting with ${RETURN_CODE}"
+exit ${RETURN_CODE}
diff --git a/java-common-protos/.kokoro/coerce_logs.sh b/java-common-protos/.kokoro/coerce_logs.sh
new file mode 100755
index 0000000000..46edbf7f2f
--- /dev/null
+++ b/java-common-protos/.kokoro/coerce_logs.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+# Copyright 2019 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This script finds and moves sponge logs so that they can be found by placer
+# and are not flagged as flaky by sponge.
+
+set -eo pipefail
+
+## Get the directory of the build script
+scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+## cd to the parent directory, i.e. the root of the git repo
+cd ${scriptDir}/..
+
+job=$(basename ${KOKORO_JOB_NAME})
+
+echo "coercing sponge logs..."
+for xml in `find . -name *-sponge_log.xml`
+do
+  class=$(basename ${xml} | cut -d- -f2)
+  dir=$(dirname ${xml})/${job}/${class}
+  text=$(dirname ${xml})/${class}-sponge_log.txt
+  mkdir -p ${dir}
+  mv ${xml} ${dir}/sponge_log.xml
+  mv ${text} ${dir}/sponge_log.txt
+done
diff --git a/java-common-protos/.kokoro/common.cfg b/java-common-protos/.kokoro/common.cfg
new file mode 100644
index 0000000000..8b2d91d032
--- /dev/null
+++ b/java-common-protos/.kokoro/common.cfg
@@ -0,0 +1,13 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Download trampoline resources. These will be in ${KOKORO_GFILE_DIR}
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# All builds use the trampoline script to run in docker.
+build_file: "java-common-protos/.kokoro/trampoline.sh"
+
+# Tell the trampoline which build file to use.
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-common-protos/.kokoro/build.sh"
+}
diff --git a/java-common-protos/.kokoro/common.sh b/java-common-protos/.kokoro/common.sh
new file mode 100644
index 0000000000..f8f957af11
--- /dev/null
+++ b/java-common-protos/.kokoro/common.sh
@@ -0,0 +1,60 @@
+#!/bin/bash
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+function retry_with_backoff {
+    attempts_left=$1
+    sleep_seconds=$2
+    shift 2
+    command=$@
+
+
+    # store current flag state
+    flags=$-
+    
+    # allow a failures to continue
+    set +e
+    ${command}
+    exit_code=$?
+
+    # restore "e" flag
+    if [[ ${flags} =~ e ]]
+    then set -e
+    else set +e
+    fi
+
+    if [[ $exit_code == 0 ]]
+    then
+        return 0
+    fi
+
+    # failure
+    if [[ ${attempts_left} > 0 ]]
+    then
+        echo "failure (${exit_code}), sleeping ${sleep_seconds}..."
+        sleep ${sleep_seconds}
+        new_attempts=$((${attempts_left} - 1))
+        new_sleep=$((${sleep_seconds} * 2))
+        retry_with_backoff ${new_attempts} ${new_sleep} ${command}
+    fi
+
+    return $exit_code
+}
+
+## Helper functionss
+function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; }
+function msg() { println "$*" >&2; }
+function println() { printf '%s\n' "$(now) $*"; }
+
+## Helper comment to trigger updated repo dependency release
\ No newline at end of file
diff --git a/java-common-protos/.kokoro/continuous/common.cfg b/java-common-protos/.kokoro/continuous/common.cfg
new file mode 100644
index 0000000000..d8e6ffc95f
--- /dev/null
+++ b/java-common-protos/.kokoro/continuous/common.cfg
@@ -0,0 +1,25 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Build logs will be here
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.xml"
+    regex: "**/*sponge_log.txt"
+  }
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Use the trampoline script to run in docker.
+build_file: "java-common-protos/.kokoro/trampoline.sh"
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-common-protos/.kokoro/build.sh"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "test"
+}
diff --git a/java-common-protos/.kokoro/continuous/java8.cfg b/java-common-protos/.kokoro/continuous/java8.cfg
new file mode 100644
index 0000000000..495cc7bacd
--- /dev/null
+++ b/java-common-protos/.kokoro/continuous/java8.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "REPORT_COVERAGE"
+  value: "true"
+}
diff --git a/java-common-protos/.kokoro/nightly/common.cfg b/java-common-protos/.kokoro/nightly/common.cfg
new file mode 100644
index 0000000000..d8e6ffc95f
--- /dev/null
+++ b/java-common-protos/.kokoro/nightly/common.cfg
@@ -0,0 +1,25 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Build logs will be here
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.xml"
+    regex: "**/*sponge_log.txt"
+  }
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Use the trampoline script to run in docker.
+build_file: "java-common-protos/.kokoro/trampoline.sh"
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-common-protos/.kokoro/build.sh"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "test"
+}
diff --git a/java-common-protos/.kokoro/nightly/integration.cfg b/java-common-protos/.kokoro/nightly/integration.cfg
new file mode 100644
index 0000000000..a2907a257b
--- /dev/null
+++ b/java-common-protos/.kokoro/nightly/integration.cfg
@@ -0,0 +1,37 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "integration"
+}
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "java-docs-samples-testing"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "java-docs-samples-testing"
+}
+
+env_vars: {
+  key: "ENABLE_FLAKYBOT"
+  value: "true"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
+}
diff --git a/java-common-protos/.kokoro/nightly/java11-integration.cfg b/java-common-protos/.kokoro/nightly/java11-integration.cfg
new file mode 100644
index 0000000000..58049cc38f
--- /dev/null
+++ b/java-common-protos/.kokoro/nightly/java11-integration.cfg
@@ -0,0 +1,37 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-public-resources/java11014"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "integration"
+}
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "ENABLE_FLAKYBOT"
+  value: "true"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
+}
diff --git a/java-common-protos/.kokoro/nightly/java11.cfg b/java-common-protos/.kokoro/nightly/java11.cfg
new file mode 100644
index 0000000000..709f2b4c73
--- /dev/null
+++ b/java-common-protos/.kokoro/nightly/java11.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
+}
diff --git a/java-common-protos/.kokoro/nightly/java7.cfg b/java-common-protos/.kokoro/nightly/java7.cfg
new file mode 100644
index 0000000000..cb24f44eea
--- /dev/null
+++ b/java-common-protos/.kokoro/nightly/java7.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java7"
+}
diff --git a/java-common-protos/.kokoro/nightly/java8-osx.cfg b/java-common-protos/.kokoro/nightly/java8-osx.cfg
new file mode 100644
index 0000000000..a2205705c0
--- /dev/null
+++ b/java-common-protos/.kokoro/nightly/java8-osx.cfg
@@ -0,0 +1,3 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+build_file: "java-common-protos/.kokoro/build.sh"
diff --git a/java-common-protos/.kokoro/nightly/java8-win.cfg b/java-common-protos/.kokoro/nightly/java8-win.cfg
new file mode 100644
index 0000000000..55d4ada741
--- /dev/null
+++ b/java-common-protos/.kokoro/nightly/java8-win.cfg
@@ -0,0 +1,3 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+build_file: "java-common-protos/.kokoro/build.bat"
diff --git a/java-common-protos/.kokoro/nightly/java8.cfg b/java-common-protos/.kokoro/nightly/java8.cfg
new file mode 100644
index 0000000000..495cc7bacd
--- /dev/null
+++ b/java-common-protos/.kokoro/nightly/java8.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "REPORT_COVERAGE"
+  value: "true"
+}
diff --git a/java-common-protos/.kokoro/nightly/samples.cfg b/java-common-protos/.kokoro/nightly/samples.cfg
new file mode 100644
index 0000000000..9761fd8648
--- /dev/null
+++ b/java-common-protos/.kokoro/nightly/samples.cfg
@@ -0,0 +1,38 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "samples"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "java-docs-samples-testing"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "java-docs-samples-testing"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-docs-samples-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-docs-samples-service-account"
+}
+
+env_vars: {
+  key: "ENABLE_FLAKYBOT"
+  value: "true"
+}
diff --git a/java-common-protos/.kokoro/populate-secrets.sh b/java-common-protos/.kokoro/populate-secrets.sh
new file mode 100755
index 0000000000..f52514257e
--- /dev/null
+++ b/java-common-protos/.kokoro/populate-secrets.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+# Copyright 2020 Google LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+function now { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n' ;}
+function msg { println "$*" >&2 ;}
+function println { printf '%s\n' "$(now) $*" ;}
+
+
+# Populates requested secrets set in SECRET_MANAGER_KEYS from service account:
+# kokoro-trampoline@cloud-devrel-kokoro-resources.iam.gserviceaccount.com
+SECRET_LOCATION="${KOKORO_GFILE_DIR}/secret_manager"
+msg "Creating folder on disk for secrets: ${SECRET_LOCATION}"
+mkdir -p ${SECRET_LOCATION}
+for key in $(echo ${SECRET_MANAGER_KEYS} | sed "s/,/ /g")
+do
+  msg "Retrieving secret ${key}"
+  docker run --entrypoint=gcloud \
+    --volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \
+    gcr.io/google.com/cloudsdktool/cloud-sdk \
+    secrets versions access latest \
+    --project cloud-devrel-kokoro-resources \
+    --secret ${key} > \
+    "${SECRET_LOCATION}/${key}"
+  if [[ $? == 0 ]]; then
+    msg "Secret written to ${SECRET_LOCATION}/${key}"
+  else
+    msg "Error retrieving secret ${key}"
+  fi
+done
diff --git a/java-common-protos/.kokoro/presubmit/clirr.cfg b/java-common-protos/.kokoro/presubmit/clirr.cfg
new file mode 100644
index 0000000000..ec572442e2
--- /dev/null
+++ b/java-common-protos/.kokoro/presubmit/clirr.cfg
@@ -0,0 +1,13 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "clirr"
+}
\ No newline at end of file
diff --git a/java-common-protos/.kokoro/presubmit/common.cfg b/java-common-protos/.kokoro/presubmit/common.cfg
new file mode 100644
index 0000000000..28a4e14b40
--- /dev/null
+++ b/java-common-protos/.kokoro/presubmit/common.cfg
@@ -0,0 +1,34 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Build logs will be here
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.xml"
+    regex: "**/*sponge_log.txt"
+  }
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Use the trampoline script to run in docker.
+build_file: "java-common-protos/.kokoro/trampoline.sh"
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-common-protos/.kokoro/build.sh"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "test"
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "dpebot_codecov_token"
+    }
+  }
+}
diff --git a/java-common-protos/.kokoro/presubmit/dependencies.cfg b/java-common-protos/.kokoro/presubmit/dependencies.cfg
new file mode 100644
index 0000000000..5d388a2c58
--- /dev/null
+++ b/java-common-protos/.kokoro/presubmit/dependencies.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-common-protos/.kokoro/dependencies.sh"
+}
diff --git a/java-common-protos/.kokoro/presubmit/graalvm-native-17.cfg b/java-common-protos/.kokoro/presubmit/graalvm-native-17.cfg
new file mode 100644
index 0000000000..a3f7fb9d49
--- /dev/null
+++ b/java-common-protos/.kokoro/presubmit/graalvm-native-17.cfg
@@ -0,0 +1,33 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "graalvm17"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
+}
\ No newline at end of file
diff --git a/java-common-protos/.kokoro/presubmit/graalvm-native.cfg b/java-common-protos/.kokoro/presubmit/graalvm-native.cfg
new file mode 100644
index 0000000000..4c7225ec92
--- /dev/null
+++ b/java-common-protos/.kokoro/presubmit/graalvm-native.cfg
@@ -0,0 +1,33 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "graalvm"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
+}
diff --git a/java-common-protos/.kokoro/presubmit/integration.cfg b/java-common-protos/.kokoro/presubmit/integration.cfg
new file mode 100644
index 0000000000..dded67a9d5
--- /dev/null
+++ b/java-common-protos/.kokoro/presubmit/integration.cfg
@@ -0,0 +1,33 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "integration"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
+}
diff --git a/java-common-protos/.kokoro/presubmit/java11.cfg b/java-common-protos/.kokoro/presubmit/java11.cfg
new file mode 100644
index 0000000000..709f2b4c73
--- /dev/null
+++ b/java-common-protos/.kokoro/presubmit/java11.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
+}
diff --git a/java-common-protos/.kokoro/presubmit/java7.cfg b/java-common-protos/.kokoro/presubmit/java7.cfg
new file mode 100644
index 0000000000..cb24f44eea
--- /dev/null
+++ b/java-common-protos/.kokoro/presubmit/java7.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java7"
+}
diff --git a/java-common-protos/.kokoro/presubmit/java8-osx.cfg b/java-common-protos/.kokoro/presubmit/java8-osx.cfg
new file mode 100644
index 0000000000..a2205705c0
--- /dev/null
+++ b/java-common-protos/.kokoro/presubmit/java8-osx.cfg
@@ -0,0 +1,3 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+build_file: "java-common-protos/.kokoro/build.sh"
diff --git a/java-common-protos/.kokoro/presubmit/java8-win.cfg b/java-common-protos/.kokoro/presubmit/java8-win.cfg
new file mode 100644
index 0000000000..55d4ada741
--- /dev/null
+++ b/java-common-protos/.kokoro/presubmit/java8-win.cfg
@@ -0,0 +1,3 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+build_file: "java-common-protos/.kokoro/build.bat"
diff --git a/java-common-protos/.kokoro/presubmit/java8.cfg b/java-common-protos/.kokoro/presubmit/java8.cfg
new file mode 100644
index 0000000000..495cc7bacd
--- /dev/null
+++ b/java-common-protos/.kokoro/presubmit/java8.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "REPORT_COVERAGE"
+  value: "true"
+}
diff --git a/java-common-protos/.kokoro/presubmit/linkage-monitor.cfg b/java-common-protos/.kokoro/presubmit/linkage-monitor.cfg
new file mode 100644
index 0000000000..1ed21488fa
--- /dev/null
+++ b/java-common-protos/.kokoro/presubmit/linkage-monitor.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-common-protos/.kokoro/linkage-monitor.sh"
+}
\ No newline at end of file
diff --git a/java-common-protos/.kokoro/presubmit/lint.cfg b/java-common-protos/.kokoro/presubmit/lint.cfg
new file mode 100644
index 0000000000..6d323c8ae7
--- /dev/null
+++ b/java-common-protos/.kokoro/presubmit/lint.cfg
@@ -0,0 +1,13 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "lint"
+}
\ No newline at end of file
diff --git a/java-common-protos/.kokoro/presubmit/samples.cfg b/java-common-protos/.kokoro/presubmit/samples.cfg
new file mode 100644
index 0000000000..01e0960047
--- /dev/null
+++ b/java-common-protos/.kokoro/presubmit/samples.cfg
@@ -0,0 +1,33 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "samples"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "java-docs-samples-testing"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "java-docs-samples-testing"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-docs-samples-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-docs-samples-service-account"
+}
\ No newline at end of file
diff --git a/java-common-protos/.kokoro/release/bump_snapshot.cfg b/java-common-protos/.kokoro/release/bump_snapshot.cfg
new file mode 100644
index 0000000000..3de8138d9c
--- /dev/null
+++ b/java-common-protos/.kokoro/release/bump_snapshot.cfg
@@ -0,0 +1,53 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Build logs will be here
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.xml"
+  }
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Use the trampoline script to run in docker.
+build_file: "java-common-protos/.kokoro/trampoline.sh"
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user"
+}
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-common-protos/.kokoro/release/bump_snapshot.sh"
+}
+
+# tokens used by release-please to keep an up-to-date release PR.
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "github-magic-proxy-key-release-please"
+    }
+  }
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "github-magic-proxy-token-release-please"
+    }
+  }
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "github-magic-proxy-url-release-please"
+    }
+  }
+}
diff --git a/java-common-protos/.kokoro/release/common.cfg b/java-common-protos/.kokoro/release/common.cfg
new file mode 100644
index 0000000000..e676934592
--- /dev/null
+++ b/java-common-protos/.kokoro/release/common.cfg
@@ -0,0 +1,49 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Use the trampoline script to run in docker.
+build_file: "java-common-protos/.kokoro/trampoline.sh"
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 70247
+      keyname: "maven-gpg-keyring"
+    }
+  }
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 70247
+      keyname: "maven-gpg-passphrase"
+    }
+  }
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 70247
+      keyname: "maven-gpg-pubkeyring"
+    }
+  }
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 70247
+      keyname: "sonatype-credentials"
+    }
+  }
+}
diff --git a/java-common-protos/.kokoro/release/common.sh b/java-common-protos/.kokoro/release/common.sh
new file mode 100755
index 0000000000..7f78ee414f
--- /dev/null
+++ b/java-common-protos/.kokoro/release/common.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+# Copyright 2018 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+# Get secrets from keystore and set and environment variables
+setup_environment_secrets() {
+  export GPG_PASSPHRASE=$(cat ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-passphrase)
+  export GPG_TTY=$(tty)
+  export GPG_HOMEDIR=/gpg
+  mkdir $GPG_HOMEDIR
+  mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-pubkeyring $GPG_HOMEDIR/pubring.gpg
+  mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-keyring $GPG_HOMEDIR/secring.gpg
+  export SONATYPE_USERNAME=$(cat ${KOKORO_KEYSTORE_DIR}/70247_sonatype-credentials | cut -f1 -d'|')
+  export SONATYPE_PASSWORD=$(cat ${KOKORO_KEYSTORE_DIR}/70247_sonatype-credentials | cut -f2 -d'|')
+}
+
+create_settings_xml_file() {
+  echo "<settings>
+  <servers>
+    <server>
+      <id>ossrh</id>
+      <username>${SONATYPE_USERNAME}</username>
+      <password>${SONATYPE_PASSWORD}</password>
+    </server>
+    <server>
+      <id>sonatype-nexus-staging</id>
+      <username>${SONATYPE_USERNAME}</username>
+      <password>${SONATYPE_PASSWORD}</password>
+    </server>
+    <server>
+      <id>sonatype-nexus-snapshots</id>
+      <username>${SONATYPE_USERNAME}</username>
+      <password>${SONATYPE_PASSWORD}</password>
+    </server>
+  </servers>
+</settings>" > $1
+}
\ No newline at end of file
diff --git a/java-common-protos/.kokoro/release/drop.cfg b/java-common-protos/.kokoro/release/drop.cfg
new file mode 100644
index 0000000000..1faccd52ec
--- /dev/null
+++ b/java-common-protos/.kokoro/release/drop.cfg
@@ -0,0 +1,6 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-common-protos/.kokoro/release/drop.sh"
+}
diff --git a/java-common-protos/.kokoro/release/drop.sh b/java-common-protos/.kokoro/release/drop.sh
new file mode 100755
index 0000000000..742ec1a886
--- /dev/null
+++ b/java-common-protos/.kokoro/release/drop.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+# Copyright 2018 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+# STAGING_REPOSITORY_ID must be set
+if [ -z "${STAGING_REPOSITORY_ID}" ]; then
+  echo "Missing STAGING_REPOSITORY_ID environment variable"
+  exit 1
+fi
+
+source $(dirname "$0")/common.sh
+pushd $(dirname "$0")/../../
+
+setup_environment_secrets
+create_settings_xml_file "settings.xml"
+
+mvn nexus-staging:drop -B \
+  --settings=settings.xml \
+  -DstagingRepositoryId=${STAGING_REPOSITORY_ID}
diff --git a/java-common-protos/.kokoro/release/promote.cfg b/java-common-protos/.kokoro/release/promote.cfg
new file mode 100644
index 0000000000..240e75aa5d
--- /dev/null
+++ b/java-common-protos/.kokoro/release/promote.cfg
@@ -0,0 +1,6 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-common-protos/.kokoro/release/promote.sh"
+}
diff --git a/java-common-protos/.kokoro/release/promote.sh b/java-common-protos/.kokoro/release/promote.sh
new file mode 100755
index 0000000000..3cac3d8a97
--- /dev/null
+++ b/java-common-protos/.kokoro/release/promote.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+# Copyright 2018 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+# STAGING_REPOSITORY_ID must be set
+if [ -z "${STAGING_REPOSITORY_ID}" ]; then
+  echo "Missing STAGING_REPOSITORY_ID environment variable"
+  exit 1
+fi
+
+source $(dirname "$0")/common.sh
+
+pushd $(dirname "$0")/../../
+
+setup_environment_secrets
+create_settings_xml_file "settings.xml"
+
+mvn nexus-staging:release -B \
+  -DperformRelease=true \
+  --settings=settings.xml \
+  -DstagingRepositoryId=${STAGING_REPOSITORY_ID}
diff --git a/java-common-protos/.kokoro/release/publish_javadoc.cfg b/java-common-protos/.kokoro/release/publish_javadoc.cfg
new file mode 100644
index 0000000000..295aa525a0
--- /dev/null
+++ b/java-common-protos/.kokoro/release/publish_javadoc.cfg
@@ -0,0 +1,23 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/doc-templates/"
+
+env_vars: {
+  key: "STAGING_BUCKET"
+  value: "docs-staging"
+}
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-common-protos/.kokoro/release/publish_javadoc.sh"
+}
+
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "docuploader_service_account"
+    }
+  }
+}
diff --git a/java-common-protos/.kokoro/release/publish_javadoc.sh b/java-common-protos/.kokoro/release/publish_javadoc.sh
new file mode 100755
index 0000000000..9d4ce4ae34
--- /dev/null
+++ b/java-common-protos/.kokoro/release/publish_javadoc.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+# Copyright 2019 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+if [[ -z "${CREDENTIALS}" ]]; then
+  CREDENTIALS=${KOKORO_KEYSTORE_DIR}/73713_docuploader_service_account
+fi
+
+if [[ -z "${STAGING_BUCKET}" ]]; then
+  echo "Need to set STAGING_BUCKET environment variable"
+  exit 1
+fi
+
+# work from the git root directory
+pushd $(dirname "$0")/../../
+
+# install docuploader package
+python3 -m pip install --require-hashes -r .kokoro/requirements.txt
+
+# compile all packages
+mvn clean install -B -q -DskipTests=true
+
+export NAME=proto-google-common-protos
+export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
+
+# build the docs
+mvn site -B -q
+
+pushd target/site/apidocs
+
+# create metadata
+python3 -m docuploader create-metadata \
+  --name ${NAME} \
+  --version ${VERSION} \
+  --language java
+
+# upload docs
+python3 -m docuploader upload . \
+  --credentials ${CREDENTIALS} \
+  --staging-bucket ${STAGING_BUCKET}
diff --git a/java-common-protos/.kokoro/release/publish_javadoc11.cfg b/java-common-protos/.kokoro/release/publish_javadoc11.cfg
new file mode 100644
index 0000000000..b5372c604a
--- /dev/null
+++ b/java-common-protos/.kokoro/release/publish_javadoc11.cfg
@@ -0,0 +1,30 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# cloud-rad production
+env_vars: {
+  key: "STAGING_BUCKET_V2"
+  value: "docs-staging-v2"
+}
+
+# Configure the docker image for kokoro-trampoline
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
+}
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-common-protos/.kokoro/release/publish_javadoc11.sh"
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "docuploader_service_account"
+    }
+  }
+}
+
+# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/<doclet name>
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx"
diff --git a/java-common-protos/.kokoro/release/publish_javadoc11.sh b/java-common-protos/.kokoro/release/publish_javadoc11.sh
new file mode 100755
index 0000000000..69c00bfb17
--- /dev/null
+++ b/java-common-protos/.kokoro/release/publish_javadoc11.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+if [[ -z "${CREDENTIALS}" ]]; then
+  CREDENTIALS=${KOKORO_KEYSTORE_DIR}/73713_docuploader_service_account
+fi
+
+if [[ -z "${STAGING_BUCKET_V2}" ]]; then
+  echo "Need to set STAGING_BUCKET_V2 environment variable"
+  exit 1
+fi
+
+# work from the git root directory
+pushd $(dirname "$0")/../../
+
+# install docuploader package
+python3 -m pip install --require-hashes -r .kokoro/requirements.txt
+
+# compile all packages
+mvn clean install -B -q -DskipTests=true
+
+export NAME=proto-google-common-protos
+export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
+
+# cloud RAD generation
+mvn clean javadoc:aggregate -B -q -P docFX
+# include CHANGELOG
+cp CHANGELOG.md target/docfx-yml/history.md
+
+pushd target/docfx-yml
+
+# create metadata
+python3 -m docuploader create-metadata \
+ --name ${NAME} \
+ --version ${VERSION} \
+ --xrefs devsite://java/gax \
+ --xrefs devsite://java/google-cloud-core \
+ --xrefs devsite://java/api-common \
+ --xrefs devsite://java/proto-google-common-protos \
+ --xrefs devsite://java/google-api-client \
+ --xrefs devsite://java/google-http-client \
+ --xrefs devsite://java/protobuf \
+ --language java
+
+# upload yml to production bucket
+python3 -m docuploader upload . \
+ --credentials ${CREDENTIALS} \
+ --staging-bucket ${STAGING_BUCKET_V2} \
+ --destination-prefix docfx
diff --git a/java-common-protos/.kokoro/release/snapshot.cfg b/java-common-protos/.kokoro/release/snapshot.cfg
new file mode 100644
index 0000000000..087a62896e
--- /dev/null
+++ b/java-common-protos/.kokoro/release/snapshot.cfg
@@ -0,0 +1,6 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-common-protos/.kokoro/release/snapshot.sh"
+}
\ No newline at end of file
diff --git a/java-common-protos/.kokoro/release/snapshot.sh b/java-common-protos/.kokoro/release/snapshot.sh
new file mode 100755
index 0000000000..1f55b77024
--- /dev/null
+++ b/java-common-protos/.kokoro/release/snapshot.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+# Copyright 2019 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+source $(dirname "$0")/common.sh
+MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml
+pushd $(dirname "$0")/../../
+
+# ensure we're trying to push a snapshot (no-result returns non-zero exit code)
+grep SNAPSHOT versions.txt
+
+setup_environment_secrets
+create_settings_xml_file "settings.xml"
+
+mvn clean deploy -B \
+  --settings ${MAVEN_SETTINGS_FILE} \
+  -DperformRelease=true \
+  -Dgpg.executable=gpg \
+  -Dgpg.passphrase=${GPG_PASSPHRASE} \
+  -Dgpg.homedir=${GPG_HOMEDIR}
diff --git a/java-common-protos/.kokoro/release/stage.cfg b/java-common-protos/.kokoro/release/stage.cfg
new file mode 100644
index 0000000000..21a7e3cb58
--- /dev/null
+++ b/java-common-protos/.kokoro/release/stage.cfg
@@ -0,0 +1,19 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-common-protos/.kokoro/release/stage.sh"
+}
+
+# Need to save the properties file
+action {
+  define_artifacts {
+    regex: "github/java-common-protos/target/nexus-staging/staging/*.properties"
+    strip_prefix: "github/java-common-protos"
+  }
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem"
+}
diff --git a/java-common-protos/.kokoro/release/stage.sh b/java-common-protos/.kokoro/release/stage.sh
new file mode 100755
index 0000000000..61e714d6ba
--- /dev/null
+++ b/java-common-protos/.kokoro/release/stage.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+# Copyright 2018 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+# Start the releasetool reporter
+requirementsFile=$(realpath $(dirname "${BASH_SOURCE[0]}")/../requirements.txt)
+python3 -m pip install --require-hashes -r $requirementsFile
+python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script
+
+source $(dirname "$0")/common.sh
+source $(dirname "$0")/../common.sh
+MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml
+pushd $(dirname "$0")/../../
+
+setup_environment_secrets
+create_settings_xml_file "settings.xml"
+
+# attempt to stage 3 times with exponential backoff (starting with 10 seconds)
+retry_with_backoff 3 10 \
+  mvn clean deploy -B \
+    --settings ${MAVEN_SETTINGS_FILE} \
+    -DskipTests=true \
+    -Dclirr.skip=true \
+    -DperformRelease=true \
+    -Dgpg.executable=gpg \
+    -Dgpg.passphrase=${GPG_PASSPHRASE} \
+    -Dgpg.homedir=${GPG_HOMEDIR}
+
+if [[ -n "${AUTORELEASE_PR}" ]]
+then
+  mvn nexus-staging:release -B \
+    -DperformRelease=true \
+    --settings=settings.xml
+fi
diff --git a/java-common-protos/.kokoro/requirements.in b/java-common-protos/.kokoro/requirements.in
new file mode 100644
index 0000000000..924f94ae6f
--- /dev/null
+++ b/java-common-protos/.kokoro/requirements.in
@@ -0,0 +1,34 @@
+gcp-docuploader==0.6.3
+google-crc32c==1.3.0
+googleapis-common-protos==1.56.3
+gcp-releasetool==1.9.1
+cryptography==38.0.3
+cachetools==4.2.4
+cffi==1.15.1
+jeepney==0.7.1
+jinja2==3.0.3
+markupsafe==2.0.1
+keyring==23.4.1
+packaging==21.3
+protobuf==3.19.5
+pyjwt==2.4.0
+pyparsing==3.0.9
+pycparser==2.21
+pyperclip==1.8.2
+python-dateutil==2.8.2
+requests==2.27.1
+certifi==2022.9.24
+importlib-metadata==4.8.3
+zipp==3.6.0
+google_api_core==2.8.2
+google-cloud-storage==2.0.0
+google-resumable-media==2.3.3
+google-cloud-core==2.3.1
+typing-extensions==4.1.1
+urllib3==1.26.12
+zipp==3.6.0
+rsa==4.9
+six==1.16.0
+attrs==22.1.0
+google-auth==2.14.1
+idna==3.4
\ No newline at end of file
diff --git a/java-common-protos/.kokoro/requirements.txt b/java-common-protos/.kokoro/requirements.txt
new file mode 100644
index 0000000000..71fcafc703
--- /dev/null
+++ b/java-common-protos/.kokoro/requirements.txt
@@ -0,0 +1,456 @@
+#
+# This file is autogenerated by pip-compile with python 3.10
+# To update, run:
+#
+#    pip-compile --generate-hashes requirements.in
+#
+attrs==22.1.0 \
+    --hash=sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 \
+    --hash=sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c
+    # via
+    #   -r requirements.in
+    #   gcp-releasetool
+cachetools==4.2.4 \
+    --hash=sha256:89ea6f1b638d5a73a4f9226be57ac5e4f399d22770b92355f92dcb0f7f001693 \
+    --hash=sha256:92971d3cb7d2a97efff7c7bb1657f21a8f5fb309a37530537c71b1774189f2d1
+    # via
+    #   -r requirements.in
+    #   google-auth
+certifi==2022.9.24 \
+    --hash=sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14 \
+    --hash=sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382
+    # via
+    #   -r requirements.in
+    #   requests
+cffi==1.15.1 \
+    --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \
+    --hash=sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef \
+    --hash=sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104 \
+    --hash=sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426 \
+    --hash=sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405 \
+    --hash=sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375 \
+    --hash=sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a \
+    --hash=sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e \
+    --hash=sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc \
+    --hash=sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf \
+    --hash=sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185 \
+    --hash=sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497 \
+    --hash=sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3 \
+    --hash=sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35 \
+    --hash=sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c \
+    --hash=sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83 \
+    --hash=sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21 \
+    --hash=sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca \
+    --hash=sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984 \
+    --hash=sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac \
+    --hash=sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd \
+    --hash=sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee \
+    --hash=sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a \
+    --hash=sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2 \
+    --hash=sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192 \
+    --hash=sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7 \
+    --hash=sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585 \
+    --hash=sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f \
+    --hash=sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e \
+    --hash=sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27 \
+    --hash=sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b \
+    --hash=sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e \
+    --hash=sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e \
+    --hash=sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d \
+    --hash=sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c \
+    --hash=sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415 \
+    --hash=sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82 \
+    --hash=sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02 \
+    --hash=sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314 \
+    --hash=sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325 \
+    --hash=sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c \
+    --hash=sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3 \
+    --hash=sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914 \
+    --hash=sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045 \
+    --hash=sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d \
+    --hash=sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9 \
+    --hash=sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5 \
+    --hash=sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2 \
+    --hash=sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c \
+    --hash=sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3 \
+    --hash=sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2 \
+    --hash=sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8 \
+    --hash=sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d \
+    --hash=sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d \
+    --hash=sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9 \
+    --hash=sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162 \
+    --hash=sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76 \
+    --hash=sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4 \
+    --hash=sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e \
+    --hash=sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9 \
+    --hash=sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6 \
+    --hash=sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b \
+    --hash=sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01 \
+    --hash=sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0
+    # via
+    #   -r requirements.in
+    #   cryptography
+charset-normalizer==2.0.12 \
+    --hash=sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597 \
+    --hash=sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df
+    # via requests
+click==8.0.4 \
+    --hash=sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1 \
+    --hash=sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb
+    # via
+    #   gcp-docuploader
+    #   gcp-releasetool
+colorlog==6.7.0 \
+    --hash=sha256:0d33ca236784a1ba3ff9c532d4964126d8a2c44f1f0cb1d2b0728196f512f662 \
+    --hash=sha256:bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5
+    # via gcp-docuploader
+cryptography==38.0.3 \
+    --hash=sha256:068147f32fa662c81aebab95c74679b401b12b57494872886eb5c1139250ec5d \
+    --hash=sha256:06fc3cc7b6f6cca87bd56ec80a580c88f1da5306f505876a71c8cfa7050257dd \
+    --hash=sha256:25c1d1f19729fb09d42e06b4bf9895212292cb27bb50229f5aa64d039ab29146 \
+    --hash=sha256:402852a0aea73833d982cabb6d0c3bb582c15483d29fb7085ef2c42bfa7e38d7 \
+    --hash=sha256:4e269dcd9b102c5a3d72be3c45d8ce20377b8076a43cbed6f660a1afe365e436 \
+    --hash=sha256:5419a127426084933076132d317911e3c6eb77568a1ce23c3ac1e12d111e61e0 \
+    --hash=sha256:554bec92ee7d1e9d10ded2f7e92a5d70c1f74ba9524947c0ba0c850c7b011828 \
+    --hash=sha256:5e89468fbd2fcd733b5899333bc54d0d06c80e04cd23d8c6f3e0542358c6060b \
+    --hash=sha256:65535bc550b70bd6271984d9863a37741352b4aad6fb1b3344a54e6950249b55 \
+    --hash=sha256:6ab9516b85bebe7aa83f309bacc5f44a61eeb90d0b4ec125d2d003ce41932d36 \
+    --hash=sha256:6addc3b6d593cd980989261dc1cce38263c76954d758c3c94de51f1e010c9a50 \
+    --hash=sha256:728f2694fa743a996d7784a6194da430f197d5c58e2f4e278612b359f455e4a2 \
+    --hash=sha256:785e4056b5a8b28f05a533fab69febf5004458e20dad7e2e13a3120d8ecec75a \
+    --hash=sha256:78cf5eefac2b52c10398a42765bfa981ce2372cbc0457e6bf9658f41ec3c41d8 \
+    --hash=sha256:7f836217000342d448e1c9a342e9163149e45d5b5eca76a30e84503a5a96cab0 \
+    --hash=sha256:8d41a46251bf0634e21fac50ffd643216ccecfaf3701a063257fe0b2be1b6548 \
+    --hash=sha256:984fe150f350a3c91e84de405fe49e688aa6092b3525f407a18b9646f6612320 \
+    --hash=sha256:9b24bcff7853ed18a63cfb0c2b008936a9554af24af2fb146e16d8e1aed75748 \
+    --hash=sha256:b1b35d9d3a65542ed2e9d90115dfd16bbc027b3f07ee3304fc83580f26e43249 \
+    --hash=sha256:b1b52c9e5f8aa2b802d48bd693190341fae201ea51c7a167d69fc48b60e8a959 \
+    --hash=sha256:bbf203f1a814007ce24bd4d51362991d5cb90ba0c177a9c08825f2cc304d871f \
+    --hash=sha256:be243c7e2bfcf6cc4cb350c0d5cdf15ca6383bbcb2a8ef51d3c9411a9d4386f0 \
+    --hash=sha256:bfbe6ee19615b07a98b1d2287d6a6073f734735b49ee45b11324d85efc4d5cbd \
+    --hash=sha256:c46837ea467ed1efea562bbeb543994c2d1f6e800785bd5a2c98bc096f5cb220 \
+    --hash=sha256:dfb4f4dd568de1b6af9f4cda334adf7d72cf5bc052516e1b2608b683375dd95c \
+    --hash=sha256:ed7b00096790213e09eb11c97cc6e2b757f15f3d2f85833cd2d3ec3fe37c1722
+    # via
+    #   -r requirements.in
+    #   gcp-releasetool
+    #   secretstorage
+gcp-docuploader==0.6.3 \
+    --hash=sha256:ba8c9d76b3bbac54b0311c503a373b00edc2dc02d6d54ea9507045adb8e870f7 \
+    --hash=sha256:c0f5aaa82ce1854a386197e4e359b120ad6d4e57ae2c812fce42219a3288026b
+    # via -r requirements.in
+gcp-releasetool==1.9.1 \
+    --hash=sha256:952f4055d5d986b070ae2a71c4410b250000f9cc5a1e26398fcd55a5bbc5a15f \
+    --hash=sha256:d0d3c814a97c1a237517e837d8cfa668ced8df4b882452578ecef4a4e79c583b
+    # via -r requirements.in
+google-api-core==2.8.2 \
+    --hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \
+    --hash=sha256:93c6a91ccac79079ac6bbf8b74ee75db970cc899278b97d53bc012f35908cf50
+    # via
+    #   -r requirements.in
+    #   google-cloud-core
+    #   google-cloud-storage
+google-auth==2.14.1 \
+    --hash=sha256:f5d8701633bebc12e0deea4df8abd8aff31c28b355360597f7f2ee60f2e4d016
+    # via
+    #   -r requirements.in
+    #   gcp-releasetool
+    #   google-api-core
+    #   google-cloud-core
+    #   google-cloud-storage
+google-cloud-core==2.3.1 \
+    --hash=sha256:113ba4f492467d5bd442c8d724c1a25ad7384045c3178369038840ecdd19346c \
+    --hash=sha256:34334359cb04187bdc80ddcf613e462dfd7a3aabbc3fe4d118517ab4b9303d53
+    # via
+    #   -r requirements.in
+    #   google-cloud-storage
+google-cloud-storage==2.0.0 \
+    --hash=sha256:a57a15aead0f9dfbd4381f1bfdbe8bf89818a4bd75bab846cafcefb2db846c47 \
+    --hash=sha256:ec4be60bb223a3a960f0d01697d849b86d91cad815a84915a32ed3635e93a5e7
+    # via
+    #   -r requirements.in
+    #   gcp-docuploader
+google-crc32c==1.3.0 \
+    --hash=sha256:04e7c220798a72fd0f08242bc8d7a05986b2a08a0573396187fd32c1dcdd58b3 \
+    --hash=sha256:05340b60bf05b574159e9bd940152a47d38af3fb43803ffe71f11d704b7696a6 \
+    --hash=sha256:12674a4c3b56b706153a358eaa1018c4137a5a04635b92b4652440d3d7386206 \
+    --hash=sha256:127f9cc3ac41b6a859bd9dc4321097b1a4f6aa7fdf71b4f9227b9e3ebffb4422 \
+    --hash=sha256:13af315c3a0eec8bb8b8d80b8b128cb3fcd17d7e4edafc39647846345a3f003a \
+    --hash=sha256:1926fd8de0acb9d15ee757175ce7242e235482a783cd4ec711cc999fc103c24e \
+    --hash=sha256:226f2f9b8e128a6ca6a9af9b9e8384f7b53a801907425c9a292553a3a7218ce0 \
+    --hash=sha256:276de6273eb074a35bc598f8efbc00c7869c5cf2e29c90748fccc8c898c244df \
+    --hash=sha256:318f73f5484b5671f0c7f5f63741ab020a599504ed81d209b5c7129ee4667407 \
+    --hash=sha256:3bbce1be3687bbfebe29abdb7631b83e6b25da3f4e1856a1611eb21854b689ea \
+    --hash=sha256:42ae4781333e331a1743445931b08ebdad73e188fd554259e772556fc4937c48 \
+    --hash=sha256:58be56ae0529c664cc04a9c76e68bb92b091e0194d6e3c50bea7e0f266f73713 \
+    --hash=sha256:5da2c81575cc3ccf05d9830f9e8d3c70954819ca9a63828210498c0774fda1a3 \
+    --hash=sha256:6311853aa2bba4064d0c28ca54e7b50c4d48e3de04f6770f6c60ebda1e975267 \
+    --hash=sha256:650e2917660e696041ab3dcd7abac160b4121cd9a484c08406f24c5964099829 \
+    --hash=sha256:6a4db36f9721fdf391646685ecffa404eb986cbe007a3289499020daf72e88a2 \
+    --hash=sha256:779cbf1ce375b96111db98fca913c1f5ec11b1d870e529b1dc7354b2681a8c3a \
+    --hash=sha256:7f6fe42536d9dcd3e2ffb9d3053f5d05221ae3bbcefbe472bdf2c71c793e3183 \
+    --hash=sha256:891f712ce54e0d631370e1f4997b3f182f3368179198efc30d477c75d1f44942 \
+    --hash=sha256:95c68a4b9b7828ba0428f8f7e3109c5d476ca44996ed9a5f8aac6269296e2d59 \
+    --hash=sha256:96a8918a78d5d64e07c8ea4ed2bc44354e3f93f46a4866a40e8db934e4c0d74b \
+    --hash=sha256:9c3cf890c3c0ecfe1510a452a165431b5831e24160c5fcf2071f0f85ca5a47cd \
+    --hash=sha256:9f58099ad7affc0754ae42e6d87443299f15d739b0ce03c76f515153a5cda06c \
+    --hash=sha256:a0b9e622c3b2b8d0ce32f77eba617ab0d6768b82836391e4f8f9e2074582bf02 \
+    --hash=sha256:a7f9cbea4245ee36190f85fe1814e2d7b1e5f2186381b082f5d59f99b7f11328 \
+    --hash=sha256:bab4aebd525218bab4ee615786c4581952eadc16b1ff031813a2fd51f0cc7b08 \
+    --hash=sha256:c124b8c8779bf2d35d9b721e52d4adb41c9bfbde45e6a3f25f0820caa9aba73f \
+    --hash=sha256:c9da0a39b53d2fab3e5467329ed50e951eb91386e9d0d5b12daf593973c3b168 \
+    --hash=sha256:ca60076c388728d3b6ac3846842474f4250c91efbfe5afa872d3ffd69dd4b318 \
+    --hash=sha256:cb6994fff247987c66a8a4e550ef374671c2b82e3c0d2115e689d21e511a652d \
+    --hash=sha256:d1c1d6236feab51200272d79b3d3e0f12cf2cbb12b208c835b175a21efdb0a73 \
+    --hash=sha256:dd7760a88a8d3d705ff562aa93f8445ead54f58fd482e4f9e2bafb7e177375d4 \
+    --hash=sha256:dda4d8a3bb0b50f540f6ff4b6033f3a74e8bf0bd5320b70fab2c03e512a62812 \
+    --hash=sha256:e0f1ff55dde0ebcfbef027edc21f71c205845585fffe30d4ec4979416613e9b3 \
+    --hash=sha256:e7a539b9be7b9c00f11ef16b55486141bc2cdb0c54762f84e3c6fc091917436d \
+    --hash=sha256:eb0b14523758e37802f27b7f8cd973f5f3d33be7613952c0df904b68c4842f0e \
+    --hash=sha256:ed447680ff21c14aaceb6a9f99a5f639f583ccfe4ce1a5e1d48eb41c3d6b3217 \
+    --hash=sha256:f52a4ad2568314ee713715b1e2d79ab55fab11e8b304fd1462ff5cccf4264b3e \
+    --hash=sha256:fbd60c6aaa07c31d7754edbc2334aef50601b7f1ada67a96eb1eb57c7c72378f \
+    --hash=sha256:fc28e0db232c62ca0c3600884933178f0825c99be4474cdd645e378a10588125 \
+    --hash=sha256:fe31de3002e7b08eb20823b3735b97c86c5926dd0581c7710a680b418a8709d4 \
+    --hash=sha256:fec221a051150eeddfdfcff162e6db92c65ecf46cb0f7bb1bf812a1520ec026b \
+    --hash=sha256:ff71073ebf0e42258a42a0b34f2c09ec384977e7f6808999102eedd5b49920e3
+    # via
+    #   -r requirements.in
+    #   google-resumable-media
+google-resumable-media==2.3.3 \
+    --hash=sha256:27c52620bd364d1c8116eaac4ea2afcbfb81ae9139fb3199652fcac1724bfb6c \
+    --hash=sha256:5b52774ea7a829a8cdaa8bd2d4c3d4bc660c91b30857ab2668d0eb830f4ea8c5
+    # via
+    #   -r requirements.in
+    #   google-cloud-storage
+googleapis-common-protos==1.56.3 \
+    --hash=sha256:6f1369b58ed6cf3a4b7054a44ebe8d03b29c309257583a2bbdc064cd1e4a1442 \
+    --hash=sha256:87955d7b3a73e6e803f2572a33179de23989ebba725e05ea42f24838b792e461
+    # via
+    #   -r requirements.in
+    #   google-api-core
+idna==3.4 \
+    --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \
+    --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2
+    # via
+    #   -r requirements.in
+    #   requests
+importlib-metadata==4.8.3 \
+    --hash=sha256:65a9576a5b2d58ca44d133c42a241905cc45e34d2c06fd5ba2bafa221e5d7b5e \
+    --hash=sha256:766abffff765960fcc18003801f7044eb6755ffae4521c8e8ce8e83b9c9b0668
+    # via
+    #   -r requirements.in
+    #   keyring
+jeepney==0.7.1 \
+    --hash=sha256:1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac \
+    --hash=sha256:fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f
+    # via
+    #   -r requirements.in
+    #   keyring
+    #   secretstorage
+jinja2==3.0.3 \
+    --hash=sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8 \
+    --hash=sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7
+    # via
+    #   -r requirements.in
+    #   gcp-releasetool
+keyring==23.4.1 \
+    --hash=sha256:17e49fb0d6883c2b4445359434dba95aad84aabb29bbff044ad0ed7100232eca \
+    --hash=sha256:89cbd74d4683ed164c8082fb38619341097741323b3786905c6dac04d6915a55
+    # via
+    #   -r requirements.in
+    #   gcp-releasetool
+markupsafe==2.0.1 \
+    --hash=sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298 \
+    --hash=sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64 \
+    --hash=sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b \
+    --hash=sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194 \
+    --hash=sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567 \
+    --hash=sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff \
+    --hash=sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724 \
+    --hash=sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74 \
+    --hash=sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646 \
+    --hash=sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35 \
+    --hash=sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6 \
+    --hash=sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a \
+    --hash=sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6 \
+    --hash=sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad \
+    --hash=sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26 \
+    --hash=sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38 \
+    --hash=sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac \
+    --hash=sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7 \
+    --hash=sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6 \
+    --hash=sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047 \
+    --hash=sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75 \
+    --hash=sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f \
+    --hash=sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b \
+    --hash=sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135 \
+    --hash=sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8 \
+    --hash=sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a \
+    --hash=sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a \
+    --hash=sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1 \
+    --hash=sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9 \
+    --hash=sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864 \
+    --hash=sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914 \
+    --hash=sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee \
+    --hash=sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f \
+    --hash=sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18 \
+    --hash=sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8 \
+    --hash=sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2 \
+    --hash=sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d \
+    --hash=sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b \
+    --hash=sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b \
+    --hash=sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86 \
+    --hash=sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6 \
+    --hash=sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f \
+    --hash=sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb \
+    --hash=sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833 \
+    --hash=sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28 \
+    --hash=sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e \
+    --hash=sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415 \
+    --hash=sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902 \
+    --hash=sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f \
+    --hash=sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d \
+    --hash=sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9 \
+    --hash=sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d \
+    --hash=sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145 \
+    --hash=sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066 \
+    --hash=sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c \
+    --hash=sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1 \
+    --hash=sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a \
+    --hash=sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207 \
+    --hash=sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f \
+    --hash=sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53 \
+    --hash=sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd \
+    --hash=sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134 \
+    --hash=sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85 \
+    --hash=sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9 \
+    --hash=sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5 \
+    --hash=sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94 \
+    --hash=sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509 \
+    --hash=sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51 \
+    --hash=sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872
+    # via
+    #   -r requirements.in
+    #   jinja2
+packaging==21.3 \
+    --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \
+    --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522
+    # via
+    #   -r requirements.in
+    #   gcp-releasetool
+protobuf==3.19.5 \
+    --hash=sha256:1867f93b06a183f87696871bb8d1e99ee71dbb69d468ce1f0cc8bf3d30f982f3 \
+    --hash=sha256:3c4160b601220627f7e91154e572baf5e161a9c3f445a8242d536ee3d0b7b17c \
+    --hash=sha256:4ee2af7051d3b10c8a4fe6fd1a2c69f201fea36aeee7086cf202a692e1b99ee1 \
+    --hash=sha256:5266c36cc0af3bb3dbf44f199d225b33da66a9a5c3bdc2b14865ad10eddf0e37 \
+    --hash=sha256:5470f892961af464ae6eaf0f3099e2c1190ae8c7f36f174b89491281341f79ca \
+    --hash=sha256:66d14b5b90090353efe75c9fb1bf65ef7267383034688d255b500822e37d5c2f \
+    --hash=sha256:67efb5d20618020aa9596e17bfc37ca068c28ec0c1507d9507f73c93d46c9855 \
+    --hash=sha256:696e6cfab94cc15a14946f2bf72719dced087d437adbd994fff34f38986628bc \
+    --hash=sha256:6a02172b9650f819d01fb8e224fc69b0706458fc1ab4f1c669281243c71c1a5e \
+    --hash=sha256:6eca9ae238ba615d702387a2ddea635d535d769994a9968c09a4ca920c487ab9 \
+    --hash=sha256:950abd6c00e7b51f87ae8b18a0ce4d69fea217f62f171426e77de5061f6d9850 \
+    --hash=sha256:9e1d74032f56ff25f417cfe84c8147047732e5059137ca42efad20cbbd25f5e0 \
+    --hash=sha256:9e42b1cf2ecd8a1bd161239e693f22035ba99905ae6d7efeac8a0546c7ec1a27 \
+    --hash=sha256:9f957ef53e872d58a0afd3bf6d80d48535d28c99b40e75e6634cbc33ea42fd54 \
+    --hash=sha256:a89aa0c042e61e11ade320b802d6db4ee5391d8d973e46d3a48172c1597789f8 \
+    --hash=sha256:c0f80876a8ff0ae7064084ed094eb86497bd5a3812e6fc96a05318b92301674e \
+    --hash=sha256:c44e3282cff74ad18c7e8a0375f407f69ee50c2116364b44492a196293e08b21 \
+    --hash=sha256:d249519ba5ecf5dd6b18150c9b6bcde510b273714b696f3923ff8308fc11ae49 \
+    --hash=sha256:d3973a2d58aefc7d1230725c2447ce7f86a71cbc094b86a77c6ee1505ac7cdb1 \
+    --hash=sha256:dca2284378a5f2a86ffed35c6ac147d14c48b525eefcd1083e5a9ce28dfa8657 \
+    --hash=sha256:e63b0b3c42e51c94add62b010366cd4979cb6d5f06158bcae8faac4c294f91e1 \
+    --hash=sha256:f2b599a21c9a32e171ec29a2ac54e03297736c578698e11b099d031f79da114b \
+    --hash=sha256:f2bde37667b18c2b5280df83bc799204394a5d2d774e4deaf9de0eb741df6833 \
+    --hash=sha256:f4f909f4dde413dec435a44b0894956d55bb928ded7d6e3c726556ca4c796e84 \
+    --hash=sha256:f976234e20ab2785f54224bcdafa027674e23663b132fa3ca0caa291a6cfbde7 \
+    --hash=sha256:f9cebda093c2f6bfed88f1c17cdade09d4d96096421b344026feee236532d4de
+    # via
+    #   -r requirements.in
+    #   gcp-docuploader
+    #   gcp-releasetool
+    #   google-api-core
+    #   google-cloud-storage
+    #   googleapis-common-protos
+pyasn1==0.4.8 \
+    --hash=sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d \
+    --hash=sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba
+    # via
+    #   pyasn1-modules
+    #   rsa
+pyasn1-modules==0.2.8 \
+    --hash=sha256:905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e \
+    --hash=sha256:a50b808ffeb97cb3601dd25981f6b016cbb3d31fbf57a8b8a87428e6158d0c74
+    # via google-auth
+pycparser==2.21 \
+    --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \
+    --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
+    # via
+    #   -r requirements.in
+    #   cffi
+pyjwt==2.4.0 \
+    --hash=sha256:72d1d253f32dbd4f5c88eaf1fdc62f3a19f676ccbadb9dbc5d07e951b2b26daf \
+    --hash=sha256:d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba
+    # via
+    #   -r requirements.in
+    #   gcp-releasetool
+pyparsing==3.0.9 \
+    --hash=sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb \
+    --hash=sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc
+    # via
+    #   -r requirements.in
+    #   packaging
+pyperclip==1.8.2 \
+    --hash=sha256:105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57
+    # via
+    #   -r requirements.in
+    #   gcp-releasetool
+python-dateutil==2.8.2 \
+    --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \
+    --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9
+    # via
+    #   -r requirements.in
+    #   gcp-releasetool
+requests==2.27.1 \
+    --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \
+    --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d
+    # via
+    #   -r requirements.in
+    #   gcp-releasetool
+    #   google-api-core
+    #   google-cloud-storage
+rsa==4.9 \
+    --hash=sha256:90260d9058e514786967344d0ef75fa8727eed8a7d2e43ce9f4bcf1b536174f7 \
+    --hash=sha256:e38464a49c6c85d7f1351b0126661487a7e0a14a50f1675ec50eb34d4f20ef21
+    # via
+    #   -r requirements.in
+    #   google-auth
+secretstorage==3.3.3 \
+    --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \
+    --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99
+    # via keyring
+six==1.16.0 \
+    --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
+    --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
+    # via
+    #   -r requirements.in
+    #   gcp-docuploader
+    #   google-auth
+    #   python-dateutil
+typing-extensions==4.1.1 \
+    --hash=sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42 \
+    --hash=sha256:21c85e0fe4b9a155d0799430b0ad741cdce7e359660ccbd8b530613e8df88ce2
+    # via -r requirements.in
+urllib3==1.26.12 \
+    --hash=sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e \
+    --hash=sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997
+    # via
+    #   -r requirements.in
+    #   requests
+zipp==3.6.0 \
+    --hash=sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832 \
+    --hash=sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc
+    # via
+    #   -r requirements.in
+    #   importlib-metadata
diff --git a/java-common-protos/.kokoro/trampoline.sh b/java-common-protos/.kokoro/trampoline.sh
new file mode 100644
index 0000000000..8b69b793c9
--- /dev/null
+++ b/java-common-protos/.kokoro/trampoline.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+# Copyright 2018 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+set -eo pipefail
+# Always run the cleanup script, regardless of the success of bouncing into
+# the container.
+function cleanup() {
+    chmod +x ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh
+    ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh
+    echo "cleanup";
+}
+trap cleanup EXIT
+
+$(dirname $0)/populate-secrets.sh # Secret Manager secrets.
+python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py"
diff --git a/java-common-protos/CODE_OF_CONDUCT.md b/java-common-protos/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000000..2add2547a8
--- /dev/null
+++ b/java-common-protos/CODE_OF_CONDUCT.md
@@ -0,0 +1,94 @@
+<!-- # Generated by synthtool. DO NOT EDIT! !-->
+# Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of
+experience, education, socio-economic status, nationality, personal appearance,
+race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+*   Using welcoming and inclusive language
+*   Being respectful of differing viewpoints and experiences
+*   Gracefully accepting constructive criticism
+*   Focusing on what is best for the community
+*   Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+*   The use of sexualized language or imagery and unwelcome sexual attention or
+    advances
+*   Trolling, insulting/derogatory comments, and personal or political attacks
+*   Public or private harassment
+*   Publishing others' private information, such as a physical or electronic
+    address, without explicit permission
+*   Other conduct which could reasonably be considered inappropriate in a
+    professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, or to ban temporarily or permanently any
+contributor for other behaviors that they deem inappropriate, threatening,
+offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+This Code of Conduct also applies outside the project spaces when the Project
+Steward has a reasonable belief that an individual's behavior may have a
+negative impact on the project or its community.
+
+## Conflict Resolution
+
+We do not believe that all conflict is bad; healthy debate and disagreement
+often yield positive results. However, it is never okay to be disrespectful or
+to engage in behavior that violates the project’s code of conduct.
+
+If you see someone violating the code of conduct, you are encouraged to address
+the behavior directly with those involved. Many issues can be resolved quickly
+and easily, and this gives people more control over the outcome of their
+dispute. If you are unable to resolve the matter for any reason, or if the
+behavior is threatening or harassing, report it. We are dedicated to providing
+an environment where participants feel welcome and safe.
+
+Reports should be directed to *googleapis-stewards@google.com*, the
+Project Steward(s) for *Google Cloud Client Libraries*. It is the Project Steward’s duty to
+receive and address reported violations of the code of conduct. They will then
+work with a committee consisting of representatives from the Open Source
+Programs Office and the Google Open Source Strategy team. If for any reason you
+are uncomfortable reaching out to the Project Steward, please email
+opensource@google.com.
+
+We will investigate every complaint, but you may not receive a direct response.
+We will use our discretion in determining when and how to follow up on reported
+incidents, which may range from not taking action to permanent expulsion from
+the project and project-sponsored spaces. We will notify the accused of the
+report and provide them an opportunity to discuss it before any action is taken.
+The identity of the reporter will be omitted from the details of the report
+supplied to the accused. In potentially harmful situations, such as ongoing
+harassment or threats to anyone's safety, we may take action without notice.
+
+## Attribution
+
+This Code of Conduct is adapted from the Contributor Covenant, version 1.4,
+available at
+https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
\ No newline at end of file
diff --git a/java-common-protos/CONTRIBUTING.md b/java-common-protos/CONTRIBUTING.md
new file mode 100644
index 0000000000..b65dd279c9
--- /dev/null
+++ b/java-common-protos/CONTRIBUTING.md
@@ -0,0 +1,92 @@
+# How to Contribute
+
+We'd love to accept your patches and contributions to this project. There are
+just a few small guidelines you need to follow.
+
+## Contributor License Agreement
+
+Contributions to this project must be accompanied by a Contributor License
+Agreement. You (or your employer) retain the copyright to your contribution;
+this simply gives us permission to use and redistribute your contributions as
+part of the project. Head over to <https://cla.developers.google.com/> to see
+your current agreements on file or to sign a new one.
+
+You generally only need to submit a CLA once, so if you've already submitted one
+(even if it was for a different project), you probably don't need to do it
+again.
+
+## Code reviews
+
+All submissions, including submissions by project members, require review. We
+use GitHub pull requests for this purpose. Consult
+[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
+information on using pull requests.
+
+## Community Guidelines
+
+This project follows
+[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/).
+
+## Building the project
+
+To build, package, and run all unit tests run the command
+
+```
+mvn clean verify
+```
+
+### Running Integration tests
+
+To include integration tests when building the project, you need access to
+a GCP Project with a valid service account. 
+
+For instructions on how to generate a service account and corresponding
+credentials JSON see: [Creating a Service Account][1].
+
+Then run the following to build, package, run all unit tests and run all
+integration tests.
+
+```bash
+export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json
+mvn -Penable-integration-tests clean verify
+```
+
+## Code Samples
+
+All code samples must be in compliance with the [java sample formatting guide][3].
+Code Samples must be bundled in separate Maven modules.
+
+The samples must be separate from the primary project for a few reasons:
+1. Primary projects have a minimum Java version of Java 8 whereas samples can have
+   Java version of Java 11. Due to this we need the ability to
+   selectively exclude samples from a build run.
+2. Many code samples depend on external GCP services and need
+   credentials to access the service.
+3. Code samples are not released as Maven artifacts and must be excluded from 
+   release builds.
+   
+### Building
+
+```bash
+mvn clean verify
+```
+
+Some samples require access to GCP services and require a service account:
+
+```bash
+export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json
+mvn clean verify
+```
+
+### Code Formatting
+
+Code in this repo is formatted with
+[google-java-format](https://github.com/google/google-java-format).
+To run formatting on your project, you can run:
+```
+mvn com.coveo:fmt-maven-plugin:format
+```
+
+[1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account
+[2]: https://maven.apache.org/settings.html#Active_Profiles
+[3]: https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md
\ No newline at end of file
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 05efc2e8ae..16305c553e 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Advice.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Advice.java
@@ -66,7 +66,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 2;
-  private volatile java.lang.Object description_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object description_ = "";
   /**
    *
    *
@@ -309,8 +311,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       description_ = "";
-
       return this;
     }
 
@@ -336,11 +338,20 @@ 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);
-      result.description_ = description_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -388,6 +399,7 @@ 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());
@@ -419,7 +431,7 @@ public Builder mergeFrom(
             case 18:
               {
                 description_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 18
             default:
@@ -439,6 +451,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object description_ = "";
     /**
      *
@@ -503,8 +517,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       description_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -521,8 +535,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;
     }
@@ -544,8 +558,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/AuthProvider.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthProvider.java
index 7cdf1596f1..b5e3be7c88 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthProvider.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthProvider.java
@@ -72,7 +72,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ID_FIELD_NUMBER = 1;
-  private volatile java.lang.Object id_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object id_ = "";
   /**
    *
    *
@@ -125,7 +127,9 @@ public com.google.protobuf.ByteString getIdBytes() {
   }
 
   public static final int ISSUER_FIELD_NUMBER = 2;
-  private volatile java.lang.Object issuer_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object issuer_ = "";
   /**
    *
    *
@@ -182,7 +186,9 @@ public com.google.protobuf.ByteString getIssuerBytes() {
   }
 
   public static final int JWKS_URI_FIELD_NUMBER = 3;
-  private volatile java.lang.Object jwksUri_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object jwksUri_ = "";
   /**
    *
    *
@@ -251,7 +257,9 @@ public com.google.protobuf.ByteString getJwksUriBytes() {
   }
 
   public static final int AUDIENCES_FIELD_NUMBER = 4;
-  private volatile java.lang.Object audiences_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object audiences_ = "";
   /**
    *
    *
@@ -328,7 +336,9 @@ public com.google.protobuf.ByteString getAudiencesBytes() {
   }
 
   public static final int AUTHORIZATION_URL_FIELD_NUMBER = 5;
-  private volatile java.lang.Object authorizationUrl_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object authorizationUrl_ = "";
   /**
    *
    *
@@ -379,6 +389,8 @@ public com.google.protobuf.ByteString getAuthorizationUrlBytes() {
   }
 
   public static final int JWT_LOCATIONS_FIELD_NUMBER = 6;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.JwtLocation> jwtLocations_;
   /**
    *
@@ -758,23 +770,19 @@ 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_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000020);
       return this;
     }
 
@@ -800,23 +808,43 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.id_ = id_;
-      result.issuer_ = issuer_;
-      result.jwksUri_ = jwksUri_;
-      result.audiences_ = audiences_;
-      result.authorizationUrl_ = authorizationUrl_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.AuthProvider result) {
       if (jwtLocationsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000020) != 0)) {
           jwtLocations_ = java.util.Collections.unmodifiableList(jwtLocations_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000020);
         }
         result.jwtLocations_ = jwtLocations_;
       } else {
         result.jwtLocations_ = jwtLocationsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    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_;
+      }
     }
 
     @java.lang.Override
@@ -866,29 +894,34 @@ 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_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000020);
           } else {
             ensureJwtLocationsIsMutable();
             jwtLocations_.addAll(other.jwtLocations_);
@@ -901,7 +934,7 @@ public Builder mergeFrom(com.google.api.AuthProvider other) {
             jwtLocationsBuilder_.dispose();
             jwtLocationsBuilder_ = null;
             jwtLocations_ = other.jwtLocations_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000020);
             jwtLocationsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getJwtLocationsFieldBuilder()
@@ -940,31 +973,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:
@@ -1065,8 +1098,8 @@ public Builder setId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       id_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1084,8 +1117,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;
     }
@@ -1108,8 +1141,8 @@ public Builder setIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       id_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1187,8 +1220,8 @@ public Builder setIssuer(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       issuer_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1208,8 +1241,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;
     }
@@ -1234,8 +1267,8 @@ public Builder setIssuerBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       issuer_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1331,8 +1364,8 @@ public Builder setJwksUri(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       jwksUri_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1358,8 +1391,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;
     }
@@ -1390,8 +1423,8 @@ public Builder setJwksUriBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       jwksUri_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1499,8 +1532,8 @@ public Builder setAudiences(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       audiences_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1530,8 +1563,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;
     }
@@ -1566,8 +1599,8 @@ public Builder setAudiencesBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       audiences_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1636,8 +1669,8 @@ public Builder setAuthorizationUrl(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       authorizationUrl_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1654,8 +1687,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;
     }
@@ -1677,8 +1710,8 @@ public Builder setAuthorizationUrlBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       authorizationUrl_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1687,9 +1720,9 @@ public Builder setAuthorizationUrlBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureJwtLocationsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000020) != 0)) {
         jwtLocations_ = new java.util.ArrayList<com.google.api.JwtLocation>(jwtLocations_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000020;
       }
     }
 
@@ -2056,7 +2089,7 @@ public Builder addAllJwtLocations(
     public Builder clearJwtLocations() {
       if (jwtLocationsBuilder_ == null) {
         jwtLocations_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000020);
         onChanged();
       } else {
         jwtLocationsBuilder_.clear();
@@ -2275,7 +2308,7 @@ public java.util.List<com.google.api.JwtLocation.Builder> getJwtLocationsBuilder
                 com.google.api.JwtLocation,
                 com.google.api.JwtLocation.Builder,
                 com.google.api.JwtLocationOrBuilder>(
-                jwtLocations_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                jwtLocations_, ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean());
         jwtLocations_ = null;
       }
       return jwtLocationsBuilder_;
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 3bfbcfa23d..1c3418f5f3 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthRequirement.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthRequirement.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PROVIDER_ID_FIELD_NUMBER = 1;
-  private volatile java.lang.Object providerId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object providerId_ = "";
   /**
    *
    *
@@ -121,7 +123,9 @@ public com.google.protobuf.ByteString getProviderIdBytes() {
   }
 
   public static final int AUDIENCES_FIELD_NUMBER = 2;
-  private volatile java.lang.Object audiences_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object audiences_ = "";
   /**
    *
    *
@@ -396,10 +400,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       providerId_ = "";
-
       audiences_ = "";
-
       return this;
     }
 
@@ -425,12 +428,23 @@ 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);
-      result.providerId_ = providerId_;
-      result.audiences_ = audiences_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -478,10 +492,12 @@ 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());
@@ -513,13 +529,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:
@@ -539,6 +555,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object providerId_ = "";
     /**
      *
@@ -606,8 +624,8 @@ public Builder setProviderId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       providerId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -625,8 +643,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;
     }
@@ -649,8 +667,8 @@ public Builder setProviderIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       providerId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -752,8 +770,8 @@ public Builder setAudiences(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       audiences_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -781,8 +799,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;
     }
@@ -815,8 +833,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/Authentication.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Authentication.java
index 4977c6c81d..cc415379a2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Authentication.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Authentication.java
@@ -81,6 +81,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RULES_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.AuthenticationRule> rules_;
   /**
    *
@@ -155,6 +157,8 @@ public com.google.api.AuthenticationRuleOrBuilder getRulesOrBuilder(int index) {
   }
 
   public static final int PROVIDERS_FIELD_NUMBER = 4;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.AuthProvider> providers_;
   /**
    *
@@ -443,6 +447,7 @@ 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 {
@@ -482,7 +487,15 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.Authentication result) {
       if (rulesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           rules_ = java.util.Collections.unmodifiableList(rules_);
@@ -501,8 +514,10 @@ public com.google.api.Authentication buildPartial() {
       } else {
         result.providers_ = providersBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.api.Authentication result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
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 243ee15bd0..e0edb2ae62 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
@@ -73,7 +73,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SELECTOR_FIELD_NUMBER = 1;
-  private volatile java.lang.Object selector_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object selector_ = "";
   /**
    *
    *
@@ -166,11 +168,11 @@ public com.google.api.OAuthRequirements getOauth() {
    */
   @java.lang.Override
   public com.google.api.OAuthRequirementsOrBuilder getOauthOrBuilder() {
-    return getOauth();
+    return oauth_ == null ? com.google.api.OAuthRequirements.getDefaultInstance() : oauth_;
   }
 
   public static final int ALLOW_WITHOUT_CREDENTIAL_FIELD_NUMBER = 5;
-  private boolean allowWithoutCredential_;
+  private boolean allowWithoutCredential_ = false;
   /**
    *
    *
@@ -189,6 +191,8 @@ public boolean getAllowWithoutCredential() {
   }
 
   public static final int REQUIREMENTS_FIELD_NUMBER = 7;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.AuthRequirement> requirements_;
   /**
    *
@@ -491,23 +495,21 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       selector_ = "";
-
-      if (oauthBuilder_ == null) {
-        oauth_ = null;
-      } else {
-        oauth_ = null;
+      oauth_ = null;
+      if (oauthBuilder_ != null) {
+        oauthBuilder_.dispose();
         oauthBuilder_ = null;
       }
       allowWithoutCredential_ = false;
-
       if (requirementsBuilder_ == null) {
         requirements_ = java.util.Collections.emptyList();
       } else {
         requirements_ = null;
         requirementsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000008);
       return this;
     }
 
@@ -533,25 +535,37 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.selector_ = selector_;
-      if (oauthBuilder_ == null) {
-        result.oauth_ = oauth_;
-      } else {
-        result.oauth_ = oauthBuilder_.build();
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.allowWithoutCredential_ = allowWithoutCredential_;
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.AuthenticationRule result) {
       if (requirementsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000008) != 0)) {
           requirements_ = java.util.Collections.unmodifiableList(requirements_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000008);
         }
         result.requirements_ = requirements_;
       } else {
         result.requirements_ = requirementsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.api.AuthenticationRule result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.selector_ = selector_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.oauth_ = oauthBuilder_ == null ? oauth_ : oauthBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.allowWithoutCredential_ = allowWithoutCredential_;
+      }
     }
 
     @java.lang.Override
@@ -601,6 +615,7 @@ 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()) {
@@ -613,7 +628,7 @@ public Builder mergeFrom(com.google.api.AuthenticationRule other) {
         if (!other.requirements_.isEmpty()) {
           if (requirements_.isEmpty()) {
             requirements_ = other.requirements_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000008);
           } else {
             ensureRequirementsIsMutable();
             requirements_.addAll(other.requirements_);
@@ -626,7 +641,7 @@ public Builder mergeFrom(com.google.api.AuthenticationRule other) {
             requirementsBuilder_.dispose();
             requirementsBuilder_ = null;
             requirements_ = other.requirements_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000008);
             requirementsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getRequirementsFieldBuilder()
@@ -665,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:
@@ -775,8 +790,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       selector_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -793,8 +808,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;
     }
@@ -816,8 +831,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       selector_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -840,7 +855,7 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
      * @return Whether the oauth field is set.
      */
     public boolean hasOauth() {
-      return oauthBuilder_ != null || oauth_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -875,11 +890,11 @@ public Builder setOauth(com.google.api.OAuthRequirements value) {
           throw new NullPointerException();
         }
         oauth_ = value;
-        onChanged();
       } else {
         oauthBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -894,11 +909,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;
     }
     /**
@@ -912,17 +927,18 @@ public Builder setOauth(com.google.api.OAuthRequirements.Builder builderForValue
      */
     public Builder mergeOauth(com.google.api.OAuthRequirements value) {
       if (oauthBuilder_ == null) {
-        if (oauth_ != null) {
-          oauth_ =
-              com.google.api.OAuthRequirements.newBuilder(oauth_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && oauth_ != null
+            && oauth_ != com.google.api.OAuthRequirements.getDefaultInstance()) {
+          getOauthBuilder().mergeFrom(value);
         } else {
           oauth_ = value;
         }
-        onChanged();
       } else {
         oauthBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -935,14 +951,13 @@ public Builder mergeOauth(com.google.api.OAuthRequirements value) {
      * <code>.google.api.OAuthRequirements oauth = 2;</code>
      */
     public Builder clearOauth() {
-      if (oauthBuilder_ == null) {
-        oauth_ = null;
-        onChanged();
-      } else {
-        oauth_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      oauth_ = null;
+      if (oauthBuilder_ != null) {
+        oauthBuilder_.dispose();
         oauthBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -955,7 +970,7 @@ public Builder clearOauth() {
      * <code>.google.api.OAuthRequirements oauth = 2;</code>
      */
     public com.google.api.OAuthRequirements.Builder getOauthBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getOauthFieldBuilder().getBuilder();
     }
@@ -1034,6 +1049,7 @@ public boolean getAllowWithoutCredential() {
     public Builder setAllowWithoutCredential(boolean value) {
 
       allowWithoutCredential_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1050,7 +1066,7 @@ public Builder setAllowWithoutCredential(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearAllowWithoutCredential() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       allowWithoutCredential_ = false;
       onChanged();
       return this;
@@ -1060,9 +1076,9 @@ public Builder clearAllowWithoutCredential() {
         java.util.Collections.emptyList();
 
     private void ensureRequirementsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         requirements_ = new java.util.ArrayList<com.google.api.AuthRequirement>(requirements_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000008;
       }
     }
 
@@ -1277,7 +1293,7 @@ public Builder addAllRequirements(
     public Builder clearRequirements() {
       if (requirementsBuilder_ == null) {
         requirements_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
       } else {
         requirementsBuilder_.clear();
@@ -1398,7 +1414,7 @@ public java.util.List<com.google.api.AuthRequirement.Builder> getRequirementsBui
                 com.google.api.AuthRequirement,
                 com.google.api.AuthRequirement.Builder,
                 com.google.api.AuthRequirementOrBuilder>(
-                requirements_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                requirements_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
         requirements_ = null;
       }
       return requirementsBuilder_;
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 aa0018eae9..316b08163d 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Backend.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Backend.java
@@ -65,6 +65,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RULES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.BackendRule> rules_;
   /**
    *
@@ -331,6 +333,7 @@ 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 {
@@ -363,7 +366,15 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.Backend result) {
       if (rulesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           rules_ = java.util.Collections.unmodifiableList(rules_);
@@ -373,8 +384,10 @@ public com.google.api.Backend buildPartial() {
       } else {
         result.rules_ = rulesBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.api.Backend result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
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 61295a0f38..3b25610d3f 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
@@ -319,7 +319,9 @@ public AuthenticationCase getAuthenticationCase() {
   }
 
   public static final int SELECTOR_FIELD_NUMBER = 1;
-  private volatile java.lang.Object selector_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object selector_ = "";
   /**
    *
    *
@@ -370,7 +372,9 @@ public com.google.protobuf.ByteString getSelectorBytes() {
   }
 
   public static final int ADDRESS_FIELD_NUMBER = 2;
-  private volatile java.lang.Object address_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object address_ = "";
   /**
    *
    *
@@ -447,7 +451,7 @@ public com.google.protobuf.ByteString getAddressBytes() {
   }
 
   public static final int DEADLINE_FIELD_NUMBER = 3;
-  private double deadline_;
+  private double deadline_ = 0D;
   /**
    *
    *
@@ -466,7 +470,7 @@ public double getDeadline() {
   }
 
   public static final int MIN_DEADLINE_FIELD_NUMBER = 4;
-  private double minDeadline_;
+  private double minDeadline_ = 0D;
   /**
    *
    *
@@ -487,7 +491,7 @@ public double getMinDeadline() {
   }
 
   public static final int OPERATION_DEADLINE_FIELD_NUMBER = 5;
-  private double operationDeadline_;
+  private double operationDeadline_ = 0D;
   /**
    *
    *
@@ -506,7 +510,7 @@ public double getOperationDeadline() {
   }
 
   public static final int PATH_TRANSLATION_FIELD_NUMBER = 6;
-  private int pathTranslation_;
+  private int pathTranslation_ = 0;
   /**
    * <code>.google.api.BackendRule.PathTranslation path_translation = 6;</code>
    *
@@ -523,9 +527,8 @@ 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.valueOf(pathTranslation_);
+        com.google.api.BackendRule.PathTranslation.forNumber(pathTranslation_);
     return result == null ? com.google.api.BackendRule.PathTranslation.UNRECOGNIZED : result;
   }
 
@@ -647,7 +650,9 @@ public boolean getDisableAuth() {
   }
 
   public static final int PROTOCOL_FIELD_NUMBER = 9;
-  private volatile java.lang.Object protocol_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object protocol_ = "";
   /**
    *
    *
@@ -1022,20 +1027,14 @@ 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_ = "";
-
       authenticationCase_ = 0;
       authentication_ = null;
       return this;
@@ -1063,24 +1062,44 @@ 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);
-      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 (authenticationCase_ == 8) {
-        result.authentication_ = authentication_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.protocol_ = protocol_;
-      result.authenticationCase_ = authenticationCase_;
+      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_;
+      }
+    }
+
+    private void buildPartialOneofs(com.google.api.BackendRule result) {
+      result.authenticationCase_ = authenticationCase_;
+      result.authentication_ = this.authentication_;
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -1128,10 +1147,12 @@ 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) {
@@ -1148,6 +1169,7 @@ public Builder mergeFrom(com.google.api.BackendRule other) {
       }
       if (!other.getProtocol().isEmpty()) {
         protocol_ = other.protocol_;
+        bitField0_ |= 0x00000100;
         onChanged();
       }
       switch (other.getAuthenticationCase()) {
@@ -1197,37 +1219,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:
@@ -1246,7 +1268,7 @@ public Builder mergeFrom(
             case 74:
               {
                 protocol_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000100;
                 break;
               } // case 74
             default:
@@ -1280,6 +1302,8 @@ public Builder clearAuthentication() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object selector_ = "";
     /**
      *
@@ -1344,8 +1368,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       selector_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1362,8 +1386,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;
     }
@@ -1385,8 +1409,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       selector_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1494,8 +1518,8 @@ public Builder setAddress(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       address_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1525,8 +1549,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;
     }
@@ -1561,8 +1585,8 @@ public Builder setAddressBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       address_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1600,6 +1624,7 @@ public double getDeadline() {
     public Builder setDeadline(double value) {
 
       deadline_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1616,7 +1641,7 @@ public Builder setDeadline(double value) {
      * @return This builder for chaining.
      */
     public Builder clearDeadline() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       deadline_ = 0D;
       onChanged();
       return this;
@@ -1659,6 +1684,7 @@ public double getMinDeadline() {
     public Builder setMinDeadline(double value) {
 
       minDeadline_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1677,7 +1703,7 @@ public Builder setMinDeadline(double value) {
      */
     @java.lang.Deprecated
     public Builder clearMinDeadline() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       minDeadline_ = 0D;
       onChanged();
       return this;
@@ -1716,6 +1742,7 @@ public double getOperationDeadline() {
     public Builder setOperationDeadline(double value) {
 
       operationDeadline_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1732,7 +1759,7 @@ public Builder setOperationDeadline(double value) {
      * @return This builder for chaining.
      */
     public Builder clearOperationDeadline() {
-
+      bitField0_ = (bitField0_ & ~0x00000010);
       operationDeadline_ = 0D;
       onChanged();
       return this;
@@ -1755,8 +1782,8 @@ public int getPathTranslationValue() {
      * @return This builder for chaining.
      */
     public Builder setPathTranslationValue(int value) {
-
       pathTranslation_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1767,9 +1794,8 @@ 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.valueOf(pathTranslation_);
+          com.google.api.BackendRule.PathTranslation.forNumber(pathTranslation_);
       return result == null ? com.google.api.BackendRule.PathTranslation.UNRECOGNIZED : result;
     }
     /**
@@ -1782,7 +1808,7 @@ public Builder setPathTranslation(com.google.api.BackendRule.PathTranslation val
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000020;
       pathTranslation_ = value.getNumber();
       onChanged();
       return this;
@@ -1793,7 +1819,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;
@@ -1998,6 +2024,7 @@ public boolean getDisableAuth() {
      * @return This builder for chaining.
      */
     public Builder setDisableAuth(boolean value) {
+
       authenticationCase_ = 8;
       authentication_ = value;
       onChanged();
@@ -2132,8 +2159,8 @@ public Builder setProtocol(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       protocol_ = value;
+      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -2164,8 +2191,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;
     }
@@ -2201,8 +2228,8 @@ public Builder setProtocolBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       protocol_ = value;
+      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
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 c984725897..27c25dbbb8 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
@@ -231,7 +231,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int MONITORED_RESOURCE_FIELD_NUMBER = 1;
-    private volatile java.lang.Object monitoredResource_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object monitoredResource_ = "";
     /**
      *
      *
@@ -282,6 +284,8 @@ public com.google.protobuf.ByteString getMonitoredResourceBytes() {
     }
 
     public static final int METRICS_FIELD_NUMBER = 2;
+
+    @SuppressWarnings("serial")
     private com.google.protobuf.LazyStringList metrics_;
     /**
      *
@@ -562,10 +566,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.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -593,17 +597,29 @@ 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);
-        int from_bitField0_ = bitField0_;
-        result.monitoredResource_ = monitoredResource_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          metrics_ = metrics_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000001);
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
-        result.metrics_ = metrics_;
         onBuilt();
         return result;
       }
 
+      private void buildPartialRepeatedFields(com.google.api.Billing.BillingDestination result) {
+        if (((bitField0_ & 0x00000002) != 0)) {
+          metrics_ = metrics_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.metrics_ = metrics_;
+      }
+
+      private void buildPartial0(com.google.api.Billing.BillingDestination result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.monitoredResource_ = monitoredResource_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -653,12 +669,13 @@ 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_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureMetricsIsMutable();
             metrics_.addAll(other.metrics_);
@@ -694,7 +711,7 @@ public Builder mergeFrom(
               case 10:
                 {
                   monitoredResource_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
@@ -787,8 +804,8 @@ public Builder setMonitoredResource(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         monitoredResource_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -805,8 +822,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;
       }
@@ -828,8 +845,8 @@ public Builder setMonitoredResourceBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         monitoredResource_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -838,9 +855,9 @@ public Builder setMonitoredResourceBytes(com.google.protobuf.ByteString value) {
           com.google.protobuf.LazyStringArrayList.EMPTY;
 
       private void ensureMetricsIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
           metrics_ = new com.google.protobuf.LazyStringArrayList(metrics_);
-          bitField0_ |= 0x00000001;
+          bitField0_ |= 0x00000002;
         }
       }
       /**
@@ -983,7 +1000,7 @@ public Builder addAllMetrics(java.lang.Iterable<java.lang.String> values) {
        */
       public Builder clearMetrics() {
         metrics_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1076,6 +1093,8 @@ public com.google.api.Billing.BillingDestination getDefaultInstanceForType() {
   }
 
   public static final int CONSUMER_DESTINATIONS_FIELD_NUMBER = 8;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.Billing.BillingDestination> consumerDestinations_;
   /**
    *
@@ -1383,6 +1402,7 @@ 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 {
@@ -1415,7 +1435,15 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.Billing result) {
       if (consumerDestinationsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           consumerDestinations_ = java.util.Collections.unmodifiableList(consumerDestinations_);
@@ -1425,8 +1453,10 @@ public com.google.api.Billing buildPartial() {
       } else {
         result.consumerDestinations_ = consumerDestinationsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.api.Billing result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
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 eb90369fb0..69164dba53 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
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int VERSION_FIELD_NUMBER = 1;
-  private volatile java.lang.Object version_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object version_ = "";
   /**
    *
    *
@@ -117,7 +119,7 @@ public com.google.protobuf.ByteString getVersionBytes() {
   }
 
   public static final int LAUNCH_STAGE_FIELD_NUMBER = 2;
-  private int launchStage_;
+  private int launchStage_ = 0;
   /**
    *
    *
@@ -146,13 +148,12 @@ public int getLaunchStageValue() {
    */
   @java.lang.Override
   public com.google.api.LaunchStage getLaunchStage() {
-    @SuppressWarnings("deprecation")
-    com.google.api.LaunchStage result = com.google.api.LaunchStage.valueOf(launchStage_);
+    com.google.api.LaunchStage result = com.google.api.LaunchStage.forNumber(launchStage_);
     return result == null ? com.google.api.LaunchStage.UNRECOGNIZED : result;
   }
 
   public static final int REST_NUMERIC_ENUMS_FIELD_NUMBER = 3;
-  private boolean restNumericEnums_;
+  private boolean restNumericEnums_ = false;
   /**
    *
    *
@@ -213,7 +214,7 @@ public com.google.api.JavaSettings getJavaSettings() {
    */
   @java.lang.Override
   public com.google.api.JavaSettingsOrBuilder getJavaSettingsOrBuilder() {
-    return getJavaSettings();
+    return javaSettings_ == null ? com.google.api.JavaSettings.getDefaultInstance() : javaSettings_;
   }
 
   public static final int CPP_SETTINGS_FIELD_NUMBER = 22;
@@ -259,7 +260,7 @@ public com.google.api.CppSettings getCppSettings() {
    */
   @java.lang.Override
   public com.google.api.CppSettingsOrBuilder getCppSettingsOrBuilder() {
-    return getCppSettings();
+    return cppSettings_ == null ? com.google.api.CppSettings.getDefaultInstance() : cppSettings_;
   }
 
   public static final int PHP_SETTINGS_FIELD_NUMBER = 23;
@@ -305,7 +306,7 @@ public com.google.api.PhpSettings getPhpSettings() {
    */
   @java.lang.Override
   public com.google.api.PhpSettingsOrBuilder getPhpSettingsOrBuilder() {
-    return getPhpSettings();
+    return phpSettings_ == null ? com.google.api.PhpSettings.getDefaultInstance() : phpSettings_;
   }
 
   public static final int PYTHON_SETTINGS_FIELD_NUMBER = 24;
@@ -353,7 +354,9 @@ public com.google.api.PythonSettings getPythonSettings() {
    */
   @java.lang.Override
   public com.google.api.PythonSettingsOrBuilder getPythonSettingsOrBuilder() {
-    return getPythonSettings();
+    return pythonSettings_ == null
+        ? com.google.api.PythonSettings.getDefaultInstance()
+        : pythonSettings_;
   }
 
   public static final int NODE_SETTINGS_FIELD_NUMBER = 25;
@@ -399,7 +402,7 @@ public com.google.api.NodeSettings getNodeSettings() {
    */
   @java.lang.Override
   public com.google.api.NodeSettingsOrBuilder getNodeSettingsOrBuilder() {
-    return getNodeSettings();
+    return nodeSettings_ == null ? com.google.api.NodeSettings.getDefaultInstance() : nodeSettings_;
   }
 
   public static final int DOTNET_SETTINGS_FIELD_NUMBER = 26;
@@ -447,7 +450,9 @@ public com.google.api.DotnetSettings getDotnetSettings() {
    */
   @java.lang.Override
   public com.google.api.DotnetSettingsOrBuilder getDotnetSettingsOrBuilder() {
-    return getDotnetSettings();
+    return dotnetSettings_ == null
+        ? com.google.api.DotnetSettings.getDefaultInstance()
+        : dotnetSettings_;
   }
 
   public static final int RUBY_SETTINGS_FIELD_NUMBER = 27;
@@ -493,7 +498,7 @@ public com.google.api.RubySettings getRubySettings() {
    */
   @java.lang.Override
   public com.google.api.RubySettingsOrBuilder getRubySettingsOrBuilder() {
-    return getRubySettings();
+    return rubySettings_ == null ? com.google.api.RubySettings.getDefaultInstance() : rubySettings_;
   }
 
   public static final int GO_SETTINGS_FIELD_NUMBER = 28;
@@ -539,7 +544,7 @@ public com.google.api.GoSettings getGoSettings() {
    */
   @java.lang.Override
   public com.google.api.GoSettingsOrBuilder getGoSettingsOrBuilder() {
-    return getGoSettings();
+    return goSettings_ == null ? com.google.api.GoSettings.getDefaultInstance() : goSettings_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -866,58 +871,48 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       version_ = "";
-
       launchStage_ = 0;
-
       restNumericEnums_ = false;
-
-      if (javaSettingsBuilder_ == null) {
-        javaSettings_ = null;
-      } else {
-        javaSettings_ = null;
+      javaSettings_ = null;
+      if (javaSettingsBuilder_ != null) {
+        javaSettingsBuilder_.dispose();
         javaSettingsBuilder_ = null;
       }
-      if (cppSettingsBuilder_ == null) {
-        cppSettings_ = null;
-      } else {
-        cppSettings_ = null;
+      cppSettings_ = null;
+      if (cppSettingsBuilder_ != null) {
+        cppSettingsBuilder_.dispose();
         cppSettingsBuilder_ = null;
       }
-      if (phpSettingsBuilder_ == null) {
-        phpSettings_ = null;
-      } else {
-        phpSettings_ = null;
+      phpSettings_ = null;
+      if (phpSettingsBuilder_ != null) {
+        phpSettingsBuilder_.dispose();
         phpSettingsBuilder_ = null;
       }
-      if (pythonSettingsBuilder_ == null) {
-        pythonSettings_ = null;
-      } else {
-        pythonSettings_ = null;
+      pythonSettings_ = null;
+      if (pythonSettingsBuilder_ != null) {
+        pythonSettingsBuilder_.dispose();
         pythonSettingsBuilder_ = null;
       }
-      if (nodeSettingsBuilder_ == null) {
-        nodeSettings_ = null;
-      } else {
-        nodeSettings_ = null;
+      nodeSettings_ = null;
+      if (nodeSettingsBuilder_ != null) {
+        nodeSettingsBuilder_.dispose();
         nodeSettingsBuilder_ = null;
       }
-      if (dotnetSettingsBuilder_ == null) {
-        dotnetSettings_ = null;
-      } else {
-        dotnetSettings_ = null;
+      dotnetSettings_ = null;
+      if (dotnetSettingsBuilder_ != null) {
+        dotnetSettingsBuilder_.dispose();
         dotnetSettingsBuilder_ = null;
       }
-      if (rubySettingsBuilder_ == null) {
-        rubySettings_ = null;
-      } else {
-        rubySettings_ = null;
+      rubySettings_ = null;
+      if (rubySettingsBuilder_ != null) {
+        rubySettingsBuilder_.dispose();
         rubySettingsBuilder_ = null;
       }
-      if (goSettingsBuilder_ == null) {
-        goSettings_ = null;
-      } else {
-        goSettings_ = null;
+      goSettings_ = null;
+      if (goSettingsBuilder_ != null) {
+        goSettingsBuilder_.dispose();
         goSettingsBuilder_ = null;
       }
       return this;
@@ -945,51 +940,55 @@ 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);
-      result.version_ = version_;
-      result.launchStage_ = launchStage_;
-      result.restNumericEnums_ = restNumericEnums_;
-      if (javaSettingsBuilder_ == null) {
-        result.javaSettings_ = javaSettings_;
-      } else {
-        result.javaSettings_ = javaSettingsBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (cppSettingsBuilder_ == null) {
-        result.cppSettings_ = cppSettings_;
-      } else {
-        result.cppSettings_ = cppSettingsBuilder_.build();
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.api.ClientLibrarySettings result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.version_ = version_;
       }
-      if (phpSettingsBuilder_ == null) {
-        result.phpSettings_ = phpSettings_;
-      } else {
-        result.phpSettings_ = phpSettingsBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.launchStage_ = launchStage_;
       }
-      if (pythonSettingsBuilder_ == null) {
-        result.pythonSettings_ = pythonSettings_;
-      } else {
-        result.pythonSettings_ = pythonSettingsBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.restNumericEnums_ = restNumericEnums_;
       }
-      if (nodeSettingsBuilder_ == null) {
-        result.nodeSettings_ = nodeSettings_;
-      } else {
-        result.nodeSettings_ = nodeSettingsBuilder_.build();
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.javaSettings_ =
+            javaSettingsBuilder_ == null ? javaSettings_ : javaSettingsBuilder_.build();
       }
-      if (dotnetSettingsBuilder_ == null) {
-        result.dotnetSettings_ = dotnetSettings_;
-      } else {
-        result.dotnetSettings_ = dotnetSettingsBuilder_.build();
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.cppSettings_ =
+            cppSettingsBuilder_ == null ? cppSettings_ : cppSettingsBuilder_.build();
       }
-      if (rubySettingsBuilder_ == null) {
-        result.rubySettings_ = rubySettings_;
-      } else {
-        result.rubySettings_ = rubySettingsBuilder_.build();
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.phpSettings_ =
+            phpSettingsBuilder_ == null ? phpSettings_ : phpSettingsBuilder_.build();
       }
-      if (goSettingsBuilder_ == null) {
-        result.goSettings_ = goSettings_;
-      } else {
-        result.goSettings_ = goSettingsBuilder_.build();
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.pythonSettings_ =
+            pythonSettingsBuilder_ == null ? pythonSettings_ : pythonSettingsBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.nodeSettings_ =
+            nodeSettingsBuilder_ == null ? nodeSettings_ : nodeSettingsBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000100) != 0)) {
+        result.dotnetSettings_ =
+            dotnetSettingsBuilder_ == null ? dotnetSettings_ : dotnetSettingsBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000200) != 0)) {
+        result.rubySettings_ =
+            rubySettingsBuilder_ == null ? rubySettings_ : rubySettingsBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000400) != 0)) {
+        result.goSettings_ = goSettingsBuilder_ == null ? goSettings_ : goSettingsBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -1039,6 +1038,7 @@ 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) {
@@ -1100,67 +1100,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:
@@ -1180,6 +1180,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object version_ = "";
     /**
      *
@@ -1241,8 +1243,8 @@ public Builder setVersion(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       version_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1258,8 +1260,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;
     }
@@ -1280,8 +1282,8 @@ public Builder setVersionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       version_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1315,8 +1317,8 @@ public int getLaunchStageValue() {
      * @return This builder for chaining.
      */
     public Builder setLaunchStageValue(int value) {
-
       launchStage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1333,8 +1335,7 @@ public Builder setLaunchStageValue(int value) {
      */
     @java.lang.Override
     public com.google.api.LaunchStage getLaunchStage() {
-      @SuppressWarnings("deprecation")
-      com.google.api.LaunchStage result = com.google.api.LaunchStage.valueOf(launchStage_);
+      com.google.api.LaunchStage result = com.google.api.LaunchStage.forNumber(launchStage_);
       return result == null ? com.google.api.LaunchStage.UNRECOGNIZED : result;
     }
     /**
@@ -1353,7 +1354,7 @@ public Builder setLaunchStage(com.google.api.LaunchStage value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       launchStage_ = value.getNumber();
       onChanged();
       return this;
@@ -1370,7 +1371,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;
@@ -1409,6 +1410,7 @@ public boolean getRestNumericEnums() {
     public Builder setRestNumericEnums(boolean value) {
 
       restNumericEnums_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1425,7 +1427,7 @@ public Builder setRestNumericEnums(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearRestNumericEnums() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       restNumericEnums_ = false;
       onChanged();
       return this;
@@ -1449,7 +1451,7 @@ public Builder clearRestNumericEnums() {
      * @return Whether the javaSettings field is set.
      */
     public boolean hasJavaSettings() {
-      return javaSettingsBuilder_ != null || javaSettings_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1486,11 +1488,11 @@ public Builder setJavaSettings(com.google.api.JavaSettings value) {
           throw new NullPointerException();
         }
         javaSettings_ = value;
-        onChanged();
       } else {
         javaSettingsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1505,11 +1507,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;
     }
     /**
@@ -1523,17 +1525,18 @@ public Builder setJavaSettings(com.google.api.JavaSettings.Builder builderForVal
      */
     public Builder mergeJavaSettings(com.google.api.JavaSettings value) {
       if (javaSettingsBuilder_ == null) {
-        if (javaSettings_ != null) {
-          javaSettings_ =
-              com.google.api.JavaSettings.newBuilder(javaSettings_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && javaSettings_ != null
+            && javaSettings_ != com.google.api.JavaSettings.getDefaultInstance()) {
+          getJavaSettingsBuilder().mergeFrom(value);
         } else {
           javaSettings_ = value;
         }
-        onChanged();
       } else {
         javaSettingsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1546,14 +1549,13 @@ public Builder mergeJavaSettings(com.google.api.JavaSettings value) {
      * <code>.google.api.JavaSettings java_settings = 21;</code>
      */
     public Builder clearJavaSettings() {
-      if (javaSettingsBuilder_ == null) {
-        javaSettings_ = null;
-        onChanged();
-      } else {
-        javaSettings_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      javaSettings_ = null;
+      if (javaSettingsBuilder_ != null) {
+        javaSettingsBuilder_.dispose();
         javaSettingsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1566,7 +1568,7 @@ public Builder clearJavaSettings() {
      * <code>.google.api.JavaSettings java_settings = 21;</code>
      */
     public com.google.api.JavaSettings.Builder getJavaSettingsBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getJavaSettingsFieldBuilder().getBuilder();
     }
@@ -1632,7 +1634,7 @@ public com.google.api.JavaSettingsOrBuilder getJavaSettingsOrBuilder() {
      * @return Whether the cppSettings field is set.
      */
     public boolean hasCppSettings() {
-      return cppSettingsBuilder_ != null || cppSettings_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -1669,11 +1671,11 @@ public Builder setCppSettings(com.google.api.CppSettings value) {
           throw new NullPointerException();
         }
         cppSettings_ = value;
-        onChanged();
       } else {
         cppSettingsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1688,11 +1690,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;
     }
     /**
@@ -1706,17 +1708,18 @@ public Builder setCppSettings(com.google.api.CppSettings.Builder builderForValue
      */
     public Builder mergeCppSettings(com.google.api.CppSettings value) {
       if (cppSettingsBuilder_ == null) {
-        if (cppSettings_ != null) {
-          cppSettings_ =
-              com.google.api.CppSettings.newBuilder(cppSettings_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && cppSettings_ != null
+            && cppSettings_ != com.google.api.CppSettings.getDefaultInstance()) {
+          getCppSettingsBuilder().mergeFrom(value);
         } else {
           cppSettings_ = value;
         }
-        onChanged();
       } else {
         cppSettingsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1729,14 +1732,13 @@ public Builder mergeCppSettings(com.google.api.CppSettings value) {
      * <code>.google.api.CppSettings cpp_settings = 22;</code>
      */
     public Builder clearCppSettings() {
-      if (cppSettingsBuilder_ == null) {
-        cppSettings_ = null;
-        onChanged();
-      } else {
-        cppSettings_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      cppSettings_ = null;
+      if (cppSettingsBuilder_ != null) {
+        cppSettingsBuilder_.dispose();
         cppSettingsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1749,7 +1751,7 @@ public Builder clearCppSettings() {
      * <code>.google.api.CppSettings cpp_settings = 22;</code>
      */
     public com.google.api.CppSettings.Builder getCppSettingsBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getCppSettingsFieldBuilder().getBuilder();
     }
@@ -1815,7 +1817,7 @@ public com.google.api.CppSettingsOrBuilder getCppSettingsOrBuilder() {
      * @return Whether the phpSettings field is set.
      */
     public boolean hasPhpSettings() {
-      return phpSettingsBuilder_ != null || phpSettings_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -1852,11 +1854,11 @@ public Builder setPhpSettings(com.google.api.PhpSettings value) {
           throw new NullPointerException();
         }
         phpSettings_ = value;
-        onChanged();
       } else {
         phpSettingsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1871,11 +1873,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;
     }
     /**
@@ -1889,17 +1891,18 @@ public Builder setPhpSettings(com.google.api.PhpSettings.Builder builderForValue
      */
     public Builder mergePhpSettings(com.google.api.PhpSettings value) {
       if (phpSettingsBuilder_ == null) {
-        if (phpSettings_ != null) {
-          phpSettings_ =
-              com.google.api.PhpSettings.newBuilder(phpSettings_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && phpSettings_ != null
+            && phpSettings_ != com.google.api.PhpSettings.getDefaultInstance()) {
+          getPhpSettingsBuilder().mergeFrom(value);
         } else {
           phpSettings_ = value;
         }
-        onChanged();
       } else {
         phpSettingsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1912,14 +1915,13 @@ public Builder mergePhpSettings(com.google.api.PhpSettings value) {
      * <code>.google.api.PhpSettings php_settings = 23;</code>
      */
     public Builder clearPhpSettings() {
-      if (phpSettingsBuilder_ == null) {
-        phpSettings_ = null;
-        onChanged();
-      } else {
-        phpSettings_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      phpSettings_ = null;
+      if (phpSettingsBuilder_ != null) {
+        phpSettingsBuilder_.dispose();
         phpSettingsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1932,7 +1934,7 @@ public Builder clearPhpSettings() {
      * <code>.google.api.PhpSettings php_settings = 23;</code>
      */
     public com.google.api.PhpSettings.Builder getPhpSettingsBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getPhpSettingsFieldBuilder().getBuilder();
     }
@@ -1998,7 +2000,7 @@ public com.google.api.PhpSettingsOrBuilder getPhpSettingsOrBuilder() {
      * @return Whether the pythonSettings field is set.
      */
     public boolean hasPythonSettings() {
-      return pythonSettingsBuilder_ != null || pythonSettings_ != null;
+      return ((bitField0_ & 0x00000040) != 0);
     }
     /**
      *
@@ -2035,11 +2037,11 @@ public Builder setPythonSettings(com.google.api.PythonSettings value) {
           throw new NullPointerException();
         }
         pythonSettings_ = value;
-        onChanged();
       } else {
         pythonSettingsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2054,11 +2056,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;
     }
     /**
@@ -2072,19 +2074,18 @@ public Builder setPythonSettings(com.google.api.PythonSettings.Builder builderFo
      */
     public Builder mergePythonSettings(com.google.api.PythonSettings value) {
       if (pythonSettingsBuilder_ == null) {
-        if (pythonSettings_ != null) {
-          pythonSettings_ =
-              com.google.api.PythonSettings.newBuilder(pythonSettings_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000040) != 0)
+            && pythonSettings_ != null
+            && pythonSettings_ != com.google.api.PythonSettings.getDefaultInstance()) {
+          getPythonSettingsBuilder().mergeFrom(value);
         } else {
           pythonSettings_ = value;
         }
-        onChanged();
       } else {
         pythonSettingsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2097,14 +2098,13 @@ public Builder mergePythonSettings(com.google.api.PythonSettings value) {
      * <code>.google.api.PythonSettings python_settings = 24;</code>
      */
     public Builder clearPythonSettings() {
-      if (pythonSettingsBuilder_ == null) {
-        pythonSettings_ = null;
-        onChanged();
-      } else {
-        pythonSettings_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      pythonSettings_ = null;
+      if (pythonSettingsBuilder_ != null) {
+        pythonSettingsBuilder_.dispose();
         pythonSettingsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2117,7 +2117,7 @@ public Builder clearPythonSettings() {
      * <code>.google.api.PythonSettings python_settings = 24;</code>
      */
     public com.google.api.PythonSettings.Builder getPythonSettingsBuilder() {
-
+      bitField0_ |= 0x00000040;
       onChanged();
       return getPythonSettingsFieldBuilder().getBuilder();
     }
@@ -2183,7 +2183,7 @@ public com.google.api.PythonSettingsOrBuilder getPythonSettingsOrBuilder() {
      * @return Whether the nodeSettings field is set.
      */
     public boolean hasNodeSettings() {
-      return nodeSettingsBuilder_ != null || nodeSettings_ != null;
+      return ((bitField0_ & 0x00000080) != 0);
     }
     /**
      *
@@ -2220,11 +2220,11 @@ public Builder setNodeSettings(com.google.api.NodeSettings value) {
           throw new NullPointerException();
         }
         nodeSettings_ = value;
-        onChanged();
       } else {
         nodeSettingsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2239,11 +2239,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;
     }
     /**
@@ -2257,17 +2257,18 @@ public Builder setNodeSettings(com.google.api.NodeSettings.Builder builderForVal
      */
     public Builder mergeNodeSettings(com.google.api.NodeSettings value) {
       if (nodeSettingsBuilder_ == null) {
-        if (nodeSettings_ != null) {
-          nodeSettings_ =
-              com.google.api.NodeSettings.newBuilder(nodeSettings_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000080) != 0)
+            && nodeSettings_ != null
+            && nodeSettings_ != com.google.api.NodeSettings.getDefaultInstance()) {
+          getNodeSettingsBuilder().mergeFrom(value);
         } else {
           nodeSettings_ = value;
         }
-        onChanged();
       } else {
         nodeSettingsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2280,14 +2281,13 @@ public Builder mergeNodeSettings(com.google.api.NodeSettings value) {
      * <code>.google.api.NodeSettings node_settings = 25;</code>
      */
     public Builder clearNodeSettings() {
-      if (nodeSettingsBuilder_ == null) {
-        nodeSettings_ = null;
-        onChanged();
-      } else {
-        nodeSettings_ = null;
+      bitField0_ = (bitField0_ & ~0x00000080);
+      nodeSettings_ = null;
+      if (nodeSettingsBuilder_ != null) {
+        nodeSettingsBuilder_.dispose();
         nodeSettingsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2300,7 +2300,7 @@ public Builder clearNodeSettings() {
      * <code>.google.api.NodeSettings node_settings = 25;</code>
      */
     public com.google.api.NodeSettings.Builder getNodeSettingsBuilder() {
-
+      bitField0_ |= 0x00000080;
       onChanged();
       return getNodeSettingsFieldBuilder().getBuilder();
     }
@@ -2366,7 +2366,7 @@ public com.google.api.NodeSettingsOrBuilder getNodeSettingsOrBuilder() {
      * @return Whether the dotnetSettings field is set.
      */
     public boolean hasDotnetSettings() {
-      return dotnetSettingsBuilder_ != null || dotnetSettings_ != null;
+      return ((bitField0_ & 0x00000100) != 0);
     }
     /**
      *
@@ -2403,11 +2403,11 @@ public Builder setDotnetSettings(com.google.api.DotnetSettings value) {
           throw new NullPointerException();
         }
         dotnetSettings_ = value;
-        onChanged();
       } else {
         dotnetSettingsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -2422,11 +2422,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;
     }
     /**
@@ -2440,19 +2440,18 @@ public Builder setDotnetSettings(com.google.api.DotnetSettings.Builder builderFo
      */
     public Builder mergeDotnetSettings(com.google.api.DotnetSettings value) {
       if (dotnetSettingsBuilder_ == null) {
-        if (dotnetSettings_ != null) {
-          dotnetSettings_ =
-              com.google.api.DotnetSettings.newBuilder(dotnetSettings_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000100) != 0)
+            && dotnetSettings_ != null
+            && dotnetSettings_ != com.google.api.DotnetSettings.getDefaultInstance()) {
+          getDotnetSettingsBuilder().mergeFrom(value);
         } else {
           dotnetSettings_ = value;
         }
-        onChanged();
       } else {
         dotnetSettingsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -2465,14 +2464,13 @@ public Builder mergeDotnetSettings(com.google.api.DotnetSettings value) {
      * <code>.google.api.DotnetSettings dotnet_settings = 26;</code>
      */
     public Builder clearDotnetSettings() {
-      if (dotnetSettingsBuilder_ == null) {
-        dotnetSettings_ = null;
-        onChanged();
-      } else {
-        dotnetSettings_ = null;
+      bitField0_ = (bitField0_ & ~0x00000100);
+      dotnetSettings_ = null;
+      if (dotnetSettingsBuilder_ != null) {
+        dotnetSettingsBuilder_.dispose();
         dotnetSettingsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2485,7 +2483,7 @@ public Builder clearDotnetSettings() {
      * <code>.google.api.DotnetSettings dotnet_settings = 26;</code>
      */
     public com.google.api.DotnetSettings.Builder getDotnetSettingsBuilder() {
-
+      bitField0_ |= 0x00000100;
       onChanged();
       return getDotnetSettingsFieldBuilder().getBuilder();
     }
@@ -2551,7 +2549,7 @@ public com.google.api.DotnetSettingsOrBuilder getDotnetSettingsOrBuilder() {
      * @return Whether the rubySettings field is set.
      */
     public boolean hasRubySettings() {
-      return rubySettingsBuilder_ != null || rubySettings_ != null;
+      return ((bitField0_ & 0x00000200) != 0);
     }
     /**
      *
@@ -2588,11 +2586,11 @@ public Builder setRubySettings(com.google.api.RubySettings value) {
           throw new NullPointerException();
         }
         rubySettings_ = value;
-        onChanged();
       } else {
         rubySettingsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -2607,11 +2605,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;
     }
     /**
@@ -2625,17 +2623,18 @@ public Builder setRubySettings(com.google.api.RubySettings.Builder builderForVal
      */
     public Builder mergeRubySettings(com.google.api.RubySettings value) {
       if (rubySettingsBuilder_ == null) {
-        if (rubySettings_ != null) {
-          rubySettings_ =
-              com.google.api.RubySettings.newBuilder(rubySettings_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000200) != 0)
+            && rubySettings_ != null
+            && rubySettings_ != com.google.api.RubySettings.getDefaultInstance()) {
+          getRubySettingsBuilder().mergeFrom(value);
         } else {
           rubySettings_ = value;
         }
-        onChanged();
       } else {
         rubySettingsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -2648,14 +2647,13 @@ public Builder mergeRubySettings(com.google.api.RubySettings value) {
      * <code>.google.api.RubySettings ruby_settings = 27;</code>
      */
     public Builder clearRubySettings() {
-      if (rubySettingsBuilder_ == null) {
-        rubySettings_ = null;
-        onChanged();
-      } else {
-        rubySettings_ = null;
+      bitField0_ = (bitField0_ & ~0x00000200);
+      rubySettings_ = null;
+      if (rubySettingsBuilder_ != null) {
+        rubySettingsBuilder_.dispose();
         rubySettingsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2668,7 +2666,7 @@ public Builder clearRubySettings() {
      * <code>.google.api.RubySettings ruby_settings = 27;</code>
      */
     public com.google.api.RubySettings.Builder getRubySettingsBuilder() {
-
+      bitField0_ |= 0x00000200;
       onChanged();
       return getRubySettingsFieldBuilder().getBuilder();
     }
@@ -2734,7 +2732,7 @@ public com.google.api.RubySettingsOrBuilder getRubySettingsOrBuilder() {
      * @return Whether the goSettings field is set.
      */
     public boolean hasGoSettings() {
-      return goSettingsBuilder_ != null || goSettings_ != null;
+      return ((bitField0_ & 0x00000400) != 0);
     }
     /**
      *
@@ -2769,11 +2767,11 @@ public Builder setGoSettings(com.google.api.GoSettings value) {
           throw new NullPointerException();
         }
         goSettings_ = value;
-        onChanged();
       } else {
         goSettingsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000400;
+      onChanged();
       return this;
     }
     /**
@@ -2788,11 +2786,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;
     }
     /**
@@ -2806,17 +2804,18 @@ public Builder setGoSettings(com.google.api.GoSettings.Builder builderForValue)
      */
     public Builder mergeGoSettings(com.google.api.GoSettings value) {
       if (goSettingsBuilder_ == null) {
-        if (goSettings_ != null) {
-          goSettings_ =
-              com.google.api.GoSettings.newBuilder(goSettings_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000400) != 0)
+            && goSettings_ != null
+            && goSettings_ != com.google.api.GoSettings.getDefaultInstance()) {
+          getGoSettingsBuilder().mergeFrom(value);
         } else {
           goSettings_ = value;
         }
-        onChanged();
       } else {
         goSettingsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000400;
+      onChanged();
       return this;
     }
     /**
@@ -2829,14 +2828,13 @@ public Builder mergeGoSettings(com.google.api.GoSettings value) {
      * <code>.google.api.GoSettings go_settings = 28;</code>
      */
     public Builder clearGoSettings() {
-      if (goSettingsBuilder_ == null) {
-        goSettings_ = null;
-        onChanged();
-      } else {
-        goSettings_ = null;
+      bitField0_ = (bitField0_ & ~0x00000400);
+      goSettings_ = null;
+      if (goSettingsBuilder_ != null) {
+        goSettingsBuilder_.dispose();
         goSettingsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2849,7 +2847,7 @@ public Builder clearGoSettings() {
      * <code>.google.api.GoSettings go_settings = 28;</code>
      */
     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/CommonLanguageSettings.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CommonLanguageSettings.java
index e2c34f8219..cd775f9434 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CommonLanguageSettings.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CommonLanguageSettings.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int REFERENCE_DOCS_URI_FIELD_NUMBER = 1;
-  private volatile java.lang.Object referenceDocsUri_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object referenceDocsUri_ = "";
   /**
    *
    *
@@ -125,16 +127,18 @@ public com.google.protobuf.ByteString getReferenceDocsUriBytes() {
   }
 
   public static final int DESTINATIONS_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<java.lang.Integer> 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.valueOf(from);
+                  com.google.api.ClientLibraryDestination.forNumber(from);
               return result == null ? com.google.api.ClientLibraryDestination.UNRECOGNIZED : result;
             }
           };
@@ -441,10 +445,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       referenceDocsUri_ = "";
-
       destinations_ = java.util.Collections.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -472,17 +476,29 @@ public com.google.api.CommonLanguageSettings build() {
     public com.google.api.CommonLanguageSettings buildPartial() {
       com.google.api.CommonLanguageSettings result =
           new com.google.api.CommonLanguageSettings(this);
-      int from_bitField0_ = bitField0_;
-      result.referenceDocsUri_ = referenceDocsUri_;
-      if (((bitField0_ & 0x00000001) != 0)) {
-        destinations_ = java.util.Collections.unmodifiableList(destinations_);
-        bitField0_ = (bitField0_ & ~0x00000001);
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.destinations_ = destinations_;
       onBuilt();
       return result;
     }
 
+    private void buildPartialRepeatedFields(com.google.api.CommonLanguageSettings result) {
+      if (((bitField0_ & 0x00000002) != 0)) {
+        destinations_ = java.util.Collections.unmodifiableList(destinations_);
+        bitField0_ = (bitField0_ & ~0x00000002);
+      }
+      result.destinations_ = destinations_;
+    }
+
+    private void buildPartial0(com.google.api.CommonLanguageSettings result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.referenceDocsUri_ = referenceDocsUri_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -530,12 +546,13 @@ 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_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureDestinationsIsMutable();
           destinations_.addAll(other.destinations_);
@@ -571,7 +588,7 @@ public Builder mergeFrom(
             case 10:
               {
                 referenceDocsUri_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
@@ -685,8 +702,8 @@ public Builder setReferenceDocsUri(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       referenceDocsUri_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -706,8 +723,8 @@ public Builder setReferenceDocsUri(java.lang.String value) {
      */
     @java.lang.Deprecated
     public Builder clearReferenceDocsUri() {
-
       referenceDocsUri_ = getDefaultInstance().getReferenceDocsUri();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -732,8 +749,8 @@ public Builder setReferenceDocsUriBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       referenceDocsUri_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -741,9 +758,9 @@ public Builder setReferenceDocsUriBytes(com.google.protobuf.ByteString value) {
     private java.util.List<java.lang.Integer> destinations_ = java.util.Collections.emptyList();
 
     private void ensureDestinationsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         destinations_ = new java.util.ArrayList<java.lang.Integer>(destinations_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
     /**
@@ -868,7 +885,7 @@ public Builder addAllDestinations(
      */
     public Builder clearDestinations() {
       destinations_ = java.util.Collections.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
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 a4bc124a9d..2d38026dd4 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ConfigChange.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ConfigChange.java
@@ -74,7 +74,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ELEMENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object element_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object element_ = "";
   /**
    *
    *
@@ -139,7 +141,9 @@ public com.google.protobuf.ByteString getElementBytes() {
   }
 
   public static final int OLD_VALUE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object oldValue_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object oldValue_ = "";
   /**
    *
    *
@@ -190,7 +194,9 @@ public com.google.protobuf.ByteString getOldValueBytes() {
   }
 
   public static final int NEW_VALUE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object newValue_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object newValue_ = "";
   /**
    *
    *
@@ -241,7 +247,7 @@ public com.google.protobuf.ByteString getNewValueBytes() {
   }
 
   public static final int CHANGE_TYPE_FIELD_NUMBER = 4;
-  private int changeType_;
+  private int changeType_ = 0;
   /**
    *
    *
@@ -270,12 +276,13 @@ public int getChangeTypeValue() {
    */
   @java.lang.Override
   public com.google.api.ChangeType getChangeType() {
-    @SuppressWarnings("deprecation")
-    com.google.api.ChangeType result = com.google.api.ChangeType.valueOf(changeType_);
+    com.google.api.ChangeType result = com.google.api.ChangeType.forNumber(changeType_);
     return result == null ? com.google.api.ChangeType.UNRECOGNIZED : result;
   }
 
   public static final int ADVICES_FIELD_NUMBER = 5;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.Advice> advices_;
   /**
    *
@@ -583,21 +590,18 @@ 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_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000010);
       return this;
     }
 
@@ -623,22 +627,40 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.element_ = element_;
-      result.oldValue_ = oldValue_;
-      result.newValue_ = newValue_;
-      result.changeType_ = changeType_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.ConfigChange result) {
       if (advicesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000010) != 0)) {
           advices_ = java.util.Collections.unmodifiableList(advices_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000010);
         }
         result.advices_ = advices_;
       } else {
         result.advices_ = advicesBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    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_;
+      }
     }
 
     @java.lang.Override
@@ -688,14 +710,17 @@ 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) {
@@ -705,7 +730,7 @@ public Builder mergeFrom(com.google.api.ConfigChange other) {
         if (!other.advices_.isEmpty()) {
           if (advices_.isEmpty()) {
             advices_ = other.advices_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
             ensureAdvicesIsMutable();
             advices_.addAll(other.advices_);
@@ -718,7 +743,7 @@ public Builder mergeFrom(com.google.api.ConfigChange other) {
             advicesBuilder_.dispose();
             advicesBuilder_ = null;
             advices_ = other.advices_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
             advicesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getAdvicesFieldBuilder()
@@ -757,25 +782,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:
@@ -894,8 +919,8 @@ public Builder setElement(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       element_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -919,8 +944,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;
     }
@@ -949,8 +974,8 @@ public Builder setElementBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       element_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1019,8 +1044,8 @@ public Builder setOldValue(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       oldValue_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1037,8 +1062,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;
     }
@@ -1060,8 +1085,8 @@ public Builder setOldValueBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       oldValue_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1130,8 +1155,8 @@ public Builder setNewValue(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       newValue_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1148,8 +1173,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;
     }
@@ -1171,8 +1196,8 @@ public Builder setNewValueBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       newValue_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1206,8 +1231,8 @@ public int getChangeTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setChangeTypeValue(int value) {
-
       changeType_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1224,8 +1249,7 @@ public Builder setChangeTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.api.ChangeType getChangeType() {
-      @SuppressWarnings("deprecation")
-      com.google.api.ChangeType result = com.google.api.ChangeType.valueOf(changeType_);
+      com.google.api.ChangeType result = com.google.api.ChangeType.forNumber(changeType_);
       return result == null ? com.google.api.ChangeType.UNRECOGNIZED : result;
     }
     /**
@@ -1244,7 +1268,7 @@ public Builder setChangeType(com.google.api.ChangeType value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000008;
       changeType_ = value.getNumber();
       onChanged();
       return this;
@@ -1261,7 +1285,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;
@@ -1270,9 +1294,9 @@ public Builder clearChangeType() {
     private java.util.List<com.google.api.Advice> advices_ = java.util.Collections.emptyList();
 
     private void ensureAdvicesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         advices_ = new java.util.ArrayList<com.google.api.Advice>(advices_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000010;
       }
     }
 
@@ -1493,7 +1517,7 @@ public Builder addAllAdvices(java.lang.Iterable<? extends com.google.api.Advice>
     public Builder clearAdvices() {
       if (advicesBuilder_ == null) {
         advices_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
       } else {
         advicesBuilder_.clear();
@@ -1616,7 +1640,7 @@ public java.util.List<com.google.api.Advice.Builder> getAdvicesBuilderList() {
                 com.google.api.Advice,
                 com.google.api.Advice.Builder,
                 com.google.api.AdviceOrBuilder>(
-                advices_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                advices_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
         advices_ = null;
       }
       return advicesBuilder_;
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 90943bb107..f3f2c60cf3 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Context.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Context.java
@@ -92,6 +92,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RULES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.ContextRule> rules_;
   /**
    *
@@ -385,6 +387,7 @@ 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 {
@@ -417,7 +420,15 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.Context result) {
       if (rulesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           rules_ = java.util.Collections.unmodifiableList(rules_);
@@ -427,8 +438,10 @@ public com.google.api.Context buildPartial() {
       } else {
         result.rules_ = rulesBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.api.Context result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
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 8d5ea2c563..1cc6e06348 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
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SELECTOR_FIELD_NUMBER = 1;
-  private volatile java.lang.Object selector_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object selector_ = "";
   /**
    *
    *
@@ -121,6 +123,8 @@ public com.google.protobuf.ByteString getSelectorBytes() {
   }
 
   public static final int REQUESTED_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList requested_;
   /**
    *
@@ -182,6 +186,8 @@ public com.google.protobuf.ByteString getRequestedBytes(int index) {
   }
 
   public static final int PROVIDED_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList provided_;
   /**
    *
@@ -243,6 +249,8 @@ public com.google.protobuf.ByteString getProvidedBytes(int index) {
   }
 
   public static final int ALLOWED_REQUEST_EXTENSIONS_FIELD_NUMBER = 4;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList allowedRequestExtensions_;
   /**
    *
@@ -308,6 +316,8 @@ public com.google.protobuf.ByteString getAllowedRequestExtensionsBytes(int index
   }
 
   public static final int ALLOWED_RESPONSE_EXTENSIONS_FIELD_NUMBER = 5;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList allowedResponseExtensions_;
   /**
    *
@@ -633,16 +643,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.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
-      provided_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000002);
-      allowedRequestExtensions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      provided_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000004);
-      allowedResponseExtensions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      allowedRequestExtensions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000008);
+      allowedResponseExtensions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000010);
       return this;
     }
 
@@ -668,30 +678,42 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.selector_ = selector_;
-      if (((bitField0_ & 0x00000001) != 0)) {
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.ContextRule result) {
+      if (((bitField0_ & 0x00000002) != 0)) {
         requested_ = requested_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
       }
       result.requested_ = requested_;
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (((bitField0_ & 0x00000004) != 0)) {
         provided_ = provided_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000004);
       }
       result.provided_ = provided_;
-      if (((bitField0_ & 0x00000004) != 0)) {
+      if (((bitField0_ & 0x00000008) != 0)) {
         allowedRequestExtensions_ = allowedRequestExtensions_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000008);
       }
       result.allowedRequestExtensions_ = allowedRequestExtensions_;
-      if (((bitField0_ & 0x00000008) != 0)) {
+      if (((bitField0_ & 0x00000010) != 0)) {
         allowedResponseExtensions_ = allowedResponseExtensions_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000010);
       }
       result.allowedResponseExtensions_ = allowedResponseExtensions_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.api.ContextRule result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.selector_ = selector_;
+      }
     }
 
     @java.lang.Override
@@ -741,12 +763,13 @@ 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_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureRequestedIsMutable();
           requested_.addAll(other.requested_);
@@ -756,7 +779,7 @@ public Builder mergeFrom(com.google.api.ContextRule other) {
       if (!other.provided_.isEmpty()) {
         if (provided_.isEmpty()) {
           provided_ = other.provided_;
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000004);
         } else {
           ensureProvidedIsMutable();
           provided_.addAll(other.provided_);
@@ -766,7 +789,7 @@ public Builder mergeFrom(com.google.api.ContextRule other) {
       if (!other.allowedRequestExtensions_.isEmpty()) {
         if (allowedRequestExtensions_.isEmpty()) {
           allowedRequestExtensions_ = other.allowedRequestExtensions_;
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000008);
         } else {
           ensureAllowedRequestExtensionsIsMutable();
           allowedRequestExtensions_.addAll(other.allowedRequestExtensions_);
@@ -776,7 +799,7 @@ public Builder mergeFrom(com.google.api.ContextRule other) {
       if (!other.allowedResponseExtensions_.isEmpty()) {
         if (allowedResponseExtensions_.isEmpty()) {
           allowedResponseExtensions_ = other.allowedResponseExtensions_;
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00000010);
         } else {
           ensureAllowedResponseExtensionsIsMutable();
           allowedResponseExtensions_.addAll(other.allowedResponseExtensions_);
@@ -812,7 +835,7 @@ public Builder mergeFrom(
             case 10:
               {
                 selector_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -926,8 +949,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       selector_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -944,8 +967,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;
     }
@@ -967,8 +990,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       selector_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -977,9 +1000,9 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureRequestedIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         requested_ = new com.google.protobuf.LazyStringArrayList(requested_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
     /**
@@ -1114,7 +1137,7 @@ public Builder addAllRequested(java.lang.Iterable<java.lang.String> values) {
      */
     public Builder clearRequested() {
       requested_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1145,9 +1168,9 @@ public Builder addRequestedBytes(com.google.protobuf.ByteString value) {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureProvidedIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         provided_ = new com.google.protobuf.LazyStringArrayList(provided_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000004;
       }
     }
     /**
@@ -1282,7 +1305,7 @@ public Builder addAllProvided(java.lang.Iterable<java.lang.String> values) {
      */
     public Builder clearProvided() {
       provided_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1313,10 +1336,10 @@ public Builder addProvidedBytes(com.google.protobuf.ByteString value) {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureAllowedRequestExtensionsIsMutable() {
-      if (!((bitField0_ & 0x00000004) != 0)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         allowedRequestExtensions_ =
             new com.google.protobuf.LazyStringArrayList(allowedRequestExtensions_);
-        bitField0_ |= 0x00000004;
+        bitField0_ |= 0x00000008;
       }
     }
     /**
@@ -1459,7 +1482,7 @@ public Builder addAllAllowedRequestExtensions(java.lang.Iterable<java.lang.Strin
      */
     public Builder clearAllowedRequestExtensions() {
       allowedRequestExtensions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000004);
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1491,10 +1514,10 @@ public Builder addAllowedRequestExtensionsBytes(com.google.protobuf.ByteString v
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureAllowedResponseExtensionsIsMutable() {
-      if (!((bitField0_ & 0x00000008) != 0)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         allowedResponseExtensions_ =
             new com.google.protobuf.LazyStringArrayList(allowedResponseExtensions_);
-        bitField0_ |= 0x00000008;
+        bitField0_ |= 0x00000010;
       }
     }
     /**
@@ -1637,7 +1660,7 @@ public Builder addAllAllowedResponseExtensions(java.lang.Iterable<java.lang.Stri
      */
     public Builder clearAllowedResponseExtensions() {
       allowedResponseExtensions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000008);
+      bitField0_ = (bitField0_ & ~0x00000010);
       onChanged();
       return this;
     }
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 09afa67e0b..2a4452abc3 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Control.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Control.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ENVIRONMENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object environment_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object environment_ = "";
   /**
    *
    *
@@ -315,8 +317,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       environment_ = "";
-
       return this;
     }
 
@@ -342,11 +344,20 @@ 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);
-      result.environment_ = environment_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.api.Control result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.environment_ = environment_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -394,6 +405,7 @@ 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();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -425,7 +437,7 @@ public Builder mergeFrom(
             case 10:
               {
                 environment_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -445,6 +457,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object environment_ = "";
     /**
      *
@@ -512,8 +526,8 @@ public Builder setEnvironment(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       environment_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -531,8 +545,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;
     }
@@ -555,8 +569,8 @@ public Builder setEnvironmentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       environment_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
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 f61d3da31c..9559091e0e 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CppSettings.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CppSettings.java
@@ -105,7 +105,7 @@ public com.google.api.CommonLanguageSettings getCommon() {
    */
   @java.lang.Override
   public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
-    return getCommon();
+    return common_ == null ? com.google.api.CommonLanguageSettings.getDefaultInstance() : common_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -305,10 +305,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (commonBuilder_ == null) {
-        common_ = null;
-      } else {
-        common_ = null;
+      bitField0_ = 0;
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
       return this;
@@ -336,15 +336,20 @@ 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 (commonBuilder_ == null) {
-        result.common_ = common_;
-      } else {
-        result.common_ = commonBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.api.CppSettings result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -422,7 +427,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -442,6 +447,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.api.CommonLanguageSettings common_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.api.CommonLanguageSettings,
@@ -460,7 +467,7 @@ public Builder mergeFrom(
      * @return Whether the common field is set.
      */
     public boolean hasCommon() {
-      return commonBuilder_ != null || common_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -497,11 +504,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
           throw new NullPointerException();
         }
         common_ = value;
-        onChanged();
       } else {
         commonBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -516,11 +523,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;
     }
     /**
@@ -534,19 +541,18 @@ public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderFo
      */
     public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
       if (commonBuilder_ == null) {
-        if (common_ != null) {
-          common_ =
-              com.google.api.CommonLanguageSettings.newBuilder(common_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && common_ != null
+            && common_ != com.google.api.CommonLanguageSettings.getDefaultInstance()) {
+          getCommonBuilder().mergeFrom(value);
         } else {
           common_ = value;
         }
-        onChanged();
       } else {
         commonBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -559,14 +565,13 @@ public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
      * <code>.google.api.CommonLanguageSettings common = 1;</code>
      */
     public Builder clearCommon() {
-      if (commonBuilder_ == null) {
-        common_ = null;
-        onChanged();
-      } else {
-        common_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -579,7 +584,7 @@ public Builder clearCommon() {
      * <code>.google.api.CommonLanguageSettings common = 1;</code>
      */
     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/CustomHttpPattern.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CustomHttpPattern.java
index bf35f90802..9d1518d10d 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CustomHttpPattern.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CustomHttpPattern.java
@@ -66,7 +66,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int KIND_FIELD_NUMBER = 1;
-  private volatile java.lang.Object kind_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object kind_ = "";
   /**
    *
    *
@@ -115,7 +117,9 @@ public com.google.protobuf.ByteString getKindBytes() {
   }
 
   public static final int PATH_FIELD_NUMBER = 2;
-  private volatile java.lang.Object path_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object path_ = "";
   /**
    *
    *
@@ -366,10 +370,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       kind_ = "";
-
       path_ = "";
-
       return this;
     }
 
@@ -395,12 +398,23 @@ 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);
-      result.kind_ = kind_;
-      result.path_ = path_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -448,10 +462,12 @@ 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());
@@ -483,13 +499,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:
@@ -509,6 +525,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object kind_ = "";
     /**
      *
@@ -570,8 +588,8 @@ public Builder setKind(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       kind_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -587,8 +605,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;
     }
@@ -609,8 +627,8 @@ public Builder setKindBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       kind_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -676,8 +694,8 @@ public Builder setPath(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       path_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -693,8 +711,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;
     }
@@ -715,8 +733,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/Distribution.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Distribution.java
index 09e41c71d3..14f77f78a9 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Distribution.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Distribution.java
@@ -156,7 +156,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int MIN_FIELD_NUMBER = 1;
-    private double min_;
+    private double min_ = 0D;
     /**
      *
      *
@@ -174,7 +174,7 @@ public double getMin() {
     }
 
     public static final int MAX_FIELD_NUMBER = 2;
-    private double max_;
+    private double max_ = 0D;
     /**
      *
      *
@@ -403,10 +403,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         min_ = 0D;
-
         max_ = 0D;
-
         return this;
       }
 
@@ -433,12 +432,23 @@ 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);
-        result.min_ = min_;
-        result.max_ = max_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         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();
@@ -521,13 +531,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:
@@ -547,6 +557,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private double min_;
       /**
        *
@@ -578,6 +590,7 @@ public double getMin() {
       public Builder setMin(double value) {
 
         min_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -593,7 +606,7 @@ public Builder setMin(double value) {
        * @return This builder for chaining.
        */
       public Builder clearMin() {
-
+        bitField0_ = (bitField0_ & ~0x00000001);
         min_ = 0D;
         onChanged();
         return this;
@@ -630,6 +643,7 @@ public double getMax() {
       public Builder setMax(double value) {
 
         max_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -645,7 +659,7 @@ public Builder setMax(double value) {
        * @return This builder for chaining.
        */
       public Builder clearMax() {
-
+        bitField0_ = (bitField0_ & ~0x00000002);
         max_ = 0D;
         onChanged();
         return this;
@@ -985,7 +999,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int NUM_FINITE_BUCKETS_FIELD_NUMBER = 1;
-      private int numFiniteBuckets_;
+      private int numFiniteBuckets_ = 0;
       /**
        *
        *
@@ -1003,7 +1017,7 @@ public int getNumFiniteBuckets() {
       }
 
       public static final int WIDTH_FIELD_NUMBER = 2;
-      private double width_;
+      private double width_ = 0D;
       /**
        *
        *
@@ -1021,7 +1035,7 @@ public double getWidth() {
       }
 
       public static final int OFFSET_FIELD_NUMBER = 3;
-      private double offset_;
+      private double offset_ = 0D;
       /**
        *
        *
@@ -1269,12 +1283,10 @@ 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;
         }
 
@@ -1302,13 +1314,26 @@ 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);
-          result.numFiniteBuckets_ = numFiniteBuckets_;
-          result.width_ = width_;
-          result.offset_ = offset_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           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();
@@ -1395,19 +1420,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:
@@ -1427,6 +1452,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private int numFiniteBuckets_;
         /**
          *
@@ -1458,6 +1485,7 @@ public int getNumFiniteBuckets() {
         public Builder setNumFiniteBuckets(int value) {
 
           numFiniteBuckets_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -1473,7 +1501,7 @@ public Builder setNumFiniteBuckets(int value) {
          * @return This builder for chaining.
          */
         public Builder clearNumFiniteBuckets() {
-
+          bitField0_ = (bitField0_ & ~0x00000001);
           numFiniteBuckets_ = 0;
           onChanged();
           return this;
@@ -1510,6 +1538,7 @@ public double getWidth() {
         public Builder setWidth(double value) {
 
           width_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -1525,7 +1554,7 @@ public Builder setWidth(double value) {
          * @return This builder for chaining.
          */
         public Builder clearWidth() {
-
+          bitField0_ = (bitField0_ & ~0x00000002);
           width_ = 0D;
           onChanged();
           return this;
@@ -1562,6 +1591,7 @@ public double getOffset() {
         public Builder setOffset(double value) {
 
           offset_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -1577,7 +1607,7 @@ public Builder setOffset(double value) {
          * @return This builder for chaining.
          */
         public Builder clearOffset() {
-
+          bitField0_ = (bitField0_ & ~0x00000004);
           offset_ = 0D;
           onChanged();
           return this;
@@ -1745,7 +1775,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int NUM_FINITE_BUCKETS_FIELD_NUMBER = 1;
-      private int numFiniteBuckets_;
+      private int numFiniteBuckets_ = 0;
       /**
        *
        *
@@ -1763,7 +1793,7 @@ public int getNumFiniteBuckets() {
       }
 
       public static final int GROWTH_FACTOR_FIELD_NUMBER = 2;
-      private double growthFactor_;
+      private double growthFactor_ = 0D;
       /**
        *
        *
@@ -1781,7 +1811,7 @@ public double getGrowthFactor() {
       }
 
       public static final int SCALE_FIELD_NUMBER = 3;
-      private double scale_;
+      private double scale_ = 0D;
       /**
        *
        *
@@ -2030,12 +2060,10 @@ 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;
         }
 
@@ -2063,13 +2091,26 @@ 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);
-          result.numFiniteBuckets_ = numFiniteBuckets_;
-          result.growthFactor_ = growthFactor_;
-          result.scale_ = scale_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           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();
@@ -2156,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:
@@ -2188,6 +2229,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private int numFiniteBuckets_;
         /**
          *
@@ -2219,6 +2262,7 @@ public int getNumFiniteBuckets() {
         public Builder setNumFiniteBuckets(int value) {
 
           numFiniteBuckets_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -2234,7 +2278,7 @@ public Builder setNumFiniteBuckets(int value) {
          * @return This builder for chaining.
          */
         public Builder clearNumFiniteBuckets() {
-
+          bitField0_ = (bitField0_ & ~0x00000001);
           numFiniteBuckets_ = 0;
           onChanged();
           return this;
@@ -2271,6 +2315,7 @@ public double getGrowthFactor() {
         public Builder setGrowthFactor(double value) {
 
           growthFactor_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -2286,7 +2331,7 @@ public Builder setGrowthFactor(double value) {
          * @return This builder for chaining.
          */
         public Builder clearGrowthFactor() {
-
+          bitField0_ = (bitField0_ & ~0x00000002);
           growthFactor_ = 0D;
           onChanged();
           return this;
@@ -2323,6 +2368,7 @@ public double getScale() {
         public Builder setScale(double value) {
 
           scale_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -2338,7 +2384,7 @@ public Builder setScale(double value) {
          * @return This builder for chaining.
          */
         public Builder clearScale() {
-
+          bitField0_ = (bitField0_ & ~0x00000004);
           scale_ = 0D;
           onChanged();
           return this;
@@ -2508,6 +2554,8 @@ 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_;
       /**
        *
@@ -2777,8 +2825,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;
         }
 
@@ -2806,14 +2854,25 @@ 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);
-          int from_bitField0_ = bitField0_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.api.Distribution.BucketOptions.Explicit result) {
           if (((bitField0_ & 0x00000001) != 0)) {
             bounds_.makeImmutable();
             bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.bounds_ = bounds_;
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(com.google.api.Distribution.BucketOptions.Explicit result) {
+          int from_bitField0_ = bitField0_;
         }
 
         @java.lang.Override
@@ -3004,6 +3063,7 @@ public double getBounds(int index) {
          * @return This builder for chaining.
          */
         public Builder setBounds(int index, double value) {
+
           ensureBoundsIsMutable();
           bounds_.setDouble(index, value);
           onChanged();
@@ -3022,6 +3082,7 @@ public Builder setBounds(int index, double value) {
          * @return This builder for chaining.
          */
         public Builder addBounds(double value) {
+
           ensureBoundsIsMutable();
           bounds_.addDouble(value);
           onChanged();
@@ -3589,6 +3650,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (linearBucketsBuilder_ != null) {
           linearBucketsBuilder_.clear();
         }
@@ -3627,32 +3689,32 @@ 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 (optionsCase_ == 1) {
-          if (linearBucketsBuilder_ == null) {
-            result.options_ = options_;
-          } else {
-            result.options_ = linearBucketsBuilder_.build();
-          }
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
-        if (optionsCase_ == 2) {
-          if (exponentialBucketsBuilder_ == null) {
-            result.options_ = options_;
-          } else {
-            result.options_ = exponentialBucketsBuilder_.build();
-          }
-        }
-        if (optionsCase_ == 3) {
-          if (explicitBucketsBuilder_ == null) {
-            result.options_ = options_;
-          } else {
-            result.options_ = explicitBucketsBuilder_.build();
-          }
-        }
-        result.optionsCase_ = optionsCase_;
+        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_ == 2 && exponentialBucketsBuilder_ != null) {
+          result.options_ = exponentialBucketsBuilder_.build();
+        }
+        if (optionsCase_ == 3 && explicitBucketsBuilder_ != null) {
+          result.options_ = explicitBucketsBuilder_.build();
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -3798,6 +3860,8 @@ 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,
@@ -4005,7 +4069,6 @@ public com.google.api.Distribution.BucketOptions.LinearOrBuilder getLinearBucket
         }
         optionsCase_ = 1;
         onChanged();
-        ;
         return linearBucketsBuilder_;
       }
 
@@ -4220,7 +4283,6 @@ public Builder clearExponentialBuckets() {
         }
         optionsCase_ = 2;
         onChanged();
-        ;
         return exponentialBucketsBuilder_;
       }
 
@@ -4434,7 +4496,6 @@ public Builder clearExplicitBuckets() {
         }
         optionsCase_ = 3;
         onChanged();
-        ;
         return explicitBucketsBuilder_;
       }
 
@@ -4691,7 +4752,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int VALUE_FIELD_NUMBER = 1;
-    private double value_;
+    private double value_ = 0D;
     /**
      *
      *
@@ -4752,10 +4813,12 @@ public com.google.protobuf.Timestamp getTimestamp() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getTimestampOrBuilder() {
-      return getTimestamp();
+      return timestamp_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : timestamp_;
     }
 
     public static final int ATTACHMENTS_FIELD_NUMBER = 3;
+
+    @SuppressWarnings("serial")
     private java.util.List<com.google.protobuf.Any> attachments_;
     /**
      *
@@ -5085,12 +5148,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         value_ = 0D;
-
-        if (timestampBuilder_ == null) {
-          timestamp_ = null;
-        } else {
-          timestamp_ = null;
+        timestamp_ = null;
+        if (timestampBuilder_ != null) {
+          timestampBuilder_.dispose();
           timestampBuilder_ = null;
         }
         if (attachmentsBuilder_ == null) {
@@ -5099,7 +5161,7 @@ public Builder clear() {
           attachments_ = null;
           attachmentsBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -5127,24 +5189,34 @@ 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);
-        int from_bitField0_ = bitField0_;
-        result.value_ = value_;
-        if (timestampBuilder_ == null) {
-          result.timestamp_ = timestamp_;
-        } else {
-          result.timestamp_ = timestampBuilder_.build();
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(com.google.api.Distribution.Exemplar result) {
         if (attachmentsBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
+          if (((bitField0_ & 0x00000004) != 0)) {
             attachments_ = java.util.Collections.unmodifiableList(attachments_);
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
           }
           result.attachments_ = attachments_;
         } else {
           result.attachments_ = attachmentsBuilder_.build();
         }
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(com.google.api.Distribution.Exemplar result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.value_ = value_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.timestamp_ = timestampBuilder_ == null ? timestamp_ : timestampBuilder_.build();
+        }
       }
 
       @java.lang.Override
@@ -5204,7 +5276,7 @@ public Builder mergeFrom(com.google.api.Distribution.Exemplar other) {
           if (!other.attachments_.isEmpty()) {
             if (attachments_.isEmpty()) {
               attachments_ = other.attachments_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000004);
             } else {
               ensureAttachmentsIsMutable();
               attachments_.addAll(other.attachments_);
@@ -5217,7 +5289,7 @@ public Builder mergeFrom(com.google.api.Distribution.Exemplar other) {
               attachmentsBuilder_.dispose();
               attachmentsBuilder_ = null;
               attachments_ = other.attachments_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000004);
               attachmentsBuilder_ =
                   com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                       ? getAttachmentsFieldBuilder()
@@ -5256,13 +5328,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:
@@ -5329,6 +5401,7 @@ public double getValue() {
       public Builder setValue(double value) {
 
         value_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -5345,7 +5418,7 @@ public Builder setValue(double value) {
        * @return This builder for chaining.
        */
       public Builder clearValue() {
-
+        bitField0_ = (bitField0_ & ~0x00000001);
         value_ = 0D;
         onChanged();
         return this;
@@ -5369,7 +5442,7 @@ public Builder clearValue() {
        * @return Whether the timestamp field is set.
        */
       public boolean hasTimestamp() {
-        return timestampBuilder_ != null || timestamp_ != null;
+        return ((bitField0_ & 0x00000002) != 0);
       }
       /**
        *
@@ -5406,11 +5479,11 @@ public Builder setTimestamp(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           timestamp_ = value;
-          onChanged();
         } else {
           timestampBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -5425,11 +5498,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;
       }
       /**
@@ -5443,19 +5516,18 @@ public Builder setTimestamp(com.google.protobuf.Timestamp.Builder builderForValu
        */
       public Builder mergeTimestamp(com.google.protobuf.Timestamp value) {
         if (timestampBuilder_ == null) {
-          if (timestamp_ != null) {
-            timestamp_ =
-                com.google.protobuf.Timestamp.newBuilder(timestamp_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000002) != 0)
+              && timestamp_ != null
+              && timestamp_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+            getTimestampBuilder().mergeFrom(value);
           } else {
             timestamp_ = value;
           }
-          onChanged();
         } else {
           timestampBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -5468,14 +5540,13 @@ public Builder mergeTimestamp(com.google.protobuf.Timestamp value) {
        * <code>.google.protobuf.Timestamp timestamp = 2;</code>
        */
       public Builder clearTimestamp() {
-        if (timestampBuilder_ == null) {
-          timestamp_ = null;
-          onChanged();
-        } else {
-          timestamp_ = null;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        timestamp_ = null;
+        if (timestampBuilder_ != null) {
+          timestampBuilder_.dispose();
           timestampBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -5488,7 +5559,7 @@ public Builder clearTimestamp() {
        * <code>.google.protobuf.Timestamp timestamp = 2;</code>
        */
       public com.google.protobuf.Timestamp.Builder getTimestampBuilder() {
-
+        bitField0_ |= 0x00000002;
         onChanged();
         return getTimestampFieldBuilder().getBuilder();
       }
@@ -5540,9 +5611,9 @@ public com.google.protobuf.TimestampOrBuilder getTimestampOrBuilder() {
           java.util.Collections.emptyList();
 
       private void ensureAttachmentsIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!((bitField0_ & 0x00000004) != 0)) {
           attachments_ = new java.util.ArrayList<com.google.protobuf.Any>(attachments_);
-          bitField0_ |= 0x00000001;
+          bitField0_ |= 0x00000004;
         }
       }
 
@@ -5821,7 +5892,7 @@ public Builder addAllAttachments(
       public Builder clearAttachments() {
         if (attachmentsBuilder_ == null) {
           attachments_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000004);
           onChanged();
         } else {
           attachmentsBuilder_.clear();
@@ -5985,7 +6056,7 @@ public java.util.List<com.google.protobuf.Any.Builder> getAttachmentsBuilderList
                   com.google.protobuf.Any.Builder,
                   com.google.protobuf.AnyOrBuilder>(
                   attachments_,
-                  ((bitField0_ & 0x00000001) != 0),
+                  ((bitField0_ & 0x00000004) != 0),
                   getParentForChildren(),
                   isClean());
           attachments_ = null;
@@ -6058,7 +6129,7 @@ public com.google.api.Distribution.Exemplar getDefaultInstanceForType() {
   }
 
   public static final int COUNT_FIELD_NUMBER = 1;
-  private long count_;
+  private long count_ = 0L;
   /**
    *
    *
@@ -6078,7 +6149,7 @@ public long getCount() {
   }
 
   public static final int MEAN_FIELD_NUMBER = 2;
-  private double mean_;
+  private double mean_ = 0D;
   /**
    *
    *
@@ -6097,7 +6168,7 @@ public double getMean() {
   }
 
   public static final int SUM_OF_SQUARED_DEVIATION_FIELD_NUMBER = 3;
-  private double sumOfSquaredDeviation_;
+  private double sumOfSquaredDeviation_ = 0D;
   /**
    *
    *
@@ -6165,7 +6236,7 @@ public com.google.api.Distribution.Range getRange() {
    */
   @java.lang.Override
   public com.google.api.Distribution.RangeOrBuilder getRangeOrBuilder() {
-    return getRange();
+    return range_ == null ? com.google.api.Distribution.Range.getDefaultInstance() : range_;
   }
 
   public static final int BUCKET_OPTIONS_FIELD_NUMBER = 6;
@@ -6216,10 +6287,14 @@ public com.google.api.Distribution.BucketOptions getBucketOptions() {
    */
   @java.lang.Override
   public com.google.api.Distribution.BucketOptionsOrBuilder getBucketOptionsOrBuilder() {
-    return getBucketOptions();
+    return bucketOptions_ == null
+        ? com.google.api.Distribution.BucketOptions.getDefaultInstance()
+        : bucketOptions_;
   }
 
   public static final int BUCKET_COUNTS_FIELD_NUMBER = 7;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.Internal.LongList bucketCounts_;
   /**
    *
@@ -6305,6 +6380,8 @@ public long getBucketCounts(int index) {
   private int bucketCountsMemoizedSerializedSize = -1;
 
   public static final int EXEMPLARS_FIELD_NUMBER = 10;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.Distribution.Exemplar> exemplars_;
   /**
    *
@@ -6667,33 +6744,28 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       count_ = 0L;
-
       mean_ = 0D;
-
       sumOfSquaredDeviation_ = 0D;
-
-      if (rangeBuilder_ == null) {
-        range_ = null;
-      } else {
-        range_ = null;
+      range_ = null;
+      if (rangeBuilder_ != null) {
+        rangeBuilder_.dispose();
         rangeBuilder_ = null;
       }
-      if (bucketOptionsBuilder_ == null) {
-        bucketOptions_ = null;
-      } else {
-        bucketOptions_ = null;
+      bucketOptions_ = null;
+      if (bucketOptionsBuilder_ != null) {
+        bucketOptionsBuilder_.dispose();
         bucketOptionsBuilder_ = null;
       }
       bucketCounts_ = emptyLongList();
-      bitField0_ = (bitField0_ & ~0x00000001);
       if (exemplarsBuilder_ == null) {
         exemplars_ = java.util.Collections.emptyList();
       } else {
         exemplars_ = null;
         exemplarsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000040);
       return this;
     }
 
@@ -6719,36 +6791,49 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.count_ = count_;
-      result.mean_ = mean_;
-      result.sumOfSquaredDeviation_ = sumOfSquaredDeviation_;
-      if (rangeBuilder_ == null) {
-        result.range_ = range_;
-      } else {
-        result.range_ = rangeBuilder_.build();
-      }
-      if (bucketOptionsBuilder_ == null) {
-        result.bucketOptions_ = bucketOptions_;
-      } else {
-        result.bucketOptions_ = bucketOptionsBuilder_.build();
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.Distribution result) {
+      if (((bitField0_ & 0x00000020) != 0)) {
         bucketCounts_.makeImmutable();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000020);
       }
       result.bucketCounts_ = bucketCounts_;
       if (exemplarsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000040) != 0)) {
           exemplars_ = java.util.Collections.unmodifiableList(exemplars_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000040);
         }
         result.exemplars_ = exemplars_;
       } else {
         result.exemplars_ = exemplarsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    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_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.range_ = rangeBuilder_ == null ? range_ : rangeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.bucketOptions_ =
+            bucketOptionsBuilder_ == null ? bucketOptions_ : bucketOptionsBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -6814,7 +6899,7 @@ public Builder mergeFrom(com.google.api.Distribution other) {
       if (!other.bucketCounts_.isEmpty()) {
         if (bucketCounts_.isEmpty()) {
           bucketCounts_ = other.bucketCounts_;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000020);
         } else {
           ensureBucketCountsIsMutable();
           bucketCounts_.addAll(other.bucketCounts_);
@@ -6825,7 +6910,7 @@ public Builder mergeFrom(com.google.api.Distribution other) {
         if (!other.exemplars_.isEmpty()) {
           if (exemplars_.isEmpty()) {
             exemplars_ = other.exemplars_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000040);
           } else {
             ensureExemplarsIsMutable();
             exemplars_.addAll(other.exemplars_);
@@ -6838,7 +6923,7 @@ public Builder mergeFrom(com.google.api.Distribution other) {
             exemplarsBuilder_.dispose();
             exemplarsBuilder_ = null;
             exemplars_ = other.exemplars_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000040);
             exemplarsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getExemplarsFieldBuilder()
@@ -6877,31 +6962,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:
@@ -6989,6 +7074,7 @@ public long getCount() {
     public Builder setCount(long value) {
 
       count_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -7006,7 +7092,7 @@ public Builder setCount(long value) {
      * @return This builder for chaining.
      */
     public Builder clearCount() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       count_ = 0L;
       onChanged();
       return this;
@@ -7045,6 +7131,7 @@ public double getMean() {
     public Builder setMean(double value) {
 
       mean_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -7061,7 +7148,7 @@ public Builder setMean(double value) {
      * @return This builder for chaining.
      */
     public Builder clearMean() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       mean_ = 0D;
       onChanged();
       return this;
@@ -7108,6 +7195,7 @@ public double getSumOfSquaredDeviation() {
     public Builder setSumOfSquaredDeviation(double value) {
 
       sumOfSquaredDeviation_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -7128,7 +7216,7 @@ public Builder setSumOfSquaredDeviation(double value) {
      * @return This builder for chaining.
      */
     public Builder clearSumOfSquaredDeviation() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       sumOfSquaredDeviation_ = 0D;
       onChanged();
       return this;
@@ -7153,7 +7241,7 @@ public Builder clearSumOfSquaredDeviation() {
      * @return Whether the range field is set.
      */
     public boolean hasRange() {
-      return rangeBuilder_ != null || range_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -7190,11 +7278,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;
     }
     /**
@@ -7210,11 +7298,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;
     }
     /**
@@ -7229,17 +7317,18 @@ public Builder setRange(com.google.api.Distribution.Range.Builder builderForValu
      */
     public Builder mergeRange(com.google.api.Distribution.Range value) {
       if (rangeBuilder_ == null) {
-        if (range_ != null) {
-          range_ =
-              com.google.api.Distribution.Range.newBuilder(range_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && range_ != null
+            && range_ != com.google.api.Distribution.Range.getDefaultInstance()) {
+          getRangeBuilder().mergeFrom(value);
         } else {
           range_ = value;
         }
-        onChanged();
       } else {
         rangeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -7253,14 +7342,13 @@ public Builder mergeRange(com.google.api.Distribution.Range value) {
      * <code>.google.api.Distribution.Range range = 4;</code>
      */
     public Builder clearRange() {
-      if (rangeBuilder_ == null) {
-        range_ = null;
-        onChanged();
-      } else {
-        range_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      range_ = null;
+      if (rangeBuilder_ != null) {
+        rangeBuilder_.dispose();
         rangeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -7274,7 +7362,7 @@ public Builder clearRange() {
      * <code>.google.api.Distribution.Range range = 4;</code>
      */
     public com.google.api.Distribution.Range.Builder getRangeBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getRangeFieldBuilder().getBuilder();
     }
@@ -7341,7 +7429,7 @@ public com.google.api.Distribution.RangeOrBuilder getRangeOrBuilder() {
      * @return Whether the bucketOptions field is set.
      */
     public boolean hasBucketOptions() {
-      return bucketOptionsBuilder_ != null || bucketOptions_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -7380,11 +7468,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;
     }
     /**
@@ -7401,11 +7489,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;
     }
     /**
@@ -7420,19 +7508,18 @@ public Builder setBucketOptions(
      */
     public Builder mergeBucketOptions(com.google.api.Distribution.BucketOptions value) {
       if (bucketOptionsBuilder_ == null) {
-        if (bucketOptions_ != null) {
-          bucketOptions_ =
-              com.google.api.Distribution.BucketOptions.newBuilder(bucketOptions_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && bucketOptions_ != null
+            && bucketOptions_ != com.google.api.Distribution.BucketOptions.getDefaultInstance()) {
+          getBucketOptionsBuilder().mergeFrom(value);
         } else {
           bucketOptions_ = value;
         }
-        onChanged();
       } else {
         bucketOptionsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -7446,14 +7533,13 @@ public Builder mergeBucketOptions(com.google.api.Distribution.BucketOptions valu
      * <code>.google.api.Distribution.BucketOptions bucket_options = 6;</code>
      */
     public Builder clearBucketOptions() {
-      if (bucketOptionsBuilder_ == null) {
-        bucketOptions_ = null;
-        onChanged();
-      } else {
-        bucketOptions_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      bucketOptions_ = null;
+      if (bucketOptionsBuilder_ != null) {
+        bucketOptionsBuilder_.dispose();
         bucketOptionsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -7467,7 +7553,7 @@ public Builder clearBucketOptions() {
      * <code>.google.api.Distribution.BucketOptions bucket_options = 6;</code>
      */
     public com.google.api.Distribution.BucketOptions.Builder getBucketOptionsBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getBucketOptionsFieldBuilder().getBuilder();
     }
@@ -7520,9 +7606,9 @@ public com.google.api.Distribution.BucketOptionsOrBuilder getBucketOptionsOrBuil
     private com.google.protobuf.Internal.LongList bucketCounts_ = emptyLongList();
 
     private void ensureBucketCountsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000020) != 0)) {
         bucketCounts_ = mutableCopy(bucketCounts_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000020;
       }
     }
     /**
@@ -7549,7 +7635,7 @@ private void ensureBucketCountsIsMutable() {
      * @return A list containing the bucketCounts.
      */
     public java.util.List<java.lang.Long> getBucketCountsList() {
-      return ((bitField0_ & 0x00000001) != 0)
+      return ((bitField0_ & 0x00000020) != 0)
           ? java.util.Collections.unmodifiableList(bucketCounts_)
           : bucketCounts_;
     }
@@ -7632,6 +7718,7 @@ public long getBucketCounts(int index) {
      * @return This builder for chaining.
      */
     public Builder setBucketCounts(int index, long value) {
+
       ensureBucketCountsIsMutable();
       bucketCounts_.setLong(index, value);
       onChanged();
@@ -7662,6 +7749,7 @@ public Builder setBucketCounts(int index, long value) {
      * @return This builder for chaining.
      */
     public Builder addBucketCounts(long value) {
+
       ensureBucketCountsIsMutable();
       bucketCounts_.addLong(value);
       onChanged();
@@ -7722,7 +7810,7 @@ public Builder addAllBucketCounts(java.lang.Iterable<? extends java.lang.Long> v
      */
     public Builder clearBucketCounts() {
       bucketCounts_ = emptyLongList();
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -7731,9 +7819,9 @@ public Builder clearBucketCounts() {
         java.util.Collections.emptyList();
 
     private void ensureExemplarsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000040) != 0)) {
         exemplars_ = new java.util.ArrayList<com.google.api.Distribution.Exemplar>(exemplars_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000040;
       }
     }
 
@@ -7948,7 +8036,7 @@ public Builder addAllExemplars(
     public Builder clearExemplars() {
       if (exemplarsBuilder_ == null) {
         exemplars_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000040);
         onChanged();
       } else {
         exemplarsBuilder_.clear();
@@ -8069,7 +8157,7 @@ public java.util.List<com.google.api.Distribution.Exemplar.Builder> getExemplars
                 com.google.api.Distribution.Exemplar,
                 com.google.api.Distribution.Exemplar.Builder,
                 com.google.api.Distribution.ExemplarOrBuilder>(
-                exemplars_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                exemplars_, ((bitField0_ & 0x00000040) != 0), getParentForChildren(), isClean());
         exemplars_ = null;
       }
       return exemplarsBuilder_;
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 a30f745edc..bb34d32e9e 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Documentation.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Documentation.java
@@ -120,7 +120,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SUMMARY_FIELD_NUMBER = 1;
-  private volatile java.lang.Object summary_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object summary_ = "";
   /**
    *
    *
@@ -175,6 +177,8 @@ public com.google.protobuf.ByteString getSummaryBytes() {
   }
 
   public static final int PAGES_FIELD_NUMBER = 5;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.Page> pages_;
   /**
    *
@@ -243,6 +247,8 @@ public com.google.api.PageOrBuilder getPagesOrBuilder(int index) {
   }
 
   public static final int RULES_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.DocumentationRule> rules_;
   /**
    *
@@ -317,7 +323,9 @@ public com.google.api.DocumentationRuleOrBuilder getRulesOrBuilder(int index) {
   }
 
   public static final int DOCUMENTATION_ROOT_URL_FIELD_NUMBER = 4;
-  private volatile java.lang.Object documentationRootUrl_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object documentationRootUrl_ = "";
   /**
    *
    *
@@ -366,7 +374,9 @@ public com.google.protobuf.ByteString getDocumentationRootUrlBytes() {
   }
 
   public static final int SERVICE_ROOT_URL_FIELD_NUMBER = 6;
-  private volatile java.lang.Object serviceRootUrl_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object serviceRootUrl_ = "";
   /**
    *
    *
@@ -421,7 +431,9 @@ public com.google.protobuf.ByteString getServiceRootUrlBytes() {
   }
 
   public static final int OVERVIEW_FIELD_NUMBER = 2;
-  private volatile java.lang.Object overview_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object overview_ = "";
   /**
    *
    *
@@ -784,28 +796,25 @@ 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_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
       } else {
         rules_ = null;
         rulesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000004);
       documentationRootUrl_ = "";
-
       serviceRootUrl_ = "";
-
       overview_ = "";
-
       return this;
     }
 
@@ -831,31 +840,49 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.summary_ = summary_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.Documentation result) {
       if (pagesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           pages_ = java.util.Collections.unmodifiableList(pages_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.pages_ = pages_;
       } else {
         result.pages_ = pagesBuilder_.build();
       }
       if (rulesBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000004) != 0)) {
           rules_ = java.util.Collections.unmodifiableList(rules_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.rules_ = rules_;
       } else {
         result.rules_ = rulesBuilder_.build();
       }
-      result.documentationRootUrl_ = documentationRootUrl_;
-      result.serviceRootUrl_ = serviceRootUrl_;
-      result.overview_ = overview_;
-      onBuilt();
-      return result;
+    }
+
+    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_;
+      }
     }
 
     @java.lang.Override
@@ -905,13 +932,14 @@ 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_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensurePagesIsMutable();
             pages_.addAll(other.pages_);
@@ -924,7 +952,7 @@ public Builder mergeFrom(com.google.api.Documentation other) {
             pagesBuilder_.dispose();
             pagesBuilder_ = null;
             pages_ = other.pages_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             pagesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getPagesFieldBuilder()
@@ -938,7 +966,7 @@ public Builder mergeFrom(com.google.api.Documentation other) {
         if (!other.rules_.isEmpty()) {
           if (rules_.isEmpty()) {
             rules_ = other.rules_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureRulesIsMutable();
             rules_.addAll(other.rules_);
@@ -951,7 +979,7 @@ public Builder mergeFrom(com.google.api.Documentation other) {
             rulesBuilder_.dispose();
             rulesBuilder_ = null;
             rules_ = other.rules_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000004);
             rulesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getRulesFieldBuilder()
@@ -963,14 +991,17 @@ 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());
@@ -1002,13 +1033,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:
@@ -1026,7 +1057,7 @@ public Builder mergeFrom(
             case 34:
               {
                 documentationRootUrl_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 42:
@@ -1044,7 +1075,7 @@ public Builder mergeFrom(
             case 50:
               {
                 serviceRootUrl_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 50
             default:
@@ -1136,8 +1167,8 @@ public Builder setSummary(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       summary_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1156,8 +1187,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;
     }
@@ -1181,8 +1212,8 @@ public Builder setSummaryBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       summary_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1190,9 +1221,9 @@ public Builder setSummaryBytes(com.google.protobuf.ByteString value) {
     private java.util.List<com.google.api.Page> pages_ = java.util.Collections.emptyList();
 
     private void ensurePagesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         pages_ = new java.util.ArrayList<com.google.api.Page>(pages_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -1402,7 +1433,7 @@ public Builder addAllPages(java.lang.Iterable<? extends com.google.api.Page> val
     public Builder clearPages() {
       if (pagesBuilder_ == null) {
         pages_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         pagesBuilder_.clear();
@@ -1516,7 +1547,7 @@ public java.util.List<com.google.api.Page.Builder> getPagesBuilderList() {
         pagesBuilder_ =
             new com.google.protobuf.RepeatedFieldBuilderV3<
                 com.google.api.Page, com.google.api.Page.Builder, com.google.api.PageOrBuilder>(
-                pages_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                pages_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         pages_ = null;
       }
       return pagesBuilder_;
@@ -1526,9 +1557,9 @@ public java.util.List<com.google.api.Page.Builder> getPagesBuilderList() {
         java.util.Collections.emptyList();
 
     private void ensureRulesIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         rules_ = new java.util.ArrayList<com.google.api.DocumentationRule>(rules_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000004;
       }
     }
 
@@ -1752,7 +1783,7 @@ public Builder addAllRules(
     public Builder clearRules() {
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
       } else {
         rulesBuilder_.clear();
@@ -1880,7 +1911,7 @@ public java.util.List<com.google.api.DocumentationRule.Builder> getRulesBuilderL
                 com.google.api.DocumentationRule,
                 com.google.api.DocumentationRule.Builder,
                 com.google.api.DocumentationRuleOrBuilder>(
-                rules_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                rules_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
         rules_ = null;
       }
       return rulesBuilder_;
@@ -1947,8 +1978,8 @@ public Builder setDocumentationRootUrl(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       documentationRootUrl_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1964,8 +1995,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;
     }
@@ -1986,8 +2017,8 @@ public Builder setDocumentationRootUrlBytes(com.google.protobuf.ByteString value
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       documentationRootUrl_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2062,8 +2093,8 @@ public Builder setServiceRootUrl(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       serviceRootUrl_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2082,8 +2113,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;
     }
@@ -2107,8 +2138,8 @@ public Builder setServiceRootUrlBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       serviceRootUrl_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2210,8 +2241,8 @@ public Builder setOverview(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       overview_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2239,8 +2270,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;
     }
@@ -2273,8 +2304,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/DocumentationRule.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DocumentationRule.java
index b4eac18a80..68b53d491a 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DocumentationRule.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DocumentationRule.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SELECTOR_FIELD_NUMBER = 1;
-  private volatile java.lang.Object selector_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object selector_ = "";
   /**
    *
    *
@@ -130,7 +132,9 @@ public com.google.protobuf.ByteString getSelectorBytes() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 2;
-  private volatile java.lang.Object description_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object description_ = "";
   /**
    *
    *
@@ -183,7 +187,9 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
   }
 
   public static final int DEPRECATION_DESCRIPTION_FIELD_NUMBER = 3;
-  private volatile java.lang.Object deprecationDescription_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object deprecationDescription_ = "";
   /**
    *
    *
@@ -446,12 +452,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       selector_ = "";
-
       description_ = "";
-
       deprecationDescription_ = "";
-
       return this;
     }
 
@@ -478,13 +482,26 @@ 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);
-      result.selector_ = selector_;
-      result.description_ = description_;
-      result.deprecationDescription_ = deprecationDescription_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -532,14 +549,17 @@ 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());
@@ -571,19 +591,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:
@@ -603,6 +623,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object selector_ = "";
     /**
      *
@@ -682,8 +704,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       selector_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -705,8 +727,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;
     }
@@ -733,8 +755,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       selector_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -806,8 +828,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       description_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -825,8 +847,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;
     }
@@ -849,8 +871,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       description_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -919,8 +941,8 @@ public Builder setDeprecationDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       deprecationDescription_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -937,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;
     }
@@ -960,8 +982,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/DotnetSettings.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DotnetSettings.java
index 43d09ca387..ceddb79b57 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
@@ -105,7 +105,7 @@ public com.google.api.CommonLanguageSettings getCommon() {
    */
   @java.lang.Override
   public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
-    return getCommon();
+    return common_ == null ? com.google.api.CommonLanguageSettings.getDefaultInstance() : common_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -305,10 +305,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (commonBuilder_ == null) {
-        common_ = null;
-      } else {
-        common_ = null;
+      bitField0_ = 0;
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
       return this;
@@ -336,15 +336,20 @@ 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 (commonBuilder_ == null) {
-        result.common_ = common_;
-      } else {
-        result.common_ = commonBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.api.DotnetSettings result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -422,7 +427,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -442,6 +447,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.api.CommonLanguageSettings common_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.api.CommonLanguageSettings,
@@ -460,7 +467,7 @@ public Builder mergeFrom(
      * @return Whether the common field is set.
      */
     public boolean hasCommon() {
-      return commonBuilder_ != null || common_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -497,11 +504,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
           throw new NullPointerException();
         }
         common_ = value;
-        onChanged();
       } else {
         commonBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -516,11 +523,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;
     }
     /**
@@ -534,19 +541,18 @@ public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderFo
      */
     public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
       if (commonBuilder_ == null) {
-        if (common_ != null) {
-          common_ =
-              com.google.api.CommonLanguageSettings.newBuilder(common_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && common_ != null
+            && common_ != com.google.api.CommonLanguageSettings.getDefaultInstance()) {
+          getCommonBuilder().mergeFrom(value);
         } else {
           common_ = value;
         }
-        onChanged();
       } else {
         commonBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -559,14 +565,13 @@ public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
      * <code>.google.api.CommonLanguageSettings common = 1;</code>
      */
     public Builder clearCommon() {
-      if (commonBuilder_ == null) {
-        common_ = null;
-        onChanged();
-      } else {
-        common_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -579,7 +584,7 @@ public Builder clearCommon() {
      * <code>.google.api.CommonLanguageSettings common = 1;</code>
      */
     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/Endpoint.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Endpoint.java
index 7fc28ef25f..0601b05d8d 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Endpoint.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Endpoint.java
@@ -85,7 +85,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -134,6 +136,8 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int ALIASES_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList aliases_;
   /**
    *
@@ -219,7 +223,9 @@ public com.google.protobuf.ByteString getAliasesBytes(int index) {
   }
 
   public static final int TARGET_FIELD_NUMBER = 101;
-  private volatile java.lang.Object target_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object target_ = "";
   /**
    *
    *
@@ -276,7 +282,7 @@ public com.google.protobuf.ByteString getTargetBytes() {
   }
 
   public static final int ALLOW_CORS_FIELD_NUMBER = 5;
-  private boolean allowCors_;
+  private boolean allowCors_ = false;
   /**
    *
    *
@@ -542,14 +548,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       aliases_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       target_ = "";
-
       allowCors_ = false;
-
       return this;
     }
 
@@ -575,19 +579,35 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.name_ = name_;
-      if (((bitField0_ & 0x00000001) != 0)) {
-        aliases_ = aliases_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000001);
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.aliases_ = aliases_;
-      result.target_ = target_;
-      result.allowCors_ = allowCors_;
       onBuilt();
       return result;
     }
 
+    private void buildPartialRepeatedFields(com.google.api.Endpoint result) {
+      if (((bitField0_ & 0x00000002) != 0)) {
+        aliases_ = aliases_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000002);
+      }
+      result.aliases_ = aliases_;
+    }
+
+    private void buildPartial0(com.google.api.Endpoint result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.target_ = target_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.allowCors_ = allowCors_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -635,12 +655,13 @@ 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_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureAliasesIsMutable();
           aliases_.addAll(other.aliases_);
@@ -649,6 +670,7 @@ public Builder mergeFrom(com.google.api.Endpoint other) {
       }
       if (!other.getTarget().isEmpty()) {
         target_ = other.target_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.getAllowCors() != false) {
@@ -683,7 +705,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -696,13 +718,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:
@@ -785,8 +807,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -802,8 +824,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;
     }
@@ -824,8 +846,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -834,9 +856,9 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureAliasesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         aliases_ = new com.google.protobuf.LazyStringArrayList(aliases_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
     /**
@@ -1019,7 +1041,7 @@ public Builder addAllAliases(java.lang.Iterable<java.lang.String> values) {
     @java.lang.Deprecated
     public Builder clearAliases() {
       aliases_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1125,8 +1147,8 @@ public Builder setTarget(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       target_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1146,8 +1168,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;
     }
@@ -1172,8 +1194,8 @@ public Builder setTargetBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       target_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1219,6 +1241,7 @@ public boolean getAllowCors() {
     public Builder setAllowCors(boolean value) {
 
       allowCors_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1239,7 +1262,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/GoSettings.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/GoSettings.java
index f21f7cfc20..bb22becb93 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/GoSettings.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/GoSettings.java
@@ -105,7 +105,7 @@ public com.google.api.CommonLanguageSettings getCommon() {
    */
   @java.lang.Override
   public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
-    return getCommon();
+    return common_ == null ? com.google.api.CommonLanguageSettings.getDefaultInstance() : common_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -305,10 +305,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (commonBuilder_ == null) {
-        common_ = null;
-      } else {
-        common_ = null;
+      bitField0_ = 0;
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
       return this;
@@ -336,15 +336,20 @@ 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 (commonBuilder_ == null) {
-        result.common_ = common_;
-      } else {
-        result.common_ = commonBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.api.GoSettings result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -422,7 +427,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -442,6 +447,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.api.CommonLanguageSettings common_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.api.CommonLanguageSettings,
@@ -460,7 +467,7 @@ public Builder mergeFrom(
      * @return Whether the common field is set.
      */
     public boolean hasCommon() {
-      return commonBuilder_ != null || common_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -497,11 +504,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
           throw new NullPointerException();
         }
         common_ = value;
-        onChanged();
       } else {
         commonBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -516,11 +523,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;
     }
     /**
@@ -534,19 +541,18 @@ public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderFo
      */
     public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
       if (commonBuilder_ == null) {
-        if (common_ != null) {
-          common_ =
-              com.google.api.CommonLanguageSettings.newBuilder(common_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && common_ != null
+            && common_ != com.google.api.CommonLanguageSettings.getDefaultInstance()) {
+          getCommonBuilder().mergeFrom(value);
         } else {
           common_ = value;
         }
-        onChanged();
       } else {
         commonBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -559,14 +565,13 @@ public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
      * <code>.google.api.CommonLanguageSettings common = 1;</code>
      */
     public Builder clearCommon() {
-      if (commonBuilder_ == null) {
-        common_ = null;
-        onChanged();
-      } else {
-        common_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -579,7 +584,7 @@ public Builder clearCommon() {
      * <code>.google.api.CommonLanguageSettings common = 1;</code>
      */
     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/Http.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Http.java
index 6aa15d767b..da9fd8337d 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Http.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Http.java
@@ -67,6 +67,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RULES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.HttpRule> rules_;
   /**
    *
@@ -140,7 +142,7 @@ public com.google.api.HttpRuleOrBuilder getRulesOrBuilder(int index) {
   }
 
   public static final int FULLY_DECODE_RESERVED_EXPANSION_FIELD_NUMBER = 2;
-  private boolean fullyDecodeReservedExpansion_;
+  private boolean fullyDecodeReservedExpansion_ = false;
   /**
    *
    *
@@ -368,6 +370,7 @@ 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 {
@@ -376,7 +379,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       fullyDecodeReservedExpansion_ = false;
-
       return this;
     }
 
@@ -402,7 +404,15 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.Http result) {
       if (rulesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           rules_ = java.util.Collections.unmodifiableList(rules_);
@@ -412,9 +422,13 @@ public com.google.api.Http buildPartial() {
       } else {
         result.rules_ = rulesBuilder_.build();
       }
-      result.fullyDecodeReservedExpansion_ = fullyDecodeReservedExpansion_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.api.Http result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.fullyDecodeReservedExpansion_ = fullyDecodeReservedExpansion_;
+      }
     }
 
     @java.lang.Override
@@ -533,7 +547,7 @@ public Builder mergeFrom(
             case 16:
               {
                 fullyDecodeReservedExpansion_ = input.readBool();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             default:
@@ -953,6 +967,7 @@ public boolean getFullyDecodeReservedExpansion() {
     public Builder setFullyDecodeReservedExpansion(boolean value) {
 
       fullyDecodeReservedExpansion_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -972,7 +987,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 fbab9ae19b..141f53de8a 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpBody.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpBody.java
@@ -96,7 +96,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONTENT_TYPE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object contentType_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object contentType_ = "";
   /**
    *
    *
@@ -145,7 +147,7 @@ public com.google.protobuf.ByteString getContentTypeBytes() {
   }
 
   public static final int DATA_FIELD_NUMBER = 2;
-  private com.google.protobuf.ByteString data_;
+  private com.google.protobuf.ByteString data_ = com.google.protobuf.ByteString.EMPTY;
   /**
    *
    *
@@ -163,6 +165,8 @@ public com.google.protobuf.ByteString getData() {
   }
 
   public static final int EXTENSIONS_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.protobuf.Any> extensions_;
   /**
    *
@@ -476,17 +480,16 @@ 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_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000004);
       return this;
     }
 
@@ -512,20 +515,34 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.contentType_ = contentType_;
-      result.data_ = data_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.HttpBody result) {
       if (extensionsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000004) != 0)) {
           extensions_ = java.util.Collections.unmodifiableList(extensions_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.extensions_ = extensions_;
       } else {
         result.extensions_ = extensionsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    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_;
+      }
     }
 
     @java.lang.Override
@@ -575,6 +592,7 @@ 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) {
@@ -584,7 +602,7 @@ public Builder mergeFrom(com.google.api.HttpBody other) {
         if (!other.extensions_.isEmpty()) {
           if (extensions_.isEmpty()) {
             extensions_ = other.extensions_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureExtensionsIsMutable();
             extensions_.addAll(other.extensions_);
@@ -597,7 +615,7 @@ public Builder mergeFrom(com.google.api.HttpBody other) {
             extensionsBuilder_.dispose();
             extensionsBuilder_ = null;
             extensions_ = other.extensions_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
             extensionsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getExtensionsFieldBuilder()
@@ -636,13 +654,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:
@@ -737,8 +755,8 @@ public Builder setContentType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       contentType_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -754,8 +772,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;
     }
@@ -776,8 +794,8 @@ public Builder setContentTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       contentType_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -814,8 +832,8 @@ public Builder setData(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       data_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -831,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;
@@ -840,9 +858,9 @@ public Builder clearData() {
     private java.util.List<com.google.protobuf.Any> extensions_ = java.util.Collections.emptyList();
 
     private void ensureExtensionsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         extensions_ = new java.util.ArrayList<com.google.protobuf.Any>(extensions_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000004;
       }
     }
 
@@ -1065,7 +1083,7 @@ public Builder addAllExtensions(java.lang.Iterable<? extends com.google.protobuf
     public Builder clearExtensions() {
       if (extensionsBuilder_ == null) {
         extensions_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
       } else {
         extensionsBuilder_.clear();
@@ -1191,7 +1209,7 @@ public java.util.List<com.google.protobuf.Any.Builder> getExtensionsBuilderList(
                 com.google.protobuf.Any,
                 com.google.protobuf.Any.Builder,
                 com.google.protobuf.AnyOrBuilder>(
-                extensions_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                extensions_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
         extensions_ = null;
       }
       return extensionsBuilder_;
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 568b0c52b2..8560ac5209 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
@@ -348,7 +348,9 @@ public PatternCase getPatternCase() {
   }
 
   public static final int SELECTOR_FIELD_NUMBER = 1;
-  private volatile java.lang.Object selector_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object selector_ = "";
   /**
    *
    *
@@ -812,7 +814,9 @@ public com.google.api.CustomHttpPatternOrBuilder getCustomOrBuilder() {
   }
 
   public static final int BODY_FIELD_NUMBER = 7;
-  private volatile java.lang.Object body_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object body_ = "";
   /**
    *
    *
@@ -869,7 +873,9 @@ public com.google.protobuf.ByteString getBodyBytes() {
   }
 
   public static final int RESPONSE_BODY_FIELD_NUMBER = 12;
-  private volatile java.lang.Object responseBody_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object responseBody_ = "";
   /**
    *
    *
@@ -926,6 +932,8 @@ public com.google.protobuf.ByteString getResponseBodyBytes() {
   }
 
   public static final int ADDITIONAL_BINDINGS_FIELD_NUMBER = 11;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.HttpRule> additionalBindings_;
   /**
    *
@@ -1536,22 +1544,20 @@ 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_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000200);
       patternCase_ = 0;
       pattern_ = null;
       return this;
@@ -1579,44 +1585,46 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.selector_ = selector_;
-      if (patternCase_ == 2) {
-        result.pattern_ = pattern_;
-      }
-      if (patternCase_ == 3) {
-        result.pattern_ = pattern_;
-      }
-      if (patternCase_ == 4) {
-        result.pattern_ = pattern_;
-      }
-      if (patternCase_ == 5) {
-        result.pattern_ = pattern_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      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_;
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.HttpRule result) {
       if (additionalBindingsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000200) != 0)) {
           additionalBindings_ = java.util.Collections.unmodifiableList(additionalBindings_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000200);
         }
         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_;
-      onBuilt();
-      return result;
+      result.pattern_ = this.pattern_;
+      if (patternCase_ == 8 && customBuilder_ != null) {
+        result.pattern_ = customBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -1666,21 +1674,24 @@ 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_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000200);
           } else {
             ensureAdditionalBindingsIsMutable();
             additionalBindings_.addAll(other.additionalBindings_);
@@ -1693,7 +1704,7 @@ public Builder mergeFrom(com.google.api.HttpRule other) {
             additionalBindingsBuilder_.dispose();
             additionalBindingsBuilder_ = null;
             additionalBindings_ = other.additionalBindings_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000200);
             additionalBindingsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getAdditionalBindingsFieldBuilder()
@@ -1778,7 +1789,7 @@ public Builder mergeFrom(
             case 10:
               {
                 selector_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -1819,7 +1830,7 @@ public Builder mergeFrom(
             case 58:
               {
                 body_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 58
             case 66:
@@ -1843,7 +1854,7 @@ public Builder mergeFrom(
             case 98:
               {
                 responseBody_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000100;
                 break;
               } // case 98
             default:
@@ -1943,8 +1954,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       selector_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1961,8 +1972,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;
     }
@@ -1984,8 +1995,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       selector_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2896,7 +2907,6 @@ public com.google.api.CustomHttpPatternOrBuilder getCustomOrBuilder() {
       }
       patternCase_ = 8;
       onChanged();
-      ;
       return customBuilder_;
     }
 
@@ -2973,8 +2983,8 @@ public Builder setBody(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       body_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2994,8 +3004,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;
     }
@@ -3020,8 +3030,8 @@ public Builder setBodyBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       body_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -3099,8 +3109,8 @@ public Builder setResponseBody(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       responseBody_ = value;
+      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -3120,8 +3130,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;
     }
@@ -3146,8 +3156,8 @@ public Builder setResponseBodyBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       responseBody_ = value;
+      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -3156,9 +3166,9 @@ public Builder setResponseBodyBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureAdditionalBindingsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000200) != 0)) {
         additionalBindings_ = new java.util.ArrayList<com.google.api.HttpRule>(additionalBindings_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000200;
       }
     }
 
@@ -3395,7 +3405,7 @@ public Builder addAllAdditionalBindings(
     public Builder clearAdditionalBindings() {
       if (additionalBindingsBuilder_ == null) {
         additionalBindings_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000200);
         onChanged();
       } else {
         additionalBindingsBuilder_.clear();
@@ -3531,7 +3541,7 @@ public java.util.List<com.google.api.HttpRule.Builder> getAdditionalBindingsBuil
                 com.google.api.HttpRule.Builder,
                 com.google.api.HttpRuleOrBuilder>(
                 additionalBindings_,
-                ((bitField0_ & 0x00000001) != 0),
+                ((bitField0_ & 0x00000200) != 0),
                 getParentForChildren(),
                 isClean());
         additionalBindings_ = null;
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 ea465684ba..4bdbc32ad2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JavaSettings.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JavaSettings.java
@@ -76,7 +76,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   }
 
   public static final int LIBRARY_PACKAGE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object libraryPackage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object libraryPackage_ = "";
   /**
    *
    *
@@ -153,6 +155,7 @@ private static final class ServiceClassNamesDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> serviceClassNames_;
 
   private com.google.protobuf.MapField<java.lang.String, java.lang.String>
@@ -245,8 +248,10 @@ public java.util.Map<java.lang.String, java.lang.String> getServiceClassNamesMap
    * <code>map&lt;string, string&gt; service_class_names = 2;</code>
    */
   @java.lang.Override
-  public java.lang.String getServiceClassNamesOrDefault(
-      java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getServiceClassNamesOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -328,7 +333,7 @@ public com.google.api.CommonLanguageSettings getCommon() {
    */
   @java.lang.Override
   public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
-    return getCommon();
+    return common_ == null ? com.google.api.CommonLanguageSettings.getDefaultInstance() : common_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -577,13 +582,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       libraryPackage_ = "";
-
       internalGetMutableServiceClassNames().clear();
-      if (commonBuilder_ == null) {
-        common_ = null;
-      } else {
-        common_ = null;
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
       return this;
@@ -611,19 +615,27 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.libraryPackage_ = libraryPackage_;
-      result.serviceClassNames_ = internalGetServiceClassNames();
-      result.serviceClassNames_.makeImmutable();
-      if (commonBuilder_ == null) {
-        result.common_ = common_;
-      } else {
-        result.common_ = commonBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       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();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -671,9 +683,11 @@ 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());
       }
@@ -706,7 +720,7 @@ public Builder mergeFrom(
             case 10:
               {
                 libraryPackage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -719,12 +733,13 @@ 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:
@@ -831,8 +846,8 @@ public Builder setLibraryPackage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       libraryPackage_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -856,8 +871,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;
     }
@@ -886,8 +901,8 @@ public Builder setLibraryPackageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       libraryPackage_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -905,8 +920,6 @@ public Builder setLibraryPackageBytes(com.google.protobuf.ByteString value) {
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
         internalGetMutableServiceClassNames() {
-      onChanged();
-      ;
       if (serviceClassNames_ == null) {
         serviceClassNames_ =
             com.google.protobuf.MapField.newMapField(
@@ -915,6 +928,8 @@ public Builder setLibraryPackageBytes(com.google.protobuf.ByteString value) {
       if (!serviceClassNames_.isMutable()) {
         serviceClassNames_ = serviceClassNames_.copy();
       }
+      bitField0_ |= 0x00000002;
+      onChanged();
       return serviceClassNames_;
     }
 
@@ -999,8 +1014,10 @@ public java.util.Map<java.lang.String, java.lang.String> getServiceClassNamesMap
      * <code>map&lt;string, string&gt; service_class_names = 2;</code>
      */
     @java.lang.Override
-    public java.lang.String getServiceClassNamesOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getServiceClassNamesOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1042,6 +1059,7 @@ public java.lang.String getServiceClassNamesOrThrow(java.lang.String key) {
     }
 
     public Builder clearServiceClassNames() {
+      bitField0_ = (bitField0_ & ~0x00000002);
       internalGetMutableServiceClassNames().getMutableMap().clear();
       return this;
     }
@@ -1075,6 +1093,7 @@ public Builder removeServiceClassNames(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMutableServiceClassNames() {
+      bitField0_ |= 0x00000002;
       return internalGetMutableServiceClassNames().getMutableMap();
     }
     /**
@@ -1104,8 +1123,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;
     }
     /**
@@ -1131,6 +1150,7 @@ public Builder putServiceClassNames(java.lang.String key, java.lang.String value
     public Builder putAllServiceClassNames(
         java.util.Map<java.lang.String, java.lang.String> values) {
       internalGetMutableServiceClassNames().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000002;
       return this;
     }
 
@@ -1152,7 +1172,7 @@ public Builder putAllServiceClassNames(
      * @return Whether the common field is set.
      */
     public boolean hasCommon() {
-      return commonBuilder_ != null || common_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1189,11 +1209,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
           throw new NullPointerException();
         }
         common_ = value;
-        onChanged();
       } else {
         commonBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1208,11 +1228,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;
     }
     /**
@@ -1226,19 +1246,18 @@ public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderFo
      */
     public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
       if (commonBuilder_ == null) {
-        if (common_ != null) {
-          common_ =
-              com.google.api.CommonLanguageSettings.newBuilder(common_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && common_ != null
+            && common_ != com.google.api.CommonLanguageSettings.getDefaultInstance()) {
+          getCommonBuilder().mergeFrom(value);
         } else {
           common_ = value;
         }
-        onChanged();
       } else {
         commonBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1251,14 +1270,13 @@ public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
      * <code>.google.api.CommonLanguageSettings common = 3;</code>
      */
     public Builder clearCommon() {
-      if (commonBuilder_ == null) {
-        common_ = null;
-        onChanged();
-      } else {
-        common_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1271,7 +1289,7 @@ public Builder clearCommon() {
      * <code>.google.api.CommonLanguageSettings common = 3;</code>
      */
     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 dfad2159e5..c6d326f4a3 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JavaSettingsOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JavaSettingsOrBuilder.java
@@ -150,7 +150,6 @@ public interface JavaSettingsOrBuilder
    *
    * <code>map&lt;string, string&gt; service_class_names = 2;</code>
    */
-
   /* nullable */
   java.lang.String getServiceClassNamesOrDefault(
       java.lang.String key,
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 02ddb3e616..9e7968ed34 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JwtLocation.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/JwtLocation.java
@@ -325,7 +325,9 @@ public com.google.protobuf.ByteString getCookieBytes() {
   }
 
   public static final int VALUE_PREFIX_FIELD_NUMBER = 3;
-  private volatile java.lang.Object valuePrefix_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object valuePrefix_ = "";
   /**
    *
    *
@@ -625,8 +627,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;
@@ -654,21 +656,26 @@ 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 (inCase_ == 1) {
-        result.in_ = in_;
-      }
-      if (inCase_ == 2) {
-        result.in_ = in_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (inCase_ == 4) {
-        result.in_ = in_;
-      }
-      result.valuePrefix_ = valuePrefix_;
-      result.inCase_ = inCase_;
+      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_;
+      }
+    }
+
+    private void buildPartialOneofs(com.google.api.JwtLocation result) {
+      result.inCase_ = inCase_;
+      result.in_ = this.in_;
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -716,6 +723,7 @@ 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()) {
@@ -788,7 +796,7 @@ public Builder mergeFrom(
             case 26:
               {
                 valuePrefix_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 26
             case 34:
@@ -829,6 +837,8 @@ public Builder clearIn() {
       return this;
     }
 
+    private int bitField0_;
+
     /**
      *
      *
@@ -1310,8 +1320,8 @@ public Builder setValuePrefix(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       valuePrefix_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1333,8 +1343,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;
     }
@@ -1361,8 +1371,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/LabelDescriptor.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LabelDescriptor.java
index 0a2963a358..503d6fc0d8 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LabelDescriptor.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LabelDescriptor.java
@@ -224,7 +224,9 @@ private ValueType(int value) {
   }
 
   public static final int KEY_FIELD_NUMBER = 1;
-  private volatile java.lang.Object key_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object key_ = "";
   /**
    *
    *
@@ -273,7 +275,7 @@ public com.google.protobuf.ByteString getKeyBytes() {
   }
 
   public static final int VALUE_TYPE_FIELD_NUMBER = 2;
-  private int valueType_;
+  private int valueType_ = 0;
   /**
    *
    *
@@ -302,14 +304,15 @@ 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.valueOf(valueType_);
+        com.google.api.LabelDescriptor.ValueType.forNumber(valueType_);
     return result == null ? com.google.api.LabelDescriptor.ValueType.UNRECOGNIZED : result;
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 3;
-  private volatile java.lang.Object description_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object description_ = "";
   /**
    *
    *
@@ -567,12 +570,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       key_ = "";
-
       valueType_ = 0;
-
       description_ = "";
-
       return this;
     }
 
@@ -598,13 +599,26 @@ 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);
-      result.key_ = key_;
-      result.valueType_ = valueType_;
-      result.description_ = description_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -652,6 +666,7 @@ 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) {
@@ -659,6 +674,7 @@ public Builder mergeFrom(com.google.api.LabelDescriptor other) {
       }
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -690,19 +706,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:
@@ -722,6 +738,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object key_ = "";
     /**
      *
@@ -783,8 +801,8 @@ public Builder setKey(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       key_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -800,8 +818,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;
     }
@@ -822,8 +840,8 @@ public Builder setKeyBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       key_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -857,8 +875,8 @@ public int getValueTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setValueTypeValue(int value) {
-
       valueType_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -875,9 +893,8 @@ 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.valueOf(valueType_);
+          com.google.api.LabelDescriptor.ValueType.forNumber(valueType_);
       return result == null ? com.google.api.LabelDescriptor.ValueType.UNRECOGNIZED : result;
     }
     /**
@@ -896,7 +913,7 @@ public Builder setValueType(com.google.api.LabelDescriptor.ValueType value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       valueType_ = value.getNumber();
       onChanged();
       return this;
@@ -913,7 +930,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;
@@ -980,8 +997,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       description_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -997,8 +1014,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;
     }
@@ -1019,8 +1036,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/LogDescriptor.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LogDescriptor.java
index 2ef911f9f7..b6b3318518 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LogDescriptor.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LogDescriptor.java
@@ -74,7 +74,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -129,6 +131,8 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int LABELS_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.LabelDescriptor> labels_;
   /**
    *
@@ -208,7 +212,9 @@ public com.google.api.LabelDescriptorOrBuilder getLabelsOrBuilder(int index) {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 3;
-  private volatile java.lang.Object description_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object description_ = "";
   /**
    *
    *
@@ -259,7 +265,9 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 4;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
@@ -536,19 +544,17 @@ 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_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       description_ = "";
-
       displayName_ = "";
-
       return this;
     }
 
@@ -574,21 +580,37 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.name_ = name_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.LogDescriptor result) {
       if (labelsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           labels_ = java.util.Collections.unmodifiableList(labels_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.labels_ = labels_;
       } else {
         result.labels_ = labelsBuilder_.build();
       }
-      result.description_ = description_;
-      result.displayName_ = displayName_;
-      onBuilt();
-      return result;
+    }
+
+    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_;
+      }
     }
 
     @java.lang.Override
@@ -638,13 +660,14 @@ 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_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureLabelsIsMutable();
             labels_.addAll(other.labels_);
@@ -657,7 +680,7 @@ public Builder mergeFrom(com.google.api.LogDescriptor other) {
             labelsBuilder_.dispose();
             labelsBuilder_ = null;
             labels_ = other.labels_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             labelsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getLabelsFieldBuilder()
@@ -669,10 +692,12 @@ 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());
@@ -704,7 +729,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -722,13 +747,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:
@@ -820,8 +845,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -840,8 +865,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;
     }
@@ -865,8 +890,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -875,9 +900,9 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureLabelsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         labels_ = new java.util.ArrayList<com.google.api.LabelDescriptor>(labels_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -1112,7 +1137,7 @@ public Builder addAllLabels(
     public Builder clearLabels() {
       if (labelsBuilder_ == null) {
         labels_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         labelsBuilder_.clear();
@@ -1247,7 +1272,7 @@ public java.util.List<com.google.api.LabelDescriptor.Builder> getLabelsBuilderLi
                 com.google.api.LabelDescriptor,
                 com.google.api.LabelDescriptor.Builder,
                 com.google.api.LabelDescriptorOrBuilder>(
-                labels_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                labels_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         labels_ = null;
       }
       return labelsBuilder_;
@@ -1317,8 +1342,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       description_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1335,8 +1360,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;
     }
@@ -1358,8 +1383,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       description_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1428,8 +1453,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1446,8 +1471,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;
     }
@@ -1469,8 +1494,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/Logging.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Logging.java
index e2a0cee591..6fa5599672 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
@@ -238,7 +238,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int MONITORED_RESOURCE_FIELD_NUMBER = 3;
-    private volatile java.lang.Object monitoredResource_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object monitoredResource_ = "";
     /**
      *
      *
@@ -289,6 +291,8 @@ public com.google.protobuf.ByteString getMonitoredResourceBytes() {
     }
 
     public static final int LOGS_FIELD_NUMBER = 1;
+
+    @SuppressWarnings("serial")
     private com.google.protobuf.LazyStringList logs_;
     /**
      *
@@ -577,10 +581,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.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -608,17 +612,29 @@ 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);
-        int from_bitField0_ = bitField0_;
-        result.monitoredResource_ = monitoredResource_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          logs_ = logs_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000001);
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
-        result.logs_ = logs_;
         onBuilt();
         return result;
       }
 
+      private void buildPartialRepeatedFields(com.google.api.Logging.LoggingDestination result) {
+        if (((bitField0_ & 0x00000002) != 0)) {
+          logs_ = logs_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.logs_ = logs_;
+      }
+
+      private void buildPartial0(com.google.api.Logging.LoggingDestination result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.monitoredResource_ = monitoredResource_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -668,12 +684,13 @@ 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_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureLogsIsMutable();
             logs_.addAll(other.logs_);
@@ -716,7 +733,7 @@ public Builder mergeFrom(
               case 26:
                 {
                   monitoredResource_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 26
               default:
@@ -802,8 +819,8 @@ public Builder setMonitoredResource(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         monitoredResource_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -820,8 +837,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;
       }
@@ -843,8 +860,8 @@ public Builder setMonitoredResourceBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         monitoredResource_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -853,9 +870,9 @@ public Builder setMonitoredResourceBytes(com.google.protobuf.ByteString value) {
           com.google.protobuf.LazyStringArrayList.EMPTY;
 
       private void ensureLogsIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
           logs_ = new com.google.protobuf.LazyStringArrayList(logs_);
-          bitField0_ |= 0x00000001;
+          bitField0_ |= 0x00000002;
         }
       }
       /**
@@ -1014,7 +1031,7 @@ public Builder addAllLogs(java.lang.Iterable<java.lang.String> values) {
        */
       public Builder clearLogs() {
         logs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1109,6 +1126,8 @@ public com.google.api.Logging.LoggingDestination getDefaultInstanceForType() {
   }
 
   public static final int PRODUCER_DESTINATIONS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.Logging.LoggingDestination> producerDestinations_;
   /**
    *
@@ -1194,6 +1213,8 @@ public com.google.api.Logging.LoggingDestinationOrBuilder getProducerDestination
   }
 
   public static final int CONSUMER_DESTINATIONS_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.Logging.LoggingDestination> consumerDestinations_;
   /**
    *
@@ -1511,6 +1532,7 @@ 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 {
@@ -1550,7 +1572,15 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.Logging result) {
       if (producerDestinationsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           producerDestinations_ = java.util.Collections.unmodifiableList(producerDestinations_);
@@ -1569,8 +1599,10 @@ public com.google.api.Logging buildPartial() {
       } else {
         result.consumerDestinations_ = consumerDestinationsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.api.Logging result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
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 b75009443a..5abe3a36ef 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
@@ -297,11 +297,13 @@ public com.google.protobuf.Duration getInitialPollDelay() {
      */
     @java.lang.Override
     public com.google.protobuf.DurationOrBuilder getInitialPollDelayOrBuilder() {
-      return getInitialPollDelay();
+      return initialPollDelay_ == null
+          ? com.google.protobuf.Duration.getDefaultInstance()
+          : initialPollDelay_;
     }
 
     public static final int POLL_DELAY_MULTIPLIER_FIELD_NUMBER = 2;
-    private float pollDelayMultiplier_;
+    private float pollDelayMultiplier_ = 0F;
     /**
      *
      *
@@ -368,7 +370,9 @@ public com.google.protobuf.Duration getMaxPollDelay() {
      */
     @java.lang.Override
     public com.google.protobuf.DurationOrBuilder getMaxPollDelayOrBuilder() {
-      return getMaxPollDelay();
+      return maxPollDelay_ == null
+          ? com.google.protobuf.Duration.getDefaultInstance()
+          : maxPollDelay_;
     }
 
     public static final int TOTAL_POLL_TIMEOUT_FIELD_NUMBER = 4;
@@ -419,7 +423,9 @@ public com.google.protobuf.Duration getTotalPollTimeout() {
      */
     @java.lang.Override
     public com.google.protobuf.DurationOrBuilder getTotalPollTimeoutOrBuilder() {
-      return getTotalPollTimeout();
+      return totalPollTimeout_ == null
+          ? com.google.protobuf.Duration.getDefaultInstance()
+          : totalPollTimeout_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -668,24 +674,21 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (initialPollDelayBuilder_ == null) {
-          initialPollDelay_ = null;
-        } else {
-          initialPollDelay_ = null;
+        bitField0_ = 0;
+        initialPollDelay_ = null;
+        if (initialPollDelayBuilder_ != null) {
+          initialPollDelayBuilder_.dispose();
           initialPollDelayBuilder_ = null;
         }
         pollDelayMultiplier_ = 0F;
-
-        if (maxPollDelayBuilder_ == null) {
-          maxPollDelay_ = null;
-        } else {
-          maxPollDelay_ = null;
+        maxPollDelay_ = null;
+        if (maxPollDelayBuilder_ != null) {
+          maxPollDelayBuilder_.dispose();
           maxPollDelayBuilder_ = null;
         }
-        if (totalPollTimeoutBuilder_ == null) {
-          totalPollTimeout_ = null;
-        } else {
-          totalPollTimeout_ = null;
+        totalPollTimeout_ = null;
+        if (totalPollTimeoutBuilder_ != null) {
+          totalPollTimeoutBuilder_.dispose();
           totalPollTimeoutBuilder_ = null;
         }
         return this;
@@ -715,26 +718,36 @@ 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 (initialPollDelayBuilder_ == null) {
-          result.initialPollDelay_ = initialPollDelay_;
-        } else {
-          result.initialPollDelay_ = initialPollDelayBuilder_.build();
-        }
-        result.pollDelayMultiplier_ = pollDelayMultiplier_;
-        if (maxPollDelayBuilder_ == null) {
-          result.maxPollDelay_ = maxPollDelay_;
-        } else {
-          result.maxPollDelay_ = maxPollDelayBuilder_.build();
-        }
-        if (totalPollTimeoutBuilder_ == null) {
-          result.totalPollTimeout_ = totalPollTimeout_;
-        } else {
-          result.totalPollTimeout_ = totalPollTimeoutBuilder_.build();
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(com.google.api.MethodSettings.LongRunning result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.initialPollDelay_ =
+              initialPollDelayBuilder_ == null
+                  ? initialPollDelay_
+                  : initialPollDelayBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.pollDelayMultiplier_ = pollDelayMultiplier_;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.maxPollDelay_ =
+              maxPollDelayBuilder_ == null ? maxPollDelay_ : maxPollDelayBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.totalPollTimeout_ =
+              totalPollTimeoutBuilder_ == null
+                  ? totalPollTimeout_
+                  : totalPollTimeoutBuilder_.build();
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -824,26 +837,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:
@@ -863,6 +876,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private com.google.protobuf.Duration initialPollDelay_;
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.protobuf.Duration,
@@ -882,7 +897,7 @@ public Builder mergeFrom(
        * @return Whether the initialPollDelay field is set.
        */
       public boolean hasInitialPollDelay() {
-        return initialPollDelayBuilder_ != null || initialPollDelay_ != null;
+        return ((bitField0_ & 0x00000001) != 0);
       }
       /**
        *
@@ -921,11 +936,11 @@ public Builder setInitialPollDelay(com.google.protobuf.Duration value) {
             throw new NullPointerException();
           }
           initialPollDelay_ = value;
-          onChanged();
         } else {
           initialPollDelayBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -941,11 +956,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;
       }
       /**
@@ -960,19 +975,18 @@ public Builder setInitialPollDelay(com.google.protobuf.Duration.Builder builderF
        */
       public Builder mergeInitialPollDelay(com.google.protobuf.Duration value) {
         if (initialPollDelayBuilder_ == null) {
-          if (initialPollDelay_ != null) {
-            initialPollDelay_ =
-                com.google.protobuf.Duration.newBuilder(initialPollDelay_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000001) != 0)
+              && initialPollDelay_ != null
+              && initialPollDelay_ != com.google.protobuf.Duration.getDefaultInstance()) {
+            getInitialPollDelayBuilder().mergeFrom(value);
           } else {
             initialPollDelay_ = value;
           }
-          onChanged();
         } else {
           initialPollDelayBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -986,14 +1000,13 @@ public Builder mergeInitialPollDelay(com.google.protobuf.Duration value) {
        * <code>.google.protobuf.Duration initial_poll_delay = 1;</code>
        */
       public Builder clearInitialPollDelay() {
-        if (initialPollDelayBuilder_ == null) {
-          initialPollDelay_ = null;
-          onChanged();
-        } else {
-          initialPollDelay_ = null;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        initialPollDelay_ = null;
+        if (initialPollDelayBuilder_ != null) {
+          initialPollDelayBuilder_.dispose();
           initialPollDelayBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -1007,7 +1020,7 @@ public Builder clearInitialPollDelay() {
        * <code>.google.protobuf.Duration initial_poll_delay = 1;</code>
        */
       public com.google.protobuf.Duration.Builder getInitialPollDelayBuilder() {
-
+        bitField0_ |= 0x00000001;
         onChanged();
         return getInitialPollDelayFieldBuilder().getBuilder();
       }
@@ -1092,6 +1105,7 @@ public float getPollDelayMultiplier() {
       public Builder setPollDelayMultiplier(float value) {
 
         pollDelayMultiplier_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1109,7 +1123,7 @@ public Builder setPollDelayMultiplier(float value) {
        * @return This builder for chaining.
        */
       public Builder clearPollDelayMultiplier() {
-
+        bitField0_ = (bitField0_ & ~0x00000002);
         pollDelayMultiplier_ = 0F;
         onChanged();
         return this;
@@ -1134,7 +1148,7 @@ public Builder clearPollDelayMultiplier() {
        * @return Whether the maxPollDelay field is set.
        */
       public boolean hasMaxPollDelay() {
-        return maxPollDelayBuilder_ != null || maxPollDelay_ != null;
+        return ((bitField0_ & 0x00000004) != 0);
       }
       /**
        *
@@ -1173,11 +1187,11 @@ public Builder setMaxPollDelay(com.google.protobuf.Duration value) {
             throw new NullPointerException();
           }
           maxPollDelay_ = value;
-          onChanged();
         } else {
           maxPollDelayBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -1193,11 +1207,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;
       }
       /**
@@ -1212,19 +1226,18 @@ public Builder setMaxPollDelay(com.google.protobuf.Duration.Builder builderForVa
        */
       public Builder mergeMaxPollDelay(com.google.protobuf.Duration value) {
         if (maxPollDelayBuilder_ == null) {
-          if (maxPollDelay_ != null) {
-            maxPollDelay_ =
-                com.google.protobuf.Duration.newBuilder(maxPollDelay_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000004) != 0)
+              && maxPollDelay_ != null
+              && maxPollDelay_ != com.google.protobuf.Duration.getDefaultInstance()) {
+            getMaxPollDelayBuilder().mergeFrom(value);
           } else {
             maxPollDelay_ = value;
           }
-          onChanged();
         } else {
           maxPollDelayBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -1238,14 +1251,13 @@ public Builder mergeMaxPollDelay(com.google.protobuf.Duration value) {
        * <code>.google.protobuf.Duration max_poll_delay = 3;</code>
        */
       public Builder clearMaxPollDelay() {
-        if (maxPollDelayBuilder_ == null) {
-          maxPollDelay_ = null;
-          onChanged();
-        } else {
-          maxPollDelay_ = null;
+        bitField0_ = (bitField0_ & ~0x00000004);
+        maxPollDelay_ = null;
+        if (maxPollDelayBuilder_ != null) {
+          maxPollDelayBuilder_.dispose();
           maxPollDelayBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -1259,7 +1271,7 @@ public Builder clearMaxPollDelay() {
        * <code>.google.protobuf.Duration max_poll_delay = 3;</code>
        */
       public com.google.protobuf.Duration.Builder getMaxPollDelayBuilder() {
-
+        bitField0_ |= 0x00000004;
         onChanged();
         return getMaxPollDelayFieldBuilder().getBuilder();
       }
@@ -1328,7 +1340,7 @@ public com.google.protobuf.DurationOrBuilder getMaxPollDelayOrBuilder() {
        * @return Whether the totalPollTimeout field is set.
        */
       public boolean hasTotalPollTimeout() {
-        return totalPollTimeoutBuilder_ != null || totalPollTimeout_ != null;
+        return ((bitField0_ & 0x00000008) != 0);
       }
       /**
        *
@@ -1367,11 +1379,11 @@ public Builder setTotalPollTimeout(com.google.protobuf.Duration value) {
             throw new NullPointerException();
           }
           totalPollTimeout_ = value;
-          onChanged();
         } else {
           totalPollTimeoutBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000008;
+        onChanged();
         return this;
       }
       /**
@@ -1387,11 +1399,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;
       }
       /**
@@ -1406,19 +1418,18 @@ public Builder setTotalPollTimeout(com.google.protobuf.Duration.Builder builderF
        */
       public Builder mergeTotalPollTimeout(com.google.protobuf.Duration value) {
         if (totalPollTimeoutBuilder_ == null) {
-          if (totalPollTimeout_ != null) {
-            totalPollTimeout_ =
-                com.google.protobuf.Duration.newBuilder(totalPollTimeout_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000008) != 0)
+              && totalPollTimeout_ != null
+              && totalPollTimeout_ != com.google.protobuf.Duration.getDefaultInstance()) {
+            getTotalPollTimeoutBuilder().mergeFrom(value);
           } else {
             totalPollTimeout_ = value;
           }
-          onChanged();
         } else {
           totalPollTimeoutBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000008;
+        onChanged();
         return this;
       }
       /**
@@ -1432,14 +1443,13 @@ public Builder mergeTotalPollTimeout(com.google.protobuf.Duration value) {
        * <code>.google.protobuf.Duration total_poll_timeout = 4;</code>
        */
       public Builder clearTotalPollTimeout() {
-        if (totalPollTimeoutBuilder_ == null) {
-          totalPollTimeout_ = null;
-          onChanged();
-        } else {
-          totalPollTimeout_ = null;
+        bitField0_ = (bitField0_ & ~0x00000008);
+        totalPollTimeout_ = null;
+        if (totalPollTimeoutBuilder_ != null) {
+          totalPollTimeoutBuilder_.dispose();
           totalPollTimeoutBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -1453,7 +1463,7 @@ public Builder clearTotalPollTimeout() {
        * <code>.google.protobuf.Duration total_poll_timeout = 4;</code>
        */
       public com.google.protobuf.Duration.Builder getTotalPollTimeoutBuilder() {
-
+        bitField0_ |= 0x00000008;
         onChanged();
         return getTotalPollTimeoutFieldBuilder().getBuilder();
       }
@@ -1568,7 +1578,9 @@ public com.google.api.MethodSettings.LongRunning getDefaultInstanceForType() {
   }
 
   public static final int SELECTOR_FIELD_NUMBER = 1;
-  private volatile java.lang.Object selector_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object selector_ = "";
   /**
    *
    *
@@ -1705,7 +1717,9 @@ public com.google.api.MethodSettings.LongRunning getLongRunning() {
    */
   @java.lang.Override
   public com.google.api.MethodSettings.LongRunningOrBuilder getLongRunningOrBuilder() {
-    return getLongRunning();
+    return longRunning_ == null
+        ? com.google.api.MethodSettings.LongRunning.getDefaultInstance()
+        : longRunning_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -1914,12 +1928,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       selector_ = "";
-
-      if (longRunningBuilder_ == null) {
-        longRunning_ = null;
-      } else {
-        longRunning_ = null;
+      longRunning_ = null;
+      if (longRunningBuilder_ != null) {
+        longRunningBuilder_.dispose();
         longRunningBuilder_ = null;
       }
       return this;
@@ -1947,16 +1960,24 @@ 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);
-      result.selector_ = selector_;
-      if (longRunningBuilder_ == null) {
-        result.longRunning_ = longRunning_;
-      } else {
-        result.longRunning_ = longRunningBuilder_.build();
+      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_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.longRunning_ =
+            longRunningBuilder_ == null ? longRunning_ : longRunningBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -2004,6 +2025,7 @@ 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()) {
@@ -2038,13 +2060,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
             default:
@@ -2064,6 +2086,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object selector_ = "";
     /**
      *
@@ -2128,8 +2152,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       selector_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2146,8 +2170,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;
     }
@@ -2169,8 +2193,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       selector_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2207,7 +2231,7 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
      * @return Whether the longRunning field is set.
      */
     public boolean hasLongRunning() {
-      return longRunningBuilder_ != null || longRunning_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -2272,11 +2296,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;
     }
     /**
@@ -2306,11 +2330,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;
     }
     /**
@@ -2338,19 +2362,18 @@ public Builder setLongRunning(
      */
     public Builder mergeLongRunning(com.google.api.MethodSettings.LongRunning value) {
       if (longRunningBuilder_ == null) {
-        if (longRunning_ != null) {
-          longRunning_ =
-              com.google.api.MethodSettings.LongRunning.newBuilder(longRunning_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && longRunning_ != null
+            && longRunning_ != com.google.api.MethodSettings.LongRunning.getDefaultInstance()) {
+          getLongRunningBuilder().mergeFrom(value);
         } else {
           longRunning_ = value;
         }
-        onChanged();
       } else {
         longRunningBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -2377,14 +2400,13 @@ public Builder mergeLongRunning(com.google.api.MethodSettings.LongRunning value)
      * <code>.google.api.MethodSettings.LongRunning long_running = 2;</code>
      */
     public Builder clearLongRunning() {
-      if (longRunningBuilder_ == null) {
-        longRunning_ = null;
-        onChanged();
-      } else {
-        longRunning_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      longRunning_ = null;
+      if (longRunningBuilder_ != null) {
+        longRunningBuilder_.dispose();
         longRunningBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2411,7 +2433,7 @@ public Builder clearLongRunning() {
      * <code>.google.api.MethodSettings.LongRunning long_running = 2;</code>
      */
     public com.google.api.MethodSettings.LongRunning.Builder getLongRunningBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getLongRunningFieldBuilder().getBuilder();
     }
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 c6f0879da0..17651f7db2 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
@@ -77,7 +77,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   }
 
   public static final int TYPE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object type_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object type_ = "";
   /**
    *
    *
@@ -139,6 +141,7 @@ private static final class LabelsDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> labels_;
 
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> internalGetLabels() {
@@ -199,7 +202,10 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
    * <code>map&lt;string, string&gt; labels = 2;</code>
    */
   @java.lang.Override
-  public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getLabelsOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -458,8 +464,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       type_ = "";
-
       internalGetMutableLabels().clear();
       return this;
     }
@@ -486,14 +492,24 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.type_ = type_;
-      result.labels_ = internalGetLabels();
-      result.labels_.makeImmutable();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -541,9 +557,11 @@ 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;
@@ -579,12 +597,13 @@ 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:
@@ -670,8 +689,8 @@ public Builder setType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       type_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -688,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;
     }
@@ -711,8 +730,8 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       type_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -728,14 +747,14 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
         internalGetMutableLabels() {
-      onChanged();
-      ;
       if (labels_ == null) {
         labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
       }
       if (!labels_.isMutable()) {
         labels_ = labels_.copy();
       }
+      bitField0_ |= 0x00000002;
+      onChanged();
       return labels_;
     }
 
@@ -790,8 +809,10 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
      * <code>map&lt;string, string&gt; labels = 2;</code>
      */
     @java.lang.Override
-    public java.lang.String getLabelsOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getLabelsOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -821,6 +842,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
     }
 
     public Builder clearLabels() {
+      bitField0_ = (bitField0_ & ~0x00000002);
       internalGetMutableLabels().getMutableMap().clear();
       return this;
     }
@@ -844,6 +866,7 @@ public Builder removeLabels(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMutableLabels() {
+      bitField0_ |= 0x00000002;
       return internalGetMutableLabels().getMutableMap();
     }
     /**
@@ -863,8 +886,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;
     }
     /**
@@ -879,6 +902,7 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllLabels(java.util.Map<java.lang.String, java.lang.String> 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 0ba01d20fa..1161062194 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
@@ -684,7 +684,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int LAUNCH_STAGE_FIELD_NUMBER = 1;
-    private int launchStage_;
+    private int launchStage_ = 0;
     /**
      *
      *
@@ -719,8 +719,7 @@ public int getLaunchStageValue() {
     @java.lang.Override
     @java.lang.Deprecated
     public com.google.api.LaunchStage getLaunchStage() {
-      @SuppressWarnings("deprecation")
-      com.google.api.LaunchStage result = com.google.api.LaunchStage.valueOf(launchStage_);
+      com.google.api.LaunchStage result = com.google.api.LaunchStage.forNumber(launchStage_);
       return result == null ? com.google.api.LaunchStage.UNRECOGNIZED : result;
     }
 
@@ -778,7 +777,9 @@ public com.google.protobuf.Duration getSamplePeriod() {
      */
     @java.lang.Override
     public com.google.protobuf.DurationOrBuilder getSamplePeriodOrBuilder() {
-      return getSamplePeriod();
+      return samplePeriod_ == null
+          ? com.google.protobuf.Duration.getDefaultInstance()
+          : samplePeriod_;
     }
 
     public static final int INGEST_DELAY_FIELD_NUMBER = 3;
@@ -832,7 +833,9 @@ public com.google.protobuf.Duration getIngestDelay() {
      */
     @java.lang.Override
     public com.google.protobuf.DurationOrBuilder getIngestDelayOrBuilder() {
-      return getIngestDelay();
+      return ingestDelay_ == null
+          ? com.google.protobuf.Duration.getDefaultInstance()
+          : ingestDelay_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -1063,18 +1066,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         launchStage_ = 0;
-
-        if (samplePeriodBuilder_ == null) {
-          samplePeriod_ = null;
-        } else {
-          samplePeriod_ = null;
+        samplePeriod_ = null;
+        if (samplePeriodBuilder_ != null) {
+          samplePeriodBuilder_.dispose();
           samplePeriodBuilder_ = null;
         }
-        if (ingestDelayBuilder_ == null) {
-          ingestDelay_ = null;
-        } else {
-          ingestDelay_ = null;
+        ingestDelay_ = null;
+        if (ingestDelayBuilder_ != null) {
+          ingestDelayBuilder_.dispose();
           ingestDelayBuilder_ = null;
         }
         return this;
@@ -1104,21 +1105,28 @@ 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);
-        result.launchStage_ = launchStage_;
-        if (samplePeriodBuilder_ == null) {
-          result.samplePeriod_ = samplePeriod_;
-        } else {
-          result.samplePeriod_ = samplePeriodBuilder_.build();
-        }
-        if (ingestDelayBuilder_ == null) {
-          result.ingestDelay_ = ingestDelay_;
-        } else {
-          result.ingestDelay_ = ingestDelayBuilder_.build();
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(com.google.api.MetricDescriptor.MetricDescriptorMetadata result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.launchStage_ = launchStage_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.samplePeriod_ =
+              samplePeriodBuilder_ == null ? samplePeriod_ : samplePeriodBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.ingestDelay_ =
+              ingestDelayBuilder_ == null ? ingestDelay_ : ingestDelayBuilder_.build();
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1205,19 +1213,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
               default:
@@ -1237,6 +1245,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private int launchStage_ = 0;
       /**
        *
@@ -1272,8 +1282,8 @@ public int getLaunchStageValue() {
        */
       @java.lang.Deprecated
       public Builder setLaunchStageValue(int value) {
-
         launchStage_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1293,8 +1303,7 @@ public Builder setLaunchStageValue(int value) {
       @java.lang.Override
       @java.lang.Deprecated
       public com.google.api.LaunchStage getLaunchStage() {
-        @SuppressWarnings("deprecation")
-        com.google.api.LaunchStage result = com.google.api.LaunchStage.valueOf(launchStage_);
+        com.google.api.LaunchStage result = com.google.api.LaunchStage.forNumber(launchStage_);
         return result == null ? com.google.api.LaunchStage.UNRECOGNIZED : result;
       }
       /**
@@ -1316,7 +1325,7 @@ public Builder setLaunchStage(com.google.api.LaunchStage value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
+        bitField0_ |= 0x00000001;
         launchStage_ = value.getNumber();
         onChanged();
         return this;
@@ -1336,7 +1345,7 @@ public Builder setLaunchStage(com.google.api.LaunchStage value) {
        */
       @java.lang.Deprecated
       public Builder clearLaunchStage() {
-
+        bitField0_ = (bitField0_ & ~0x00000001);
         launchStage_ = 0;
         onChanged();
         return this;
@@ -1363,7 +1372,7 @@ public Builder clearLaunchStage() {
        * @return Whether the samplePeriod field is set.
        */
       public boolean hasSamplePeriod() {
-        return samplePeriodBuilder_ != null || samplePeriod_ != null;
+        return ((bitField0_ & 0x00000002) != 0);
       }
       /**
        *
@@ -1406,11 +1415,11 @@ public Builder setSamplePeriod(com.google.protobuf.Duration value) {
             throw new NullPointerException();
           }
           samplePeriod_ = value;
-          onChanged();
         } else {
           samplePeriodBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -1428,11 +1437,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;
       }
       /**
@@ -1449,19 +1458,18 @@ public Builder setSamplePeriod(com.google.protobuf.Duration.Builder builderForVa
        */
       public Builder mergeSamplePeriod(com.google.protobuf.Duration value) {
         if (samplePeriodBuilder_ == null) {
-          if (samplePeriod_ != null) {
-            samplePeriod_ =
-                com.google.protobuf.Duration.newBuilder(samplePeriod_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000002) != 0)
+              && samplePeriod_ != null
+              && samplePeriod_ != com.google.protobuf.Duration.getDefaultInstance()) {
+            getSamplePeriodBuilder().mergeFrom(value);
           } else {
             samplePeriod_ = value;
           }
-          onChanged();
         } else {
           samplePeriodBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -1477,14 +1485,13 @@ public Builder mergeSamplePeriod(com.google.protobuf.Duration value) {
        * <code>.google.protobuf.Duration sample_period = 2;</code>
        */
       public Builder clearSamplePeriod() {
-        if (samplePeriodBuilder_ == null) {
-          samplePeriod_ = null;
-          onChanged();
-        } else {
-          samplePeriod_ = null;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        samplePeriod_ = null;
+        if (samplePeriodBuilder_ != null) {
+          samplePeriodBuilder_.dispose();
           samplePeriodBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -1500,7 +1507,7 @@ public Builder clearSamplePeriod() {
        * <code>.google.protobuf.Duration sample_period = 2;</code>
        */
       public com.google.protobuf.Duration.Builder getSamplePeriodBuilder() {
-
+        bitField0_ |= 0x00000002;
         onChanged();
         return getSamplePeriodFieldBuilder().getBuilder();
       }
@@ -1574,7 +1581,7 @@ public com.google.protobuf.DurationOrBuilder getSamplePeriodOrBuilder() {
        * @return Whether the ingestDelay field is set.
        */
       public boolean hasIngestDelay() {
-        return ingestDelayBuilder_ != null || ingestDelay_ != null;
+        return ((bitField0_ & 0x00000004) != 0);
       }
       /**
        *
@@ -1615,11 +1622,11 @@ public Builder setIngestDelay(com.google.protobuf.Duration value) {
             throw new NullPointerException();
           }
           ingestDelay_ = value;
-          onChanged();
         } else {
           ingestDelayBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -1636,11 +1643,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;
       }
       /**
@@ -1656,19 +1663,18 @@ public Builder setIngestDelay(com.google.protobuf.Duration.Builder builderForVal
        */
       public Builder mergeIngestDelay(com.google.protobuf.Duration value) {
         if (ingestDelayBuilder_ == null) {
-          if (ingestDelay_ != null) {
-            ingestDelay_ =
-                com.google.protobuf.Duration.newBuilder(ingestDelay_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000004) != 0)
+              && ingestDelay_ != null
+              && ingestDelay_ != com.google.protobuf.Duration.getDefaultInstance()) {
+            getIngestDelayBuilder().mergeFrom(value);
           } else {
             ingestDelay_ = value;
           }
-          onChanged();
         } else {
           ingestDelayBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -1683,14 +1689,13 @@ public Builder mergeIngestDelay(com.google.protobuf.Duration value) {
        * <code>.google.protobuf.Duration ingest_delay = 3;</code>
        */
       public Builder clearIngestDelay() {
-        if (ingestDelayBuilder_ == null) {
-          ingestDelay_ = null;
-          onChanged();
-        } else {
-          ingestDelay_ = null;
+        bitField0_ = (bitField0_ & ~0x00000004);
+        ingestDelay_ = null;
+        if (ingestDelayBuilder_ != null) {
+          ingestDelayBuilder_.dispose();
           ingestDelayBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -1705,7 +1710,7 @@ public Builder clearIngestDelay() {
        * <code>.google.protobuf.Duration ingest_delay = 3;</code>
        */
       public com.google.protobuf.Duration.Builder getIngestDelayBuilder() {
-
+        bitField0_ |= 0x00000004;
         onChanged();
         return getIngestDelayFieldBuilder().getBuilder();
       }
@@ -1822,7 +1827,9 @@ public com.google.api.MetricDescriptor.MetricDescriptorMetadata getDefaultInstan
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -1871,7 +1878,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int TYPE_FIELD_NUMBER = 8;
-  private volatile java.lang.Object type_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object type_ = "";
   /**
    *
    *
@@ -1932,6 +1941,8 @@ public com.google.protobuf.ByteString getTypeBytes() {
   }
 
   public static final int LABELS_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.LabelDescriptor> labels_;
   /**
    *
@@ -2026,7 +2037,7 @@ public com.google.api.LabelDescriptorOrBuilder getLabelsOrBuilder(int index) {
   }
 
   public static final int METRIC_KIND_FIELD_NUMBER = 3;
-  private int metricKind_;
+  private int metricKind_ = 0;
   /**
    *
    *
@@ -2057,14 +2068,13 @@ 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.valueOf(metricKind_);
+        com.google.api.MetricDescriptor.MetricKind.forNumber(metricKind_);
     return result == null ? com.google.api.MetricDescriptor.MetricKind.UNRECOGNIZED : result;
   }
 
   public static final int VALUE_TYPE_FIELD_NUMBER = 4;
-  private int valueType_;
+  private int valueType_ = 0;
   /**
    *
    *
@@ -2095,14 +2105,15 @@ 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.valueOf(valueType_);
+        com.google.api.MetricDescriptor.ValueType.forNumber(valueType_);
     return result == null ? com.google.api.MetricDescriptor.ValueType.UNRECOGNIZED : result;
   }
 
   public static final int UNIT_FIELD_NUMBER = 5;
-  private volatile java.lang.Object unit_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object unit_ = "";
   /**
    *
    *
@@ -2315,7 +2326,9 @@ public com.google.protobuf.ByteString getUnitBytes() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 6;
-  private volatile java.lang.Object description_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object description_ = "";
   /**
    *
    *
@@ -2364,7 +2377,9 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 7;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
@@ -2463,11 +2478,13 @@ public com.google.api.MetricDescriptor.MetricDescriptorMetadata getMetadata() {
    */
   @java.lang.Override
   public com.google.api.MetricDescriptor.MetricDescriptorMetadataOrBuilder getMetadataOrBuilder() {
-    return getMetadata();
+    return metadata_ == null
+        ? com.google.api.MetricDescriptor.MetricDescriptorMetadata.getDefaultInstance()
+        : metadata_;
   }
 
   public static final int LAUNCH_STAGE_FIELD_NUMBER = 12;
-  private int launchStage_;
+  private int launchStage_ = 0;
   /**
    *
    *
@@ -2496,12 +2513,13 @@ public int getLaunchStageValue() {
    */
   @java.lang.Override
   public com.google.api.LaunchStage getLaunchStage() {
-    @SuppressWarnings("deprecation")
-    com.google.api.LaunchStage result = com.google.api.LaunchStage.valueOf(launchStage_);
+    com.google.api.LaunchStage result = com.google.api.LaunchStage.forNumber(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.LazyStringList monitoredResourceTypes_;
   /**
    *
@@ -2883,37 +2901,29 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @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_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000004);
       metricKind_ = 0;
-
       valueType_ = 0;
-
       unit_ = "";
-
       description_ = "";
-
       displayName_ = "";
-
-      if (metadataBuilder_ == null) {
-        metadata_ = null;
-      } else {
-        metadata_ = null;
+      metadata_ = null;
+      if (metadataBuilder_ != null) {
+        metadataBuilder_.dispose();
         metadataBuilder_ = null;
       }
       launchStage_ = 0;
-
       monitoredResourceTypes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000400);
       return this;
     }
 
@@ -2939,36 +2949,60 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.name_ = name_;
-      result.type_ = type_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.MetricDescriptor result) {
       if (labelsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000004) != 0)) {
           labels_ = java.util.Collections.unmodifiableList(labels_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.labels_ = labels_;
       } else {
         result.labels_ = labelsBuilder_.build();
       }
-      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();
-      }
-      result.launchStage_ = launchStage_;
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (((bitField0_ & 0x00000400) != 0)) {
         monitoredResourceTypes_ = monitoredResourceTypes_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000400);
       }
       result.monitoredResourceTypes_ = monitoredResourceTypes_;
-      onBuilt();
-      return result;
+    }
+
+    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_;
+      }
+      if (((from_bitField0_ & 0x00000100) != 0)) {
+        result.metadata_ = metadataBuilder_ == null ? metadata_ : metadataBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000200) != 0)) {
+        result.launchStage_ = launchStage_;
+      }
     }
 
     @java.lang.Override
@@ -3018,17 +3052,19 @@ 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_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureLabelsIsMutable();
             labels_.addAll(other.labels_);
@@ -3041,7 +3077,7 @@ public Builder mergeFrom(com.google.api.MetricDescriptor other) {
             labelsBuilder_.dispose();
             labelsBuilder_ = null;
             labels_ = other.labels_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
             labelsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getLabelsFieldBuilder()
@@ -3059,14 +3095,17 @@ 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()) {
@@ -3078,7 +3117,7 @@ public Builder mergeFrom(com.google.api.MetricDescriptor other) {
       if (!other.monitoredResourceTypes_.isEmpty()) {
         if (monitoredResourceTypes_.isEmpty()) {
           monitoredResourceTypes_ = other.monitoredResourceTypes_;
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000400);
         } else {
           ensureMonitoredResourceTypesIsMutable();
           monitoredResourceTypes_.addAll(other.monitoredResourceTypes_);
@@ -3114,7 +3153,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -3132,49 +3171,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:
@@ -3264,8 +3303,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -3281,8 +3320,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;
     }
@@ -3303,8 +3342,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -3388,8 +3427,8 @@ public Builder setType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       type_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -3411,8 +3450,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;
     }
@@ -3439,8 +3478,8 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       type_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -3449,9 +3488,9 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureLabelsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         labels_ = new java.util.ArrayList<com.google.api.LabelDescriptor>(labels_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000004;
       }
     }
 
@@ -3719,7 +3758,7 @@ public Builder addAllLabels(
     public Builder clearLabels() {
       if (labelsBuilder_ == null) {
         labels_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
       } else {
         labelsBuilder_.clear();
@@ -3875,7 +3914,7 @@ public java.util.List<com.google.api.LabelDescriptor.Builder> getLabelsBuilderLi
                 com.google.api.LabelDescriptor,
                 com.google.api.LabelDescriptor.Builder,
                 com.google.api.LabelDescriptorOrBuilder>(
-                labels_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                labels_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
         labels_ = null;
       }
       return labelsBuilder_;
@@ -3912,8 +3951,8 @@ public int getMetricKindValue() {
      * @return This builder for chaining.
      */
     public Builder setMetricKindValue(int value) {
-
       metricKind_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -3931,9 +3970,8 @@ 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.valueOf(metricKind_);
+          com.google.api.MetricDescriptor.MetricKind.forNumber(metricKind_);
       return result == null ? com.google.api.MetricDescriptor.MetricKind.UNRECOGNIZED : result;
     }
     /**
@@ -3953,7 +3991,7 @@ public Builder setMetricKind(com.google.api.MetricDescriptor.MetricKind value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000008;
       metricKind_ = value.getNumber();
       onChanged();
       return this;
@@ -3971,7 +4009,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;
@@ -4008,8 +4046,8 @@ public int getValueTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setValueTypeValue(int value) {
-
       valueType_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -4027,9 +4065,8 @@ 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.valueOf(valueType_);
+          com.google.api.MetricDescriptor.ValueType.forNumber(valueType_);
       return result == null ? com.google.api.MetricDescriptor.ValueType.UNRECOGNIZED : result;
     }
     /**
@@ -4049,7 +4086,7 @@ public Builder setValueType(com.google.api.MetricDescriptor.ValueType value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000010;
       valueType_ = value.getNumber();
       onChanged();
       return this;
@@ -4067,7 +4104,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;
@@ -4380,8 +4417,8 @@ public Builder setUnit(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       unit_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -4479,8 +4516,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;
     }
@@ -4583,8 +4620,8 @@ public Builder setUnitBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       unit_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -4650,8 +4687,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       description_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -4667,8 +4704,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;
     }
@@ -4689,8 +4726,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       description_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -4765,8 +4802,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -4785,8 +4822,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;
     }
@@ -4810,8 +4847,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       displayName_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -4834,7 +4871,7 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
      * @return Whether the metadata field is set.
      */
     public boolean hasMetadata() {
-      return metadataBuilder_ != null || metadata_ != null;
+      return ((bitField0_ & 0x00000100) != 0);
     }
     /**
      *
@@ -4871,11 +4908,11 @@ public Builder setMetadata(com.google.api.MetricDescriptor.MetricDescriptorMetad
           throw new NullPointerException();
         }
         metadata_ = value;
-        onChanged();
       } else {
         metadataBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -4891,11 +4928,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;
     }
     /**
@@ -4909,19 +4946,19 @@ public Builder setMetadata(
      */
     public Builder mergeMetadata(com.google.api.MetricDescriptor.MetricDescriptorMetadata value) {
       if (metadataBuilder_ == null) {
-        if (metadata_ != null) {
-          metadata_ =
-              com.google.api.MetricDescriptor.MetricDescriptorMetadata.newBuilder(metadata_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000100) != 0)
+            && metadata_ != null
+            && metadata_
+                != com.google.api.MetricDescriptor.MetricDescriptorMetadata.getDefaultInstance()) {
+          getMetadataBuilder().mergeFrom(value);
         } else {
           metadata_ = value;
         }
-        onChanged();
       } else {
         metadataBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -4934,14 +4971,13 @@ public Builder mergeMetadata(com.google.api.MetricDescriptor.MetricDescriptorMet
      * <code>.google.api.MetricDescriptor.MetricDescriptorMetadata metadata = 10;</code>
      */
     public Builder clearMetadata() {
-      if (metadataBuilder_ == null) {
-        metadata_ = null;
-        onChanged();
-      } else {
-        metadata_ = null;
+      bitField0_ = (bitField0_ & ~0x00000100);
+      metadata_ = null;
+      if (metadataBuilder_ != null) {
+        metadataBuilder_.dispose();
         metadataBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -4954,7 +4990,7 @@ public Builder clearMetadata() {
      * <code>.google.api.MetricDescriptor.MetricDescriptorMetadata metadata = 10;</code>
      */
     public com.google.api.MetricDescriptor.MetricDescriptorMetadata.Builder getMetadataBuilder() {
-
+      bitField0_ |= 0x00000100;
       onChanged();
       return getMetadataFieldBuilder().getBuilder();
     }
@@ -5032,8 +5068,8 @@ public int getLaunchStageValue() {
      * @return This builder for chaining.
      */
     public Builder setLaunchStageValue(int value) {
-
       launchStage_ = value;
+      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -5050,8 +5086,7 @@ public Builder setLaunchStageValue(int value) {
      */
     @java.lang.Override
     public com.google.api.LaunchStage getLaunchStage() {
-      @SuppressWarnings("deprecation")
-      com.google.api.LaunchStage result = com.google.api.LaunchStage.valueOf(launchStage_);
+      com.google.api.LaunchStage result = com.google.api.LaunchStage.forNumber(launchStage_);
       return result == null ? com.google.api.LaunchStage.UNRECOGNIZED : result;
     }
     /**
@@ -5070,7 +5105,7 @@ public Builder setLaunchStage(com.google.api.LaunchStage value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000200;
       launchStage_ = value.getNumber();
       onChanged();
       return this;
@@ -5087,7 +5122,7 @@ public Builder setLaunchStage(com.google.api.LaunchStage value) {
      * @return This builder for chaining.
      */
     public Builder clearLaunchStage() {
-
+      bitField0_ = (bitField0_ & ~0x00000200);
       launchStage_ = 0;
       onChanged();
       return this;
@@ -5097,10 +5132,10 @@ public Builder clearLaunchStage() {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureMonitoredResourceTypesIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000400) != 0)) {
         monitoredResourceTypes_ =
             new com.google.protobuf.LazyStringArrayList(monitoredResourceTypes_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000400;
       }
     }
     /**
@@ -5267,7 +5302,7 @@ public Builder addAllMonitoredResourceTypes(java.lang.Iterable<java.lang.String>
      */
     public Builder clearMonitoredResourceTypes() {
       monitoredResourceTypes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000400);
       onChanged();
       return this;
     }
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 db9fe4b181..74d4aa6b4f 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
@@ -96,7 +96,6 @@ public interface MetricOrBuilder
    *
    * <code>map&lt;string, string&gt; labels = 2;</code>
    */
-
   /* 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/MetricRule.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricRule.java
index a5812838aa..5e616d4976 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
@@ -77,7 +77,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   }
 
   public static final int SELECTOR_FIELD_NUMBER = 1;
-  private volatile java.lang.Object selector_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object selector_ = "";
   /**
    *
    *
@@ -140,6 +142,7 @@ private static final class MetricCostsDefaultEntryHolder {
             0L);
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.Long> metricCosts_;
 
   private com.google.protobuf.MapField<java.lang.String, java.lang.Long> internalGetMetricCosts() {
@@ -471,8 +474,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       selector_ = "";
-
       internalGetMutableMetricCosts().clear();
       return this;
     }
@@ -499,14 +502,24 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.selector_ = selector_;
-      result.metricCosts_ = internalGetMetricCosts();
-      result.metricCosts_.makeImmutable();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -554,9 +567,11 @@ 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;
@@ -586,7 +601,7 @@ public Builder mergeFrom(
             case 10:
               {
                 selector_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -598,6 +613,7 @@ public Builder mergeFrom(
                 internalGetMutableMetricCosts()
                     .getMutableMap()
                     .put(metricCosts__.getKey(), metricCosts__.getValue());
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -683,8 +699,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       selector_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -701,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;
     }
@@ -724,8 +740,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       selector_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -743,8 +759,6 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.Long>
         internalGetMutableMetricCosts() {
-      onChanged();
-      ;
       if (metricCosts_ == null) {
         metricCosts_ =
             com.google.protobuf.MapField.newMapField(MetricCostsDefaultEntryHolder.defaultEntry);
@@ -752,6 +766,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
       if (!metricCosts_.isMutable()) {
         metricCosts_ = metricCosts_.copy();
       }
+      bitField0_ |= 0x00000002;
+      onChanged();
       return metricCosts_;
     }
 
@@ -848,6 +864,7 @@ public long getMetricCostsOrThrow(java.lang.String key) {
     }
 
     public Builder clearMetricCosts() {
+      bitField0_ = (bitField0_ & ~0x00000002);
       internalGetMutableMetricCosts().getMutableMap().clear();
       return this;
     }
@@ -874,6 +891,7 @@ public Builder removeMetricCosts(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.Long> getMutableMetricCosts() {
+      bitField0_ |= 0x00000002;
       return internalGetMutableMetricCosts().getMutableMap();
     }
     /**
@@ -895,6 +913,7 @@ public Builder putMetricCosts(java.lang.String key, long value) {
       }
 
       internalGetMutableMetricCosts().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000002;
       return this;
     }
     /**
@@ -912,6 +931,7 @@ public Builder putMetricCosts(java.lang.String key, long value) {
      */
     public Builder putAllMetricCosts(java.util.Map<java.lang.String, java.lang.Long> 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/MonitoredResource.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResource.java
index 321c7bc7e0..affc3f4a45 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
@@ -90,7 +90,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   }
 
   public static final int TYPE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object type_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object type_ = "";
   /**
    *
    *
@@ -159,6 +161,7 @@ private static final class LabelsDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> labels_;
 
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> internalGetLabels() {
@@ -222,7 +225,10 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
    * <code>map&lt;string, string&gt; labels = 2;</code>
    */
   @java.lang.Override
-  public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getLabelsOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -496,8 +502,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       type_ = "";
-
       internalGetMutableLabels().clear();
       return this;
     }
@@ -525,14 +531,24 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.type_ = type_;
-      result.labels_ = internalGetLabels();
-      result.labels_.makeImmutable();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -580,9 +596,11 @@ 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;
@@ -612,7 +630,7 @@ public Builder mergeFrom(
             case 10:
               {
                 type_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -624,6 +642,7 @@ public Builder mergeFrom(
                 internalGetMutableLabels()
                     .getMutableMap()
                     .put(labels__.getKey(), labels__.getValue());
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -718,8 +737,8 @@ public Builder setType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       type_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -739,8 +758,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;
     }
@@ -765,8 +784,8 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       type_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -782,14 +801,14 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
         internalGetMutableLabels() {
-      onChanged();
-      ;
       if (labels_ == null) {
         labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
       }
       if (!labels_.isMutable()) {
         labels_ = labels_.copy();
       }
+      bitField0_ |= 0x00000002;
+      onChanged();
       return labels_;
     }
 
@@ -847,8 +866,10 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
      * <code>map&lt;string, string&gt; labels = 2;</code>
      */
     @java.lang.Override
-    public java.lang.String getLabelsOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getLabelsOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -879,6 +900,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
     }
 
     public Builder clearLabels() {
+      bitField0_ = (bitField0_ & ~0x00000002);
       internalGetMutableLabels().getMutableMap().clear();
       return this;
     }
@@ -903,6 +925,7 @@ public Builder removeLabels(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMutableLabels() {
+      bitField0_ |= 0x00000002;
       return internalGetMutableLabels().getMutableMap();
     }
     /**
@@ -923,8 +946,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;
     }
     /**
@@ -940,6 +963,7 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllLabels(java.util.Map<java.lang.String, java.lang.String> 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 955dbd88b6..df72f2845f 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
@@ -80,7 +80,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 5;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -139,7 +141,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int TYPE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object type_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object type_ = "";
   /**
    *
    *
@@ -198,7 +202,9 @@ public com.google.protobuf.ByteString getTypeBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
@@ -253,7 +259,9 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 3;
-  private volatile java.lang.Object description_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object description_ = "";
   /**
    *
    *
@@ -304,6 +312,8 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
   }
 
   public static final int LABELS_FIELD_NUMBER = 4;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.LabelDescriptor> labels_;
   /**
    *
@@ -383,7 +393,7 @@ public com.google.api.LabelDescriptorOrBuilder getLabelsOrBuilder(int index) {
   }
 
   public static final int LAUNCH_STAGE_FIELD_NUMBER = 7;
-  private int launchStage_;
+  private int launchStage_ = 0;
   /**
    *
    *
@@ -412,8 +422,7 @@ public int getLaunchStageValue() {
    */
   @java.lang.Override
   public com.google.api.LaunchStage getLaunchStage() {
-    @SuppressWarnings("deprecation")
-    com.google.api.LaunchStage result = com.google.api.LaunchStage.valueOf(launchStage_);
+    com.google.api.LaunchStage result = com.google.api.LaunchStage.forNumber(launchStage_);
     return result == null ? com.google.api.LaunchStage.UNRECOGNIZED : result;
   }
 
@@ -668,23 +677,19 @@ 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_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000010);
       launchStage_ = 0;
-
       return this;
     }
 
@@ -712,23 +717,43 @@ public com.google.api.MonitoredResourceDescriptor build() {
     public com.google.api.MonitoredResourceDescriptor buildPartial() {
       com.google.api.MonitoredResourceDescriptor result =
           new com.google.api.MonitoredResourceDescriptor(this);
-      int from_bitField0_ = bitField0_;
-      result.name_ = name_;
-      result.type_ = type_;
-      result.displayName_ = displayName_;
-      result.description_ = description_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.MonitoredResourceDescriptor result) {
       if (labelsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000010) != 0)) {
           labels_ = java.util.Collections.unmodifiableList(labels_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000010);
         }
         result.labels_ = labels_;
       } else {
         result.labels_ = labelsBuilder_.build();
       }
-      result.launchStage_ = launchStage_;
-      onBuilt();
-      return result;
+    }
+
+    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_;
+      }
     }
 
     @java.lang.Override
@@ -778,25 +803,29 @@ 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_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
             ensureLabelsIsMutable();
             labels_.addAll(other.labels_);
@@ -809,7 +838,7 @@ public Builder mergeFrom(com.google.api.MonitoredResourceDescriptor other) {
             labelsBuilder_.dispose();
             labelsBuilder_ = null;
             labels_ = other.labels_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
             labelsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getLabelsFieldBuilder()
@@ -851,19 +880,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:
@@ -881,13 +910,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:
@@ -985,8 +1014,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1007,8 +1036,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;
     }
@@ -1034,8 +1063,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1116,8 +1145,8 @@ public Builder setType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       type_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1138,8 +1167,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;
     }
@@ -1165,8 +1194,8 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       type_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1241,8 +1270,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1261,8 +1290,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;
     }
@@ -1286,8 +1315,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       displayName_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1356,8 +1385,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       description_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1374,8 +1403,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;
     }
@@ -1397,8 +1426,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       description_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1407,9 +1436,9 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureLabelsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         labels_ = new java.util.ArrayList<com.google.api.LabelDescriptor>(labels_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000010;
       }
     }
 
@@ -1644,7 +1673,7 @@ public Builder addAllLabels(
     public Builder clearLabels() {
       if (labelsBuilder_ == null) {
         labels_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
       } else {
         labelsBuilder_.clear();
@@ -1779,7 +1808,7 @@ public java.util.List<com.google.api.LabelDescriptor.Builder> getLabelsBuilderLi
                 com.google.api.LabelDescriptor,
                 com.google.api.LabelDescriptor.Builder,
                 com.google.api.LabelDescriptorOrBuilder>(
-                labels_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                labels_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
         labels_ = null;
       }
       return labelsBuilder_;
@@ -1814,8 +1843,8 @@ public int getLaunchStageValue() {
      * @return This builder for chaining.
      */
     public Builder setLaunchStageValue(int value) {
-
       launchStage_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1832,8 +1861,7 @@ public Builder setLaunchStageValue(int value) {
      */
     @java.lang.Override
     public com.google.api.LaunchStage getLaunchStage() {
-      @SuppressWarnings("deprecation")
-      com.google.api.LaunchStage result = com.google.api.LaunchStage.valueOf(launchStage_);
+      com.google.api.LaunchStage result = com.google.api.LaunchStage.forNumber(launchStage_);
       return result == null ? com.google.api.LaunchStage.UNRECOGNIZED : result;
     }
     /**
@@ -1852,7 +1880,7 @@ public Builder setLaunchStage(com.google.api.LaunchStage value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000020;
       launchStage_ = value.getNumber();
       onChanged();
       return this;
@@ -1869,7 +1897,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/MonitoredResourceMetadata.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadata.java
index f13cde4071..c30f8e75f7 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
@@ -148,7 +148,7 @@ public com.google.protobuf.Struct getSystemLabels() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getSystemLabelsOrBuilder() {
-    return getSystemLabels();
+    return systemLabels_ == null ? com.google.protobuf.Struct.getDefaultInstance() : systemLabels_;
   }
 
   public static final int USER_LABELS_FIELD_NUMBER = 2;
@@ -164,6 +164,7 @@ private static final class UserLabelsDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> userLabels_;
 
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> internalGetUserLabels() {
@@ -221,8 +222,10 @@ public java.util.Map<java.lang.String, java.lang.String> getUserLabelsMap() {
    * <code>map&lt;string, string&gt; user_labels = 2;</code>
    */
   @java.lang.Override
-  public java.lang.String getUserLabelsOrDefault(
-      java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getUserLabelsOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -493,10 +496,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (systemLabelsBuilder_ == null) {
-        systemLabels_ = null;
-      } else {
-        systemLabels_ = null;
+      bitField0_ = 0;
+      systemLabels_ = null;
+      if (systemLabelsBuilder_ != null) {
+        systemLabelsBuilder_.dispose();
         systemLabelsBuilder_ = null;
       }
       internalGetMutableUserLabels().clear();
@@ -527,18 +530,25 @@ public com.google.api.MonitoredResourceMetadata build() {
     public com.google.api.MonitoredResourceMetadata buildPartial() {
       com.google.api.MonitoredResourceMetadata result =
           new com.google.api.MonitoredResourceMetadata(this);
-      int from_bitField0_ = bitField0_;
-      if (systemLabelsBuilder_ == null) {
-        result.systemLabels_ = systemLabels_;
-      } else {
-        result.systemLabels_ = systemLabelsBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.userLabels_ = internalGetUserLabels();
-      result.userLabels_.makeImmutable();
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.api.MonitoredResourceMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.systemLabels_ =
+            systemLabelsBuilder_ == null ? systemLabels_ : systemLabelsBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.userLabels_ = internalGetUserLabels();
+        result.userLabels_.makeImmutable();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -588,6 +598,7 @@ public Builder mergeFrom(com.google.api.MonitoredResourceMetadata other) {
         mergeSystemLabels(other.getSystemLabels());
       }
       internalGetMutableUserLabels().mergeFrom(other.internalGetUserLabels());
+      bitField0_ |= 0x00000002;
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -617,7 +628,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getSystemLabelsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -629,6 +640,7 @@ public Builder mergeFrom(
                 internalGetMutableUserLabels()
                     .getMutableMap()
                     .put(userLabels__.getKey(), userLabels__.getValue());
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -676,7 +688,7 @@ public Builder mergeFrom(
      * @return Whether the systemLabels field is set.
      */
     public boolean hasSystemLabels() {
-      return systemLabelsBuilder_ != null || systemLabels_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -729,11 +741,11 @@ public Builder setSystemLabels(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         systemLabels_ = value;
-        onChanged();
       } else {
         systemLabelsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -756,11 +768,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;
     }
     /**
@@ -782,17 +794,18 @@ public Builder setSystemLabels(com.google.protobuf.Struct.Builder builderForValu
      */
     public Builder mergeSystemLabels(com.google.protobuf.Struct value) {
       if (systemLabelsBuilder_ == null) {
-        if (systemLabels_ != null) {
-          systemLabels_ =
-              com.google.protobuf.Struct.newBuilder(systemLabels_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && systemLabels_ != null
+            && systemLabels_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getSystemLabelsBuilder().mergeFrom(value);
         } else {
           systemLabels_ = value;
         }
-        onChanged();
       } else {
         systemLabelsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -813,14 +826,13 @@ public Builder mergeSystemLabels(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct system_labels = 1;</code>
      */
     public Builder clearSystemLabels() {
-      if (systemLabelsBuilder_ == null) {
-        systemLabels_ = null;
-        onChanged();
-      } else {
-        systemLabels_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      systemLabels_ = null;
+      if (systemLabelsBuilder_ != null) {
+        systemLabelsBuilder_.dispose();
         systemLabelsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -841,7 +853,7 @@ public Builder clearSystemLabels() {
      * <code>.google.protobuf.Struct system_labels = 1;</code>
      */
     public com.google.protobuf.Struct.Builder getSystemLabelsBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getSystemLabelsFieldBuilder().getBuilder();
     }
@@ -918,8 +930,6 @@ public com.google.protobuf.StructOrBuilder getSystemLabelsOrBuilder() {
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
         internalGetMutableUserLabels() {
-      onChanged();
-      ;
       if (userLabels_ == null) {
         userLabels_ =
             com.google.protobuf.MapField.newMapField(UserLabelsDefaultEntryHolder.defaultEntry);
@@ -927,6 +937,8 @@ public com.google.protobuf.StructOrBuilder getSystemLabelsOrBuilder() {
       if (!userLabels_.isMutable()) {
         userLabels_ = userLabels_.copy();
       }
+      bitField0_ |= 0x00000002;
+      onChanged();
       return userLabels_;
     }
 
@@ -978,8 +990,10 @@ public java.util.Map<java.lang.String, java.lang.String> getUserLabelsMap() {
      * <code>map&lt;string, string&gt; user_labels = 2;</code>
      */
     @java.lang.Override
-    public java.lang.String getUserLabelsOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getUserLabelsOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1008,6 +1022,7 @@ public java.lang.String getUserLabelsOrThrow(java.lang.String key) {
     }
 
     public Builder clearUserLabels() {
+      bitField0_ = (bitField0_ & ~0x00000002);
       internalGetMutableUserLabels().getMutableMap().clear();
       return this;
     }
@@ -1030,6 +1045,7 @@ public Builder removeUserLabels(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMutableUserLabels() {
+      bitField0_ |= 0x00000002;
       return internalGetMutableUserLabels().getMutableMap();
     }
     /**
@@ -1048,8 +1064,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;
     }
     /**
@@ -1063,6 +1079,7 @@ public Builder putUserLabels(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllUserLabels(java.util.Map<java.lang.String, java.lang.String> 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 ac5ffa2220..452635ab52 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadataOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadataOrBuilder.java
@@ -124,7 +124,6 @@ public interface MonitoredResourceMetadataOrBuilder
    *
    * <code>map&lt;string, string&gt; user_labels = 2;</code>
    */
-
   /* 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 b07b2575bc..e2ef700cb6 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
@@ -106,7 +106,6 @@ public interface MonitoredResourceOrBuilder
    *
    * <code>map&lt;string, string&gt; labels = 2;</code>
    */
-
   /* 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/Monitoring.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Monitoring.java
index 357a98286c..4d1b9f9516 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
@@ -253,7 +253,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int MONITORED_RESOURCE_FIELD_NUMBER = 1;
-    private volatile java.lang.Object monitoredResource_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object monitoredResource_ = "";
     /**
      *
      *
@@ -304,6 +306,8 @@ public com.google.protobuf.ByteString getMonitoredResourceBytes() {
     }
 
     public static final int METRICS_FIELD_NUMBER = 2;
+
+    @SuppressWarnings("serial")
     private com.google.protobuf.LazyStringList metrics_;
     /**
      *
@@ -584,10 +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.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -615,17 +619,30 @@ 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);
-        int from_bitField0_ = bitField0_;
-        result.monitoredResource_ = monitoredResource_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          metrics_ = metrics_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000001);
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
-        result.metrics_ = metrics_;
         onBuilt();
         return result;
       }
 
+      private void buildPartialRepeatedFields(
+          com.google.api.Monitoring.MonitoringDestination result) {
+        if (((bitField0_ & 0x00000002) != 0)) {
+          metrics_ = metrics_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.metrics_ = metrics_;
+      }
+
+      private void buildPartial0(com.google.api.Monitoring.MonitoringDestination result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.monitoredResource_ = monitoredResource_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -676,12 +693,13 @@ 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_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureMetricsIsMutable();
             metrics_.addAll(other.metrics_);
@@ -717,7 +735,7 @@ public Builder mergeFrom(
               case 10:
                 {
                   monitoredResource_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
@@ -810,8 +828,8 @@ public Builder setMonitoredResource(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         monitoredResource_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -828,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;
       }
@@ -851,8 +869,8 @@ public Builder setMonitoredResourceBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         monitoredResource_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -861,9 +879,9 @@ public Builder setMonitoredResourceBytes(com.google.protobuf.ByteString value) {
           com.google.protobuf.LazyStringArrayList.EMPTY;
 
       private void ensureMetricsIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
           metrics_ = new com.google.protobuf.LazyStringArrayList(metrics_);
-          bitField0_ |= 0x00000001;
+          bitField0_ |= 0x00000002;
         }
       }
       /**
@@ -1006,7 +1024,7 @@ public Builder addAllMetrics(java.lang.Iterable<java.lang.String> values) {
        */
       public Builder clearMetrics() {
         metrics_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1099,6 +1117,8 @@ public com.google.api.Monitoring.MonitoringDestination getDefaultInstanceForType
   }
 
   public static final int PRODUCER_DESTINATIONS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.Monitoring.MonitoringDestination> producerDestinations_;
   /**
    *
@@ -1195,6 +1215,8 @@ public com.google.api.Monitoring.MonitoringDestinationOrBuilder getProducerDesti
   }
 
   public static final int CONSUMER_DESTINATIONS_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.Monitoring.MonitoringDestination> consumerDestinations_;
   /**
    *
@@ -1546,6 +1568,7 @@ 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 {
@@ -1585,7 +1608,15 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.Monitoring result) {
       if (producerDestinationsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           producerDestinations_ = java.util.Collections.unmodifiableList(producerDestinations_);
@@ -1604,8 +1635,10 @@ public com.google.api.Monitoring buildPartial() {
       } else {
         result.consumerDestinations_ = consumerDestinationsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.api.Monitoring result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
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 b98fe56ece..2bef3c0bf9 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/NodeSettings.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/NodeSettings.java
@@ -105,7 +105,7 @@ public com.google.api.CommonLanguageSettings getCommon() {
    */
   @java.lang.Override
   public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
-    return getCommon();
+    return common_ == null ? com.google.api.CommonLanguageSettings.getDefaultInstance() : common_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -305,10 +305,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (commonBuilder_ == null) {
-        common_ = null;
-      } else {
-        common_ = null;
+      bitField0_ = 0;
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
       return this;
@@ -336,15 +336,20 @@ 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 (commonBuilder_ == null) {
-        result.common_ = common_;
-      } else {
-        result.common_ = commonBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.api.NodeSettings result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -422,7 +427,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -442,6 +447,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.api.CommonLanguageSettings common_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.api.CommonLanguageSettings,
@@ -460,7 +467,7 @@ public Builder mergeFrom(
      * @return Whether the common field is set.
      */
     public boolean hasCommon() {
-      return commonBuilder_ != null || common_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -497,11 +504,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
           throw new NullPointerException();
         }
         common_ = value;
-        onChanged();
       } else {
         commonBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -516,11 +523,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;
     }
     /**
@@ -534,19 +541,18 @@ public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderFo
      */
     public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
       if (commonBuilder_ == null) {
-        if (common_ != null) {
-          common_ =
-              com.google.api.CommonLanguageSettings.newBuilder(common_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && common_ != null
+            && common_ != com.google.api.CommonLanguageSettings.getDefaultInstance()) {
+          getCommonBuilder().mergeFrom(value);
         } else {
           common_ = value;
         }
-        onChanged();
       } else {
         commonBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -559,14 +565,13 @@ public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
      * <code>.google.api.CommonLanguageSettings common = 1;</code>
      */
     public Builder clearCommon() {
-      if (commonBuilder_ == null) {
-        common_ = null;
-        onChanged();
-      } else {
-        common_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -579,7 +584,7 @@ public Builder clearCommon() {
      * <code>.google.api.CommonLanguageSettings common = 1;</code>
      */
     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/OAuthRequirements.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/OAuthRequirements.java
index 2991b22c7b..be32817aa1 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/OAuthRequirements.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/OAuthRequirements.java
@@ -78,7 +78,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CANONICAL_SCOPES_FIELD_NUMBER = 1;
-  private volatile java.lang.Object canonicalScopes_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object canonicalScopes_ = "";
   /**
    *
    *
@@ -341,8 +343,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       canonicalScopes_ = "";
-
       return this;
     }
 
@@ -368,11 +370,20 @@ 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);
-      result.canonicalScopes_ = canonicalScopes_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -420,6 +431,7 @@ 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());
@@ -451,7 +463,7 @@ public Builder mergeFrom(
             case 10:
               {
                 canonicalScopes_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -471,6 +483,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object canonicalScopes_ = "";
     /**
      *
@@ -544,8 +558,8 @@ public Builder setCanonicalScopes(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       canonicalScopes_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -565,8 +579,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;
     }
@@ -591,8 +605,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/Page.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Page.java
index 5be5ccd592..4b65ff2c48 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Page.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Page.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -143,7 +145,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int CONTENT_FIELD_NUMBER = 2;
-  private volatile java.lang.Object content_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object content_ = "";
   /**
    *
    *
@@ -196,6 +200,8 @@ public com.google.protobuf.ByteString getContentBytes() {
   }
 
   public static final int SUBPAGES_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.Page> subpages_;
   /**
    *
@@ -481,17 +487,16 @@ 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_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000004);
       return this;
     }
 
@@ -517,20 +522,34 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.name_ = name_;
-      result.content_ = content_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.Page result) {
       if (subpagesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000004) != 0)) {
           subpages_ = java.util.Collections.unmodifiableList(subpages_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.subpages_ = subpages_;
       } else {
         result.subpages_ = subpagesBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    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_;
+      }
     }
 
     @java.lang.Override
@@ -580,17 +599,19 @@ 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_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureSubpagesIsMutable();
             subpages_.addAll(other.subpages_);
@@ -603,7 +624,7 @@ public Builder mergeFrom(com.google.api.Page other) {
             subpagesBuilder_.dispose();
             subpagesBuilder_ = null;
             subpages_ = other.subpages_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
             subpagesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getSubpagesFieldBuilder()
@@ -642,13 +663,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:
@@ -782,8 +803,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -812,8 +833,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;
     }
@@ -847,8 +868,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -920,8 +941,8 @@ public Builder setContent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       content_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -939,8 +960,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;
     }
@@ -963,8 +984,8 @@ public Builder setContentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       content_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -972,9 +993,9 @@ public Builder setContentBytes(com.google.protobuf.ByteString value) {
     private java.util.List<com.google.api.Page> subpages_ = java.util.Collections.emptyList();
 
     private void ensureSubpagesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         subpages_ = new java.util.ArrayList<com.google.api.Page>(subpages_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000004;
       }
     }
 
@@ -1195,7 +1216,7 @@ public Builder addAllSubpages(java.lang.Iterable<? extends com.google.api.Page>
     public Builder clearSubpages() {
       if (subpagesBuilder_ == null) {
         subpages_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
       } else {
         subpagesBuilder_.clear();
@@ -1316,7 +1337,7 @@ public java.util.List<com.google.api.Page.Builder> getSubpagesBuilderList() {
         subpagesBuilder_ =
             new com.google.protobuf.RepeatedFieldBuilderV3<
                 com.google.api.Page, com.google.api.Page.Builder, com.google.api.PageOrBuilder>(
-                subpages_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                subpages_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
         subpages_ = null;
       }
       return subpagesBuilder_;
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 ef4161110c..1dea477ba1 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PhpSettings.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PhpSettings.java
@@ -105,7 +105,7 @@ public com.google.api.CommonLanguageSettings getCommon() {
    */
   @java.lang.Override
   public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
-    return getCommon();
+    return common_ == null ? com.google.api.CommonLanguageSettings.getDefaultInstance() : common_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -305,10 +305,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (commonBuilder_ == null) {
-        common_ = null;
-      } else {
-        common_ = null;
+      bitField0_ = 0;
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
       return this;
@@ -336,15 +336,20 @@ 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 (commonBuilder_ == null) {
-        result.common_ = common_;
-      } else {
-        result.common_ = commonBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.api.PhpSettings result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -422,7 +427,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -442,6 +447,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.api.CommonLanguageSettings common_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.api.CommonLanguageSettings,
@@ -460,7 +467,7 @@ public Builder mergeFrom(
      * @return Whether the common field is set.
      */
     public boolean hasCommon() {
-      return commonBuilder_ != null || common_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -497,11 +504,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
           throw new NullPointerException();
         }
         common_ = value;
-        onChanged();
       } else {
         commonBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -516,11 +523,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;
     }
     /**
@@ -534,19 +541,18 @@ public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderFo
      */
     public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
       if (commonBuilder_ == null) {
-        if (common_ != null) {
-          common_ =
-              com.google.api.CommonLanguageSettings.newBuilder(common_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && common_ != null
+            && common_ != com.google.api.CommonLanguageSettings.getDefaultInstance()) {
+          getCommonBuilder().mergeFrom(value);
         } else {
           common_ = value;
         }
-        onChanged();
       } else {
         commonBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -559,14 +565,13 @@ public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
      * <code>.google.api.CommonLanguageSettings common = 1;</code>
      */
     public Builder clearCommon() {
-      if (commonBuilder_ == null) {
-        common_ = null;
-        onChanged();
-      } else {
-        common_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -579,7 +584,7 @@ public Builder clearCommon() {
      * <code>.google.api.CommonLanguageSettings common = 1;</code>
      */
     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/ProjectProperties.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ProjectProperties.java
index e15bf00c85..977f71fc47 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ProjectProperties.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ProjectProperties.java
@@ -79,6 +79,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PROPERTIES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.Property> properties_;
   /**
    *
@@ -355,6 +357,7 @@ 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 {
@@ -387,7 +390,15 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.ProjectProperties result) {
       if (propertiesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           properties_ = java.util.Collections.unmodifiableList(properties_);
@@ -397,8 +408,10 @@ public com.google.api.ProjectProperties buildPartial() {
       } else {
         result.properties_ = propertiesBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.api.ProjectProperties result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
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 1f6a05e0c0..9a84766c27 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Property.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Property.java
@@ -275,7 +275,9 @@ private PropertyType(int value) {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -324,7 +326,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int TYPE_FIELD_NUMBER = 2;
-  private int type_;
+  private int type_ = 0;
   /**
    *
    *
@@ -353,14 +355,15 @@ 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.valueOf(type_);
+        com.google.api.Property.PropertyType.forNumber(type_);
     return result == null ? com.google.api.Property.PropertyType.UNRECOGNIZED : result;
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 3;
-  private volatile java.lang.Object description_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object description_ = "";
   /**
    *
    *
@@ -625,12 +628,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       type_ = 0;
-
       description_ = "";
-
       return this;
     }
 
@@ -656,13 +657,26 @@ 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);
-      result.name_ = name_;
-      result.type_ = type_;
-      result.description_ = description_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -710,6 +724,7 @@ 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) {
@@ -717,6 +732,7 @@ public Builder mergeFrom(com.google.api.Property other) {
       }
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -748,19 +764,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:
@@ -780,6 +796,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -841,8 +859,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -858,8 +876,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 +898,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -915,8 +933,8 @@ public int getTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setTypeValue(int value) {
-
       type_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -933,9 +951,8 @@ 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.valueOf(type_);
+          com.google.api.Property.PropertyType.forNumber(type_);
       return result == null ? com.google.api.Property.PropertyType.UNRECOGNIZED : result;
     }
     /**
@@ -954,7 +971,7 @@ public Builder setType(com.google.api.Property.PropertyType value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       type_ = value.getNumber();
       onChanged();
       return this;
@@ -971,7 +988,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;
@@ -1038,8 +1055,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       description_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1055,8 +1072,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;
     }
@@ -1077,8 +1094,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/Publishing.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Publishing.java
index 99562de3c4..f2fa37b476 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
@@ -75,6 +75,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int METHOD_SETTINGS_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.MethodSettings> methodSettings_;
   /**
    *
@@ -149,7 +151,9 @@ public com.google.api.MethodSettingsOrBuilder getMethodSettingsOrBuilder(int ind
   }
 
   public static final int NEW_ISSUE_URI_FIELD_NUMBER = 101;
-  private volatile java.lang.Object newIssueUri_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object newIssueUri_ = "";
   /**
    *
    *
@@ -200,7 +204,9 @@ public com.google.protobuf.ByteString getNewIssueUriBytes() {
   }
 
   public static final int DOCUMENTATION_URI_FIELD_NUMBER = 102;
-  private volatile java.lang.Object documentationUri_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object documentationUri_ = "";
   /**
    *
    *
@@ -251,7 +257,9 @@ public com.google.protobuf.ByteString getDocumentationUriBytes() {
   }
 
   public static final int API_SHORT_NAME_FIELD_NUMBER = 103;
-  private volatile java.lang.Object apiShortName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object apiShortName_ = "";
   /**
    *
    *
@@ -304,7 +312,9 @@ public com.google.protobuf.ByteString getApiShortNameBytes() {
   }
 
   public static final int GITHUB_LABEL_FIELD_NUMBER = 104;
-  private volatile java.lang.Object githubLabel_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object githubLabel_ = "";
   /**
    *
    *
@@ -353,6 +363,8 @@ public com.google.protobuf.ByteString getGithubLabelBytes() {
   }
 
   public static final int CODEOWNER_GITHUB_TEAMS_FIELD_NUMBER = 105;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList codeownerGithubTeams_;
   /**
    *
@@ -418,7 +430,9 @@ public com.google.protobuf.ByteString getCodeownerGithubTeamsBytes(int index) {
   }
 
   public static final int DOC_TAG_PREFIX_FIELD_NUMBER = 106;
-  private volatile java.lang.Object docTagPrefix_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object docTagPrefix_ = "";
   /**
    *
    *
@@ -469,7 +483,7 @@ public com.google.protobuf.ByteString getDocTagPrefixBytes() {
   }
 
   public static final int ORGANIZATION_FIELD_NUMBER = 107;
-  private int organization_;
+  private int organization_ = 0;
   /**
    *
    *
@@ -498,13 +512,14 @@ public int getOrganizationValue() {
    */
   @java.lang.Override
   public com.google.api.ClientLibraryOrganization getOrganization() {
-    @SuppressWarnings("deprecation")
     com.google.api.ClientLibraryOrganization result =
-        com.google.api.ClientLibraryOrganization.valueOf(organization_);
+        com.google.api.ClientLibraryOrganization.forNumber(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<com.google.api.ClientLibrarySettings> librarySettings_;
   /**
    *
@@ -866,6 +881,7 @@ 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 {
@@ -874,26 +890,20 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       newIssueUri_ = "";
-
       documentationUri_ = "";
-
       apiShortName_ = "";
-
       githubLabel_ = "";
-
       codeownerGithubTeams_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000020);
       docTagPrefix_ = "";
-
       organization_ = 0;
-
       if (librarySettingsBuilder_ == null) {
         librarySettings_ = java.util.Collections.emptyList();
       } else {
         librarySettings_ = null;
         librarySettingsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000004);
+      bitField0_ = (bitField0_ & ~0x00000100);
       return this;
     }
 
@@ -919,7 +929,15 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.Publishing result) {
       if (methodSettingsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           methodSettings_ = java.util.Collections.unmodifiableList(methodSettings_);
@@ -929,28 +947,42 @@ public com.google.api.Publishing buildPartial() {
       } else {
         result.methodSettings_ = methodSettingsBuilder_.build();
       }
-      result.newIssueUri_ = newIssueUri_;
-      result.documentationUri_ = documentationUri_;
-      result.apiShortName_ = apiShortName_;
-      result.githubLabel_ = githubLabel_;
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (((bitField0_ & 0x00000020) != 0)) {
         codeownerGithubTeams_ = codeownerGithubTeams_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000020);
       }
       result.codeownerGithubTeams_ = codeownerGithubTeams_;
-      result.docTagPrefix_ = docTagPrefix_;
-      result.organization_ = organization_;
       if (librarySettingsBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)) {
+        if (((bitField0_ & 0x00000100) != 0)) {
           librarySettings_ = java.util.Collections.unmodifiableList(librarySettings_);
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000100);
         }
         result.librarySettings_ = librarySettings_;
       } else {
         result.librarySettings_ = librarySettingsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    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_ & 0x00000040) != 0)) {
+        result.docTagPrefix_ = docTagPrefix_;
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.organization_ = organization_;
+      }
     }
 
     @java.lang.Override
@@ -1027,24 +1059,28 @@ 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_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000020);
         } else {
           ensureCodeownerGithubTeamsIsMutable();
           codeownerGithubTeams_.addAll(other.codeownerGithubTeams_);
@@ -1053,6 +1089,7 @@ public Builder mergeFrom(com.google.api.Publishing other) {
       }
       if (!other.getDocTagPrefix().isEmpty()) {
         docTagPrefix_ = other.docTagPrefix_;
+        bitField0_ |= 0x00000040;
         onChanged();
       }
       if (other.organization_ != 0) {
@@ -1062,7 +1099,7 @@ public Builder mergeFrom(com.google.api.Publishing other) {
         if (!other.librarySettings_.isEmpty()) {
           if (librarySettings_.isEmpty()) {
             librarySettings_ = other.librarySettings_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000100);
           } else {
             ensureLibrarySettingsIsMutable();
             librarySettings_.addAll(other.librarySettings_);
@@ -1075,7 +1112,7 @@ public Builder mergeFrom(com.google.api.Publishing other) {
             librarySettingsBuilder_.dispose();
             librarySettingsBuilder_ = null;
             librarySettings_ = other.librarySettings_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000100);
             librarySettingsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getLibrarySettingsFieldBuilder()
@@ -1126,25 +1163,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:
@@ -1157,13 +1194,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:
@@ -1631,8 +1668,8 @@ public Builder setNewIssueUri(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       newIssueUri_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1649,8 +1686,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;
     }
@@ -1672,8 +1709,8 @@ public Builder setNewIssueUriBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       newIssueUri_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1742,8 +1779,8 @@ public Builder setDocumentationUri(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       documentationUri_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1760,8 +1797,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;
     }
@@ -1783,8 +1820,8 @@ public Builder setDocumentationUriBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       documentationUri_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1856,8 +1893,8 @@ public Builder setApiShortName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       apiShortName_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1875,8 +1912,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;
     }
@@ -1899,8 +1936,8 @@ public Builder setApiShortNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       apiShortName_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1966,8 +2003,8 @@ public Builder setGithubLabel(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       githubLabel_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1983,8 +2020,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;
     }
@@ -2005,8 +2042,8 @@ public Builder setGithubLabelBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       githubLabel_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2015,9 +2052,9 @@ public Builder setGithubLabelBytes(com.google.protobuf.ByteString value) {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureCodeownerGithubTeamsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000020) != 0)) {
         codeownerGithubTeams_ = new com.google.protobuf.LazyStringArrayList(codeownerGithubTeams_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000020;
       }
     }
     /**
@@ -2160,7 +2197,7 @@ public Builder addAllCodeownerGithubTeams(java.lang.Iterable<java.lang.String> v
      */
     public Builder clearCodeownerGithubTeams() {
       codeownerGithubTeams_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -2252,8 +2289,8 @@ public Builder setDocTagPrefix(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       docTagPrefix_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2270,8 +2307,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;
     }
@@ -2293,8 +2330,8 @@ public Builder setDocTagPrefixBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       docTagPrefix_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2328,8 +2365,8 @@ public int getOrganizationValue() {
      * @return This builder for chaining.
      */
     public Builder setOrganizationValue(int value) {
-
       organization_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2346,9 +2383,8 @@ 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.valueOf(organization_);
+          com.google.api.ClientLibraryOrganization.forNumber(organization_);
       return result == null ? com.google.api.ClientLibraryOrganization.UNRECOGNIZED : result;
     }
     /**
@@ -2367,7 +2403,7 @@ public Builder setOrganization(com.google.api.ClientLibraryOrganization value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000080;
       organization_ = value.getNumber();
       onChanged();
       return this;
@@ -2384,7 +2420,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;
@@ -2394,10 +2430,10 @@ public Builder clearOrganization() {
         java.util.Collections.emptyList();
 
     private void ensureLibrarySettingsIsMutable() {
-      if (!((bitField0_ & 0x00000004) != 0)) {
+      if (!((bitField0_ & 0x00000100) != 0)) {
         librarySettings_ =
             new java.util.ArrayList<com.google.api.ClientLibrarySettings>(librarySettings_);
-        bitField0_ |= 0x00000004;
+        bitField0_ |= 0x00000100;
       }
     }
 
@@ -2635,7 +2671,7 @@ public Builder addAllLibrarySettings(
     public Builder clearLibrarySettings() {
       if (librarySettingsBuilder_ == null) {
         librarySettings_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000100);
         onChanged();
       } else {
         librarySettingsBuilder_.clear();
@@ -2772,7 +2808,7 @@ public com.google.api.ClientLibrarySettings.Builder addLibrarySettingsBuilder(in
                 com.google.api.ClientLibrarySettings.Builder,
                 com.google.api.ClientLibrarySettingsOrBuilder>(
                 librarySettings_,
-                ((bitField0_ & 0x00000004) != 0),
+                ((bitField0_ & 0x00000100) != 0),
                 getParentForChildren(),
                 isClean());
         librarySettings_ = null;
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 02e3cc045f..fc9d3c3bda 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PythonSettings.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PythonSettings.java
@@ -105,7 +105,7 @@ public com.google.api.CommonLanguageSettings getCommon() {
    */
   @java.lang.Override
   public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
-    return getCommon();
+    return common_ == null ? com.google.api.CommonLanguageSettings.getDefaultInstance() : common_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -305,10 +305,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (commonBuilder_ == null) {
-        common_ = null;
-      } else {
-        common_ = null;
+      bitField0_ = 0;
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
       return this;
@@ -336,15 +336,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 (commonBuilder_ == null) {
-        result.common_ = common_;
-      } else {
-        result.common_ = commonBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.api.PythonSettings result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -422,7 +427,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -442,6 +447,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.api.CommonLanguageSettings common_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.api.CommonLanguageSettings,
@@ -460,7 +467,7 @@ public Builder mergeFrom(
      * @return Whether the common field is set.
      */
     public boolean hasCommon() {
-      return commonBuilder_ != null || common_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -497,11 +504,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
           throw new NullPointerException();
         }
         common_ = value;
-        onChanged();
       } else {
         commonBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -516,11 +523,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;
     }
     /**
@@ -534,19 +541,18 @@ public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderFo
      */
     public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
       if (commonBuilder_ == null) {
-        if (common_ != null) {
-          common_ =
-              com.google.api.CommonLanguageSettings.newBuilder(common_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && common_ != null
+            && common_ != com.google.api.CommonLanguageSettings.getDefaultInstance()) {
+          getCommonBuilder().mergeFrom(value);
         } else {
           common_ = value;
         }
-        onChanged();
       } else {
         commonBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -559,14 +565,13 @@ public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
      * <code>.google.api.CommonLanguageSettings common = 1;</code>
      */
     public Builder clearCommon() {
-      if (commonBuilder_ == null) {
-        common_ = null;
-        onChanged();
-      } else {
-        common_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -579,7 +584,7 @@ public Builder clearCommon() {
      * <code>.google.api.CommonLanguageSettings common = 1;</code>
      */
     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/Quota.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Quota.java
index f77fb009c4..7371ab54f7 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Quota.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Quota.java
@@ -105,6 +105,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int LIMITS_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.QuotaLimit> limits_;
   /**
    *
@@ -173,6 +175,8 @@ public com.google.api.QuotaLimitOrBuilder getLimitsOrBuilder(int index) {
   }
 
   public static final int METRIC_RULES_FIELD_NUMBER = 4;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.MetricRule> metricRules_;
   /**
    *
@@ -490,6 +494,7 @@ 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 {
@@ -529,7 +534,15 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.Quota result) {
       if (limitsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           limits_ = java.util.Collections.unmodifiableList(limits_);
@@ -548,8 +561,10 @@ public com.google.api.Quota buildPartial() {
       } else {
         result.metricRules_ = metricRulesBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.api.Quota result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @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 50ebf11627..add2026b1f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaLimit.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaLimit.java
@@ -83,7 +83,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   }
 
   public static final int NAME_FIELD_NUMBER = 6;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -138,7 +140,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 2;
-  private volatile java.lang.Object description_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object description_ = "";
   /**
    *
    *
@@ -191,7 +195,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
   }
 
   public static final int DEFAULT_LIMIT_FIELD_NUMBER = 3;
-  private long defaultLimit_;
+  private long defaultLimit_ = 0L;
   /**
    *
    *
@@ -216,7 +220,7 @@ public long getDefaultLimit() {
   }
 
   public static final int MAX_LIMIT_FIELD_NUMBER = 4;
-  private long maxLimit_;
+  private long maxLimit_ = 0L;
   /**
    *
    *
@@ -240,7 +244,7 @@ public long getMaxLimit() {
   }
 
   public static final int FREE_TIER_FIELD_NUMBER = 7;
-  private long freeTier_;
+  private long freeTier_ = 0L;
   /**
    *
    *
@@ -264,7 +268,9 @@ public long getFreeTier() {
   }
 
   public static final int DURATION_FIELD_NUMBER = 5;
-  private volatile java.lang.Object duration_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object duration_ = "";
   /**
    *
    *
@@ -315,7 +321,9 @@ public com.google.protobuf.ByteString getDurationBytes() {
   }
 
   public static final int METRIC_FIELD_NUMBER = 8;
-  private volatile java.lang.Object metric_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object metric_ = "";
   /**
    *
    *
@@ -368,7 +376,9 @@ public com.google.protobuf.ByteString getMetricBytes() {
   }
 
   public static final int UNIT_FIELD_NUMBER = 9;
-  private volatile java.lang.Object unit_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object unit_ = "";
   /**
    *
    *
@@ -440,6 +450,7 @@ private static final class ValuesDefaultEntryHolder {
             0L);
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.Long> values_;
 
   private com.google.protobuf.MapField<java.lang.String, java.lang.Long> internalGetValues() {
@@ -534,7 +545,9 @@ public long getValuesOrThrow(java.lang.String key) {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 12;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
@@ -891,25 +904,17 @@ 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;
     }
 
@@ -935,22 +940,48 @@ 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);
-      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_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -998,10 +1029,12 @@ 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) {
@@ -1015,19 +1048,24 @@ 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());
@@ -1059,49 +1097,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:
@@ -1113,12 +1151,13 @@ 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:
@@ -1210,8 +1249,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1230,8 +1269,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;
     }
@@ -1255,8 +1294,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1328,8 +1367,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       description_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1347,8 +1386,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;
     }
@@ -1371,8 +1410,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       description_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1422,6 +1461,7 @@ public long getDefaultLimit() {
     public Builder setDefaultLimit(long value) {
 
       defaultLimit_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1444,7 +1484,7 @@ public Builder setDefaultLimit(long value) {
      * @return This builder for chaining.
      */
     public Builder clearDefaultLimit() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       defaultLimit_ = 0L;
       onChanged();
       return this;
@@ -1493,6 +1533,7 @@ public long getMaxLimit() {
     public Builder setMaxLimit(long value) {
 
       maxLimit_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1514,7 +1555,7 @@ public Builder setMaxLimit(long value) {
      * @return This builder for chaining.
      */
     public Builder clearMaxLimit() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       maxLimit_ = 0L;
       onChanged();
       return this;
@@ -1563,6 +1604,7 @@ public long getFreeTier() {
     public Builder setFreeTier(long value) {
 
       freeTier_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1584,7 +1626,7 @@ public Builder setFreeTier(long value) {
      * @return This builder for chaining.
      */
     public Builder clearFreeTier() {
-
+      bitField0_ = (bitField0_ & ~0x00000010);
       freeTier_ = 0L;
       onChanged();
       return this;
@@ -1654,8 +1696,8 @@ public Builder setDuration(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       duration_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1672,8 +1714,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;
     }
@@ -1695,8 +1737,8 @@ public Builder setDurationBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       duration_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1768,8 +1810,8 @@ public Builder setMetric(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       metric_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -1787,8 +1829,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;
     }
@@ -1811,8 +1853,8 @@ public Builder setMetricBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       metric_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -1896,8 +1938,8 @@ public Builder setUnit(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       unit_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -1919,8 +1961,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;
     }
@@ -1947,8 +1989,8 @@ public Builder setUnitBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       unit_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -1964,14 +2006,14 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.Long> internalG
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.Long>
         internalGetMutableValues() {
-      onChanged();
-      ;
       if (values_ == null) {
         values_ = com.google.protobuf.MapField.newMapField(ValuesDefaultEntryHolder.defaultEntry);
       }
       if (!values_.isMutable()) {
         values_ = values_.copy();
       }
+      bitField0_ |= 0x00000100;
+      onChanged();
       return values_;
     }
 
@@ -2060,6 +2102,7 @@ public long getValuesOrThrow(java.lang.String key) {
     }
 
     public Builder clearValues() {
+      bitField0_ = (bitField0_ & ~0x00000100);
       internalGetMutableValues().getMutableMap().clear();
       return this;
     }
@@ -2084,6 +2127,7 @@ public Builder removeValues(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.Long> getMutableValues() {
+      bitField0_ |= 0x00000100;
       return internalGetMutableValues().getMutableMap();
     }
     /**
@@ -2103,6 +2147,7 @@ public Builder putValues(java.lang.String key, long value) {
       }
 
       internalGetMutableValues().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000100;
       return this;
     }
     /**
@@ -2118,6 +2163,7 @@ public Builder putValues(java.lang.String key, long value) {
      */
     public Builder putAllValues(java.util.Map<java.lang.String, java.lang.Long> values) {
       internalGetMutableValues().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000100;
       return this;
     }
 
@@ -2191,8 +2237,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -2211,8 +2257,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;
     }
@@ -2236,8 +2282,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/ResourceDescriptor.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceDescriptor.java
index 8c1653283f..253ab1fda8 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceDescriptor.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceDescriptor.java
@@ -418,7 +418,9 @@ private Style(int value) {
   }
 
   public static final int TYPE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object type_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object type_ = "";
   /**
    *
    *
@@ -481,6 +483,8 @@ public com.google.protobuf.ByteString getTypeBytes() {
   }
 
   public static final int PATTERN_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList pattern_;
   /**
    *
@@ -594,7 +598,9 @@ public com.google.protobuf.ByteString getPatternBytes(int index) {
   }
 
   public static final int NAME_FIELD_FIELD_NUMBER = 3;
-  private volatile java.lang.Object nameField_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nameField_ = "";
   /**
    *
    *
@@ -645,7 +651,7 @@ public com.google.protobuf.ByteString getNameFieldBytes() {
   }
 
   public static final int HISTORY_FIELD_NUMBER = 4;
-  private int history_;
+  private int history_ = 0;
   /**
    *
    *
@@ -698,14 +704,15 @@ 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.valueOf(history_);
+        com.google.api.ResourceDescriptor.History.forNumber(history_);
     return result == null ? com.google.api.ResourceDescriptor.History.UNRECOGNIZED : result;
   }
 
   public static final int PLURAL_FIELD_NUMBER = 5;
-  private volatile java.lang.Object plural_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object plural_ = "";
   /**
    *
    *
@@ -766,7 +773,9 @@ public com.google.protobuf.ByteString getPluralBytes() {
   }
 
   public static final int SINGULAR_FIELD_NUMBER = 6;
-  private volatile java.lang.Object singular_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object singular_ = "";
   /**
    *
    *
@@ -819,16 +828,18 @@ public com.google.protobuf.ByteString getSingularBytes() {
   }
 
   public static final int STYLE_FIELD_NUMBER = 10;
+
+  @SuppressWarnings("serial")
   private java.util.List<java.lang.Integer> 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.valueOf(from);
+                  com.google.api.ResourceDescriptor.Style.forNumber(from);
               return result == null ? com.google.api.ResourceDescriptor.Style.UNRECOGNIZED : result;
             }
           };
@@ -1230,20 +1241,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       type_ = "";
-
       pattern_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       nameField_ = "";
-
       history_ = 0;
-
       plural_ = "";
-
       singular_ = "";
-
       style_ = java.util.Collections.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000040);
       return this;
     }
 
@@ -1269,24 +1276,44 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.type_ = type_;
-      if (((bitField0_ & 0x00000001) != 0)) {
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.ResourceDescriptor result) {
+      if (((bitField0_ & 0x00000002) != 0)) {
         pattern_ = pattern_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
       }
       result.pattern_ = pattern_;
-      result.nameField_ = nameField_;
-      result.history_ = history_;
-      result.plural_ = plural_;
-      result.singular_ = singular_;
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (((bitField0_ & 0x00000040) != 0)) {
         style_ = java.util.Collections.unmodifiableList(style_);
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000040);
       }
       result.style_ = style_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.api.ResourceDescriptor result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.type_ = type_;
+      }
+      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_;
+      }
     }
 
     @java.lang.Override
@@ -1336,12 +1363,13 @@ 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_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensurePatternIsMutable();
           pattern_.addAll(other.pattern_);
@@ -1350,6 +1378,7 @@ public Builder mergeFrom(com.google.api.ResourceDescriptor other) {
       }
       if (!other.getNameField().isEmpty()) {
         nameField_ = other.nameField_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.history_ != 0) {
@@ -1357,16 +1386,18 @@ 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_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000040);
         } else {
           ensureStyleIsMutable();
           style_.addAll(other.style_);
@@ -1402,7 +1433,7 @@ public Builder mergeFrom(
             case 10:
               {
                 type_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -1415,25 +1446,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:
@@ -1556,8 +1587,8 @@ public Builder setType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       type_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1580,8 +1611,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;
     }
@@ -1609,8 +1640,8 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       type_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1619,9 +1650,9 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensurePatternIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         pattern_ = new com.google.protobuf.LazyStringArrayList(pattern_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
     /**
@@ -1860,7 +1891,7 @@ public Builder addAllPattern(java.lang.Iterable<java.lang.String> values) {
      */
     public Builder clearPattern() {
       pattern_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1964,8 +1995,8 @@ public Builder setNameField(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nameField_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1982,8 +2013,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;
     }
@@ -2005,8 +2036,8 @@ public Builder setNameFieldBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nameField_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2064,8 +2095,8 @@ public int getHistoryValue() {
      * @return This builder for chaining.
      */
     public Builder setHistoryValue(int value) {
-
       history_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2094,9 +2125,8 @@ 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.valueOf(history_);
+          com.google.api.ResourceDescriptor.History.forNumber(history_);
       return result == null ? com.google.api.ResourceDescriptor.History.UNRECOGNIZED : result;
     }
     /**
@@ -2127,7 +2157,7 @@ public Builder setHistory(com.google.api.ResourceDescriptor.History value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000008;
       history_ = value.getNumber();
       onChanged();
       return this;
@@ -2156,7 +2186,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;
@@ -2241,8 +2271,8 @@ public Builder setPlural(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       plural_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2264,8 +2294,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;
     }
@@ -2292,8 +2322,8 @@ public Builder setPluralBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       plural_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2365,8 +2395,8 @@ public Builder setSingular(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       singular_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2384,8 +2414,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;
     }
@@ -2408,8 +2438,8 @@ public Builder setSingularBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       singular_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2417,9 +2447,9 @@ public Builder setSingularBytes(com.google.protobuf.ByteString value) {
     private java.util.List<java.lang.Integer> style_ = java.util.Collections.emptyList();
 
     private void ensureStyleIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000040) != 0)) {
         style_ = new java.util.ArrayList<java.lang.Integer>(style_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000040;
       }
     }
     /**
@@ -2557,7 +2587,7 @@ public Builder addAllStyle(
      */
     public Builder clearStyle() {
       style_ = java.util.Collections.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000040);
       onChanged();
       return this;
     }
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 74dbec1d14..fbf2c0127d 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceReference.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceReference.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int TYPE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object type_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object type_ = "";
   /**
    *
    *
@@ -145,7 +147,9 @@ public com.google.protobuf.ByteString getTypeBytes() {
   }
 
   public static final int CHILD_TYPE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object childType_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object childType_ = "";
   /**
    *
    *
@@ -413,10 +417,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       type_ = "";
-
       childType_ = "";
-
       return this;
     }
 
@@ -442,12 +445,23 @@ 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);
-      result.type_ = type_;
-      result.childType_ = childType_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -495,10 +509,12 @@ 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());
@@ -530,13 +546,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:
@@ -556,6 +572,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object type_ = "";
     /**
      *
@@ -659,8 +677,8 @@ public Builder setType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       type_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -690,8 +708,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;
     }
@@ -726,8 +744,8 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       type_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -817,8 +835,8 @@ public Builder setChildType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       childType_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -842,8 +860,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;
     }
@@ -872,8 +890,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/RoutingParameter.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingParameter.java
index 3f173c9d5d..d5d05e0ab3 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingParameter.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingParameter.java
@@ -67,7 +67,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int FIELD_FIELD_NUMBER = 1;
-  private volatile java.lang.Object field_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object field_ = "";
   /**
    *
    *
@@ -116,7 +118,9 @@ public com.google.protobuf.ByteString getFieldBytes() {
   }
 
   public static final int PATH_TEMPLATE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object pathTemplate_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pathTemplate_ = "";
   /**
    *
    *
@@ -456,10 +460,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       field_ = "";
-
       pathTemplate_ = "";
-
       return this;
     }
 
@@ -485,12 +488,23 @@ 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);
-      result.field_ = field_;
-      result.pathTemplate_ = pathTemplate_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -538,10 +552,12 @@ 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());
@@ -573,13 +589,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:
@@ -599,6 +615,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object field_ = "";
     /**
      *
@@ -660,8 +678,8 @@ public Builder setField(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       field_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -677,8 +695,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;
     }
@@ -699,8 +717,8 @@ public Builder setFieldBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       field_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -901,8 +919,8 @@ public Builder setPathTemplate(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pathTemplate_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -963,8 +981,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;
     }
@@ -1030,8 +1048,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/RoutingRule.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingRule.java
index 1a2c43771f..4b2708dd3a 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingRule.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingRule.java
@@ -331,6 +331,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ROUTING_PARAMETERS_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.RoutingParameter> routingParameters_;
   /**
    *
@@ -885,6 +887,7 @@ 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 {
@@ -917,7 +920,15 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.RoutingRule result) {
       if (routingParametersBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           routingParameters_ = java.util.Collections.unmodifiableList(routingParameters_);
@@ -927,8 +938,10 @@ public com.google.api.RoutingRule buildPartial() {
       } else {
         result.routingParameters_ = routingParametersBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.api.RoutingRule result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
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 11ef218bba..68d515b3b6 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RubySettings.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RubySettings.java
@@ -105,7 +105,7 @@ public com.google.api.CommonLanguageSettings getCommon() {
    */
   @java.lang.Override
   public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
-    return getCommon();
+    return common_ == null ? com.google.api.CommonLanguageSettings.getDefaultInstance() : common_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -305,10 +305,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (commonBuilder_ == null) {
-        common_ = null;
-      } else {
-        common_ = null;
+      bitField0_ = 0;
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
       return this;
@@ -336,15 +336,20 @@ 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 (commonBuilder_ == null) {
-        result.common_ = common_;
-      } else {
-        result.common_ = commonBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.api.RubySettings result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -422,7 +427,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -442,6 +447,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.api.CommonLanguageSettings common_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.api.CommonLanguageSettings,
@@ -460,7 +467,7 @@ public Builder mergeFrom(
      * @return Whether the common field is set.
      */
     public boolean hasCommon() {
-      return commonBuilder_ != null || common_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -497,11 +504,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
           throw new NullPointerException();
         }
         common_ = value;
-        onChanged();
       } else {
         commonBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -516,11 +523,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;
     }
     /**
@@ -534,19 +541,18 @@ public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderFo
      */
     public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
       if (commonBuilder_ == null) {
-        if (common_ != null) {
-          common_ =
-              com.google.api.CommonLanguageSettings.newBuilder(common_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && common_ != null
+            && common_ != com.google.api.CommonLanguageSettings.getDefaultInstance()) {
+          getCommonBuilder().mergeFrom(value);
         } else {
           common_ = value;
         }
-        onChanged();
       } else {
         commonBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -559,14 +565,13 @@ public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
      * <code>.google.api.CommonLanguageSettings common = 1;</code>
      */
     public Builder clearCommon() {
-      if (commonBuilder_ == null) {
-        common_ = null;
-        onChanged();
-      } else {
-        common_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -579,7 +584,7 @@ public Builder clearCommon() {
      * <code>.google.api.CommonLanguageSettings common = 1;</code>
      */
     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/Service.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Service.java
index f9cf8836f1..b6435338b0 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
@@ -103,7 +103,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -158,7 +160,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int TITLE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object title_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object title_ = "";
   /**
    *
    *
@@ -209,7 +213,9 @@ public com.google.protobuf.ByteString getTitleBytes() {
   }
 
   public static final int PRODUCER_PROJECT_ID_FIELD_NUMBER = 22;
-  private volatile java.lang.Object producerProjectId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object producerProjectId_ = "";
   /**
    *
    *
@@ -258,7 +264,9 @@ public com.google.protobuf.ByteString getProducerProjectIdBytes() {
   }
 
   public static final int ID_FIELD_NUMBER = 33;
-  private volatile java.lang.Object id_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object id_ = "";
   /**
    *
    *
@@ -313,6 +321,8 @@ public com.google.protobuf.ByteString getIdBytes() {
   }
 
   public static final int APIS_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.protobuf.Api> apis_;
   /**
    *
@@ -401,6 +411,8 @@ public com.google.protobuf.ApiOrBuilder getApisOrBuilder(int index) {
   }
 
   public static final int TYPES_FIELD_NUMBER = 4;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.protobuf.Type> types_;
   /**
    *
@@ -499,6 +511,8 @@ public com.google.protobuf.TypeOrBuilder getTypesOrBuilder(int index) {
   }
 
   public static final int ENUMS_FIELD_NUMBER = 5;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.protobuf.Enum> enums_;
   /**
    *
@@ -636,7 +650,9 @@ public com.google.api.Documentation getDocumentation() {
    */
   @java.lang.Override
   public com.google.api.DocumentationOrBuilder getDocumentationOrBuilder() {
-    return getDocumentation();
+    return documentation_ == null
+        ? com.google.api.Documentation.getDefaultInstance()
+        : documentation_;
   }
 
   public static final int BACKEND_FIELD_NUMBER = 8;
@@ -682,7 +698,7 @@ public com.google.api.Backend getBackend() {
    */
   @java.lang.Override
   public com.google.api.BackendOrBuilder getBackendOrBuilder() {
-    return getBackend();
+    return backend_ == null ? com.google.api.Backend.getDefaultInstance() : backend_;
   }
 
   public static final int HTTP_FIELD_NUMBER = 9;
@@ -728,7 +744,7 @@ public com.google.api.Http getHttp() {
    */
   @java.lang.Override
   public com.google.api.HttpOrBuilder getHttpOrBuilder() {
-    return getHttp();
+    return http_ == null ? com.google.api.Http.getDefaultInstance() : http_;
   }
 
   public static final int QUOTA_FIELD_NUMBER = 10;
@@ -774,7 +790,7 @@ public com.google.api.Quota getQuota() {
    */
   @java.lang.Override
   public com.google.api.QuotaOrBuilder getQuotaOrBuilder() {
-    return getQuota();
+    return quota_ == null ? com.google.api.Quota.getDefaultInstance() : quota_;
   }
 
   public static final int AUTHENTICATION_FIELD_NUMBER = 11;
@@ -822,7 +838,9 @@ public com.google.api.Authentication getAuthentication() {
    */
   @java.lang.Override
   public com.google.api.AuthenticationOrBuilder getAuthenticationOrBuilder() {
-    return getAuthentication();
+    return authentication_ == null
+        ? com.google.api.Authentication.getDefaultInstance()
+        : authentication_;
   }
 
   public static final int CONTEXT_FIELD_NUMBER = 12;
@@ -868,7 +886,7 @@ public com.google.api.Context getContext() {
    */
   @java.lang.Override
   public com.google.api.ContextOrBuilder getContextOrBuilder() {
-    return getContext();
+    return context_ == null ? com.google.api.Context.getDefaultInstance() : context_;
   }
 
   public static final int USAGE_FIELD_NUMBER = 15;
@@ -914,10 +932,12 @@ public com.google.api.Usage getUsage() {
    */
   @java.lang.Override
   public com.google.api.UsageOrBuilder getUsageOrBuilder() {
-    return getUsage();
+    return usage_ == null ? com.google.api.Usage.getDefaultInstance() : usage_;
   }
 
   public static final int ENDPOINTS_FIELD_NUMBER = 18;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.Endpoint> endpoints_;
   /**
    *
@@ -1038,10 +1058,12 @@ public com.google.api.Control getControl() {
    */
   @java.lang.Override
   public com.google.api.ControlOrBuilder getControlOrBuilder() {
-    return getControl();
+    return control_ == null ? com.google.api.Control.getDefaultInstance() : control_;
   }
 
   public static final int LOGS_FIELD_NUMBER = 23;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.LogDescriptor> logs_;
   /**
    *
@@ -1110,6 +1132,8 @@ public com.google.api.LogDescriptorOrBuilder getLogsOrBuilder(int index) {
   }
 
   public static final int METRICS_FIELD_NUMBER = 24;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.MetricDescriptor> metrics_;
   /**
    *
@@ -1179,6 +1203,8 @@ public com.google.api.MetricDescriptorOrBuilder getMetricsOrBuilder(int index) {
   }
 
   public static final int MONITORED_RESOURCES_FIELD_NUMBER = 25;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.MonitoredResourceDescriptor> monitoredResources_;
   /**
    *
@@ -1296,7 +1322,7 @@ public com.google.api.Billing getBilling() {
    */
   @java.lang.Override
   public com.google.api.BillingOrBuilder getBillingOrBuilder() {
-    return getBilling();
+    return billing_ == null ? com.google.api.Billing.getDefaultInstance() : billing_;
   }
 
   public static final int LOGGING_FIELD_NUMBER = 27;
@@ -1342,7 +1368,7 @@ public com.google.api.Logging getLogging() {
    */
   @java.lang.Override
   public com.google.api.LoggingOrBuilder getLoggingOrBuilder() {
-    return getLogging();
+    return logging_ == null ? com.google.api.Logging.getDefaultInstance() : logging_;
   }
 
   public static final int MONITORING_FIELD_NUMBER = 28;
@@ -1388,7 +1414,7 @@ public com.google.api.Monitoring getMonitoring() {
    */
   @java.lang.Override
   public com.google.api.MonitoringOrBuilder getMonitoringOrBuilder() {
-    return getMonitoring();
+    return monitoring_ == null ? com.google.api.Monitoring.getDefaultInstance() : monitoring_;
   }
 
   public static final int SYSTEM_PARAMETERS_FIELD_NUMBER = 29;
@@ -1436,7 +1462,9 @@ public com.google.api.SystemParameters getSystemParameters() {
    */
   @java.lang.Override
   public com.google.api.SystemParametersOrBuilder getSystemParametersOrBuilder() {
-    return getSystemParameters();
+    return systemParameters_ == null
+        ? com.google.api.SystemParameters.getDefaultInstance()
+        : systemParameters_;
   }
 
   public static final int SOURCE_INFO_FIELD_NUMBER = 37;
@@ -1482,7 +1510,7 @@ public com.google.api.SourceInfo getSourceInfo() {
    */
   @java.lang.Override
   public com.google.api.SourceInfoOrBuilder getSourceInfoOrBuilder() {
-    return getSourceInfo();
+    return sourceInfo_ == null ? com.google.api.SourceInfo.getDefaultInstance() : sourceInfo_;
   }
 
   public static final int PUBLISHING_FIELD_NUMBER = 45;
@@ -1534,7 +1562,7 @@ public com.google.api.Publishing getPublishing() {
    */
   @java.lang.Override
   public com.google.api.PublishingOrBuilder getPublishingOrBuilder() {
-    return getPublishing();
+    return publishing_ == null ? com.google.api.Publishing.getDefaultInstance() : publishing_;
   }
 
   public static final int CONFIG_VERSION_FIELD_NUMBER = 20;
@@ -1588,7 +1616,9 @@ public com.google.protobuf.UInt32Value getConfigVersion() {
    */
   @java.lang.Override
   public com.google.protobuf.UInt32ValueOrBuilder getConfigVersionOrBuilder() {
-    return getConfigVersion();
+    return configVersion_ == null
+        ? com.google.protobuf.UInt32Value.getDefaultInstance()
+        : configVersion_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -2126,75 +2156,65 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @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_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000010);
       if (typesBuilder_ == null) {
         types_ = java.util.Collections.emptyList();
       } else {
         types_ = null;
         typesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000020);
       if (enumsBuilder_ == null) {
         enums_ = java.util.Collections.emptyList();
       } else {
         enums_ = null;
         enumsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000004);
-      if (documentationBuilder_ == null) {
-        documentation_ = null;
-      } else {
-        documentation_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      documentation_ = null;
+      if (documentationBuilder_ != null) {
+        documentationBuilder_.dispose();
         documentationBuilder_ = null;
       }
-      if (backendBuilder_ == null) {
-        backend_ = null;
-      } else {
-        backend_ = null;
+      backend_ = null;
+      if (backendBuilder_ != null) {
+        backendBuilder_.dispose();
         backendBuilder_ = null;
       }
-      if (httpBuilder_ == null) {
-        http_ = null;
-      } else {
-        http_ = null;
+      http_ = null;
+      if (httpBuilder_ != null) {
+        httpBuilder_.dispose();
         httpBuilder_ = null;
       }
-      if (quotaBuilder_ == null) {
-        quota_ = null;
-      } else {
-        quota_ = null;
+      quota_ = null;
+      if (quotaBuilder_ != null) {
+        quotaBuilder_.dispose();
         quotaBuilder_ = null;
       }
-      if (authenticationBuilder_ == null) {
-        authentication_ = null;
-      } else {
-        authentication_ = null;
+      authentication_ = null;
+      if (authenticationBuilder_ != null) {
+        authenticationBuilder_.dispose();
         authenticationBuilder_ = null;
       }
-      if (contextBuilder_ == null) {
-        context_ = null;
-      } else {
-        context_ = null;
+      context_ = null;
+      if (contextBuilder_ != null) {
+        contextBuilder_.dispose();
         contextBuilder_ = null;
       }
-      if (usageBuilder_ == null) {
-        usage_ = null;
-      } else {
-        usage_ = null;
+      usage_ = null;
+      if (usageBuilder_ != null) {
+        usageBuilder_.dispose();
         usageBuilder_ = null;
       }
       if (endpointsBuilder_ == null) {
@@ -2203,11 +2223,10 @@ public Builder clear() {
         endpoints_ = null;
         endpointsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000008);
-      if (controlBuilder_ == null) {
-        control_ = null;
-      } else {
-        control_ = null;
+      bitField0_ = (bitField0_ & ~0x00004000);
+      control_ = null;
+      if (controlBuilder_ != null) {
+        controlBuilder_.dispose();
         controlBuilder_ = null;
       }
       if (logsBuilder_ == null) {
@@ -2216,61 +2235,54 @@ public Builder clear() {
         logs_ = null;
         logsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000010);
+      bitField0_ = (bitField0_ & ~0x00010000);
       if (metricsBuilder_ == null) {
         metrics_ = java.util.Collections.emptyList();
       } else {
         metrics_ = null;
         metricsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000020);
+      bitField0_ = (bitField0_ & ~0x00020000);
       if (monitoredResourcesBuilder_ == null) {
         monitoredResources_ = java.util.Collections.emptyList();
       } else {
         monitoredResources_ = null;
         monitoredResourcesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000040);
-      if (billingBuilder_ == null) {
-        billing_ = null;
-      } else {
-        billing_ = null;
+      bitField0_ = (bitField0_ & ~0x00040000);
+      billing_ = null;
+      if (billingBuilder_ != null) {
+        billingBuilder_.dispose();
         billingBuilder_ = null;
       }
-      if (loggingBuilder_ == null) {
-        logging_ = null;
-      } else {
-        logging_ = null;
+      logging_ = null;
+      if (loggingBuilder_ != null) {
+        loggingBuilder_.dispose();
         loggingBuilder_ = null;
       }
-      if (monitoringBuilder_ == null) {
-        monitoring_ = null;
-      } else {
-        monitoring_ = null;
+      monitoring_ = null;
+      if (monitoringBuilder_ != null) {
+        monitoringBuilder_.dispose();
         monitoringBuilder_ = null;
       }
-      if (systemParametersBuilder_ == null) {
-        systemParameters_ = null;
-      } else {
-        systemParameters_ = null;
+      systemParameters_ = null;
+      if (systemParametersBuilder_ != null) {
+        systemParametersBuilder_.dispose();
         systemParametersBuilder_ = null;
       }
-      if (sourceInfoBuilder_ == null) {
-        sourceInfo_ = null;
-      } else {
-        sourceInfo_ = null;
+      sourceInfo_ = null;
+      if (sourceInfoBuilder_ != null) {
+        sourceInfoBuilder_.dispose();
         sourceInfoBuilder_ = null;
       }
-      if (publishingBuilder_ == null) {
-        publishing_ = null;
-      } else {
-        publishing_ = null;
+      publishing_ = null;
+      if (publishingBuilder_ != null) {
+        publishingBuilder_.dispose();
         publishingBuilder_ = null;
       }
-      if (configVersionBuilder_ == null) {
-        configVersion_ = null;
-      } else {
-        configVersion_ = null;
+      configVersion_ = null;
+      if (configVersionBuilder_ != null) {
+        configVersionBuilder_.dispose();
         configVersionBuilder_ = null;
       }
       return this;
@@ -2298,151 +2310,143 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.name_ = name_;
-      result.title_ = title_;
-      result.producerProjectId_ = producerProjectId_;
-      result.id_ = id_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.Service result) {
       if (apisBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000010) != 0)) {
           apis_ = java.util.Collections.unmodifiableList(apis_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000010);
         }
         result.apis_ = apis_;
       } else {
         result.apis_ = apisBuilder_.build();
       }
       if (typesBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000020) != 0)) {
           types_ = java.util.Collections.unmodifiableList(types_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000020);
         }
         result.types_ = types_;
       } else {
         result.types_ = typesBuilder_.build();
       }
       if (enumsBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)) {
+        if (((bitField0_ & 0x00000040) != 0)) {
           enums_ = java.util.Collections.unmodifiableList(enums_);
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000040);
         }
         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_ & 0x00000008) != 0)) {
+        if (((bitField0_ & 0x00004000) != 0)) {
           endpoints_ = java.util.Collections.unmodifiableList(endpoints_);
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00004000);
         }
         result.endpoints_ = endpoints_;
       } else {
         result.endpoints_ = endpointsBuilder_.build();
       }
-      if (controlBuilder_ == null) {
-        result.control_ = control_;
-      } else {
-        result.control_ = controlBuilder_.build();
-      }
       if (logsBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)) {
+        if (((bitField0_ & 0x00010000) != 0)) {
           logs_ = java.util.Collections.unmodifiableList(logs_);
-          bitField0_ = (bitField0_ & ~0x00000010);
+          bitField0_ = (bitField0_ & ~0x00010000);
         }
         result.logs_ = logs_;
       } else {
         result.logs_ = logsBuilder_.build();
       }
       if (metricsBuilder_ == null) {
-        if (((bitField0_ & 0x00000020) != 0)) {
+        if (((bitField0_ & 0x00020000) != 0)) {
           metrics_ = java.util.Collections.unmodifiableList(metrics_);
-          bitField0_ = (bitField0_ & ~0x00000020);
+          bitField0_ = (bitField0_ & ~0x00020000);
         }
         result.metrics_ = metrics_;
       } else {
         result.metrics_ = metricsBuilder_.build();
       }
       if (monitoredResourcesBuilder_ == null) {
-        if (((bitField0_ & 0x00000040) != 0)) {
+        if (((bitField0_ & 0x00040000) != 0)) {
           monitoredResources_ = java.util.Collections.unmodifiableList(monitoredResources_);
-          bitField0_ = (bitField0_ & ~0x00000040);
+          bitField0_ = (bitField0_ & ~0x00040000);
         }
         result.monitoredResources_ = monitoredResources_;
       } else {
         result.monitoredResources_ = monitoredResourcesBuilder_.build();
       }
-      if (billingBuilder_ == null) {
-        result.billing_ = billing_;
-      } else {
-        result.billing_ = billingBuilder_.build();
+    }
+
+    private void buildPartial0(com.google.api.Service result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
       }
-      if (loggingBuilder_ == null) {
-        result.logging_ = logging_;
-      } else {
-        result.logging_ = loggingBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.title_ = title_;
       }
-      if (monitoringBuilder_ == null) {
-        result.monitoring_ = monitoring_;
-      } else {
-        result.monitoring_ = monitoringBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.producerProjectId_ = producerProjectId_;
       }
-      if (systemParametersBuilder_ == null) {
-        result.systemParameters_ = systemParameters_;
-      } else {
-        result.systemParameters_ = systemParametersBuilder_.build();
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.id_ = id_;
       }
-      if (sourceInfoBuilder_ == null) {
-        result.sourceInfo_ = sourceInfo_;
-      } else {
-        result.sourceInfo_ = sourceInfoBuilder_.build();
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.documentation_ =
+            documentationBuilder_ == null ? documentation_ : documentationBuilder_.build();
       }
-      if (publishingBuilder_ == null) {
-        result.publishing_ = publishing_;
-      } else {
-        result.publishing_ = publishingBuilder_.build();
+      if (((from_bitField0_ & 0x00000100) != 0)) {
+        result.backend_ = backendBuilder_ == null ? backend_ : backendBuilder_.build();
       }
-      if (configVersionBuilder_ == null) {
-        result.configVersion_ = configVersion_;
-      } else {
-        result.configVersion_ = configVersionBuilder_.build();
+      if (((from_bitField0_ & 0x00000200) != 0)) {
+        result.http_ = httpBuilder_ == null ? http_ : httpBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000400) != 0)) {
+        result.quota_ = quotaBuilder_ == null ? quota_ : quotaBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000800) != 0)) {
+        result.authentication_ =
+            authenticationBuilder_ == null ? authentication_ : authenticationBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00001000) != 0)) {
+        result.context_ = contextBuilder_ == null ? context_ : contextBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00002000) != 0)) {
+        result.usage_ = usageBuilder_ == null ? usage_ : usageBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00008000) != 0)) {
+        result.control_ = controlBuilder_ == null ? control_ : controlBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00080000) != 0)) {
+        result.billing_ = billingBuilder_ == null ? billing_ : billingBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00100000) != 0)) {
+        result.logging_ = loggingBuilder_ == null ? logging_ : loggingBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00200000) != 0)) {
+        result.monitoring_ = monitoringBuilder_ == null ? monitoring_ : monitoringBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00400000) != 0)) {
+        result.systemParameters_ =
+            systemParametersBuilder_ == null ? systemParameters_ : systemParametersBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00800000) != 0)) {
+        result.sourceInfo_ = sourceInfoBuilder_ == null ? sourceInfo_ : sourceInfoBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x01000000) != 0)) {
+        result.publishing_ = publishingBuilder_ == null ? publishing_ : publishingBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x02000000) != 0)) {
+        result.configVersion_ =
+            configVersionBuilder_ == null ? configVersion_ : configVersionBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -2492,25 +2496,29 @@ 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_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
             ensureApisIsMutable();
             apis_.addAll(other.apis_);
@@ -2523,7 +2531,7 @@ public Builder mergeFrom(com.google.api.Service other) {
             apisBuilder_.dispose();
             apisBuilder_ = null;
             apis_ = other.apis_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
             apisBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getApisFieldBuilder()
@@ -2537,7 +2545,7 @@ public Builder mergeFrom(com.google.api.Service other) {
         if (!other.types_.isEmpty()) {
           if (types_.isEmpty()) {
             types_ = other.types_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000020);
           } else {
             ensureTypesIsMutable();
             types_.addAll(other.types_);
@@ -2550,7 +2558,7 @@ public Builder mergeFrom(com.google.api.Service other) {
             typesBuilder_.dispose();
             typesBuilder_ = null;
             types_ = other.types_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000020);
             typesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getTypesFieldBuilder()
@@ -2564,7 +2572,7 @@ public Builder mergeFrom(com.google.api.Service other) {
         if (!other.enums_.isEmpty()) {
           if (enums_.isEmpty()) {
             enums_ = other.enums_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000040);
           } else {
             ensureEnumsIsMutable();
             enums_.addAll(other.enums_);
@@ -2577,7 +2585,7 @@ public Builder mergeFrom(com.google.api.Service other) {
             enumsBuilder_.dispose();
             enumsBuilder_ = null;
             enums_ = other.enums_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000040);
             enumsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getEnumsFieldBuilder()
@@ -2612,7 +2620,7 @@ public Builder mergeFrom(com.google.api.Service other) {
         if (!other.endpoints_.isEmpty()) {
           if (endpoints_.isEmpty()) {
             endpoints_ = other.endpoints_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00004000);
           } else {
             ensureEndpointsIsMutable();
             endpoints_.addAll(other.endpoints_);
@@ -2625,7 +2633,7 @@ public Builder mergeFrom(com.google.api.Service other) {
             endpointsBuilder_.dispose();
             endpointsBuilder_ = null;
             endpoints_ = other.endpoints_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00004000);
             endpointsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getEndpointsFieldBuilder()
@@ -2642,7 +2650,7 @@ public Builder mergeFrom(com.google.api.Service other) {
         if (!other.logs_.isEmpty()) {
           if (logs_.isEmpty()) {
             logs_ = other.logs_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            bitField0_ = (bitField0_ & ~0x00010000);
           } else {
             ensureLogsIsMutable();
             logs_.addAll(other.logs_);
@@ -2655,7 +2663,7 @@ public Builder mergeFrom(com.google.api.Service other) {
             logsBuilder_.dispose();
             logsBuilder_ = null;
             logs_ = other.logs_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            bitField0_ = (bitField0_ & ~0x00010000);
             logsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getLogsFieldBuilder()
@@ -2669,7 +2677,7 @@ public Builder mergeFrom(com.google.api.Service other) {
         if (!other.metrics_.isEmpty()) {
           if (metrics_.isEmpty()) {
             metrics_ = other.metrics_;
-            bitField0_ = (bitField0_ & ~0x00000020);
+            bitField0_ = (bitField0_ & ~0x00020000);
           } else {
             ensureMetricsIsMutable();
             metrics_.addAll(other.metrics_);
@@ -2682,7 +2690,7 @@ public Builder mergeFrom(com.google.api.Service other) {
             metricsBuilder_.dispose();
             metricsBuilder_ = null;
             metrics_ = other.metrics_;
-            bitField0_ = (bitField0_ & ~0x00000020);
+            bitField0_ = (bitField0_ & ~0x00020000);
             metricsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getMetricsFieldBuilder()
@@ -2696,7 +2704,7 @@ public Builder mergeFrom(com.google.api.Service other) {
         if (!other.monitoredResources_.isEmpty()) {
           if (monitoredResources_.isEmpty()) {
             monitoredResources_ = other.monitoredResources_;
-            bitField0_ = (bitField0_ & ~0x00000040);
+            bitField0_ = (bitField0_ & ~0x00040000);
           } else {
             ensureMonitoredResourcesIsMutable();
             monitoredResources_.addAll(other.monitoredResources_);
@@ -2709,7 +2717,7 @@ public Builder mergeFrom(com.google.api.Service other) {
             monitoredResourcesBuilder_.dispose();
             monitoredResourcesBuilder_ = null;
             monitoredResources_ = other.monitoredResources_;
-            bitField0_ = (bitField0_ & ~0x00000040);
+            bitField0_ = (bitField0_ & ~0x00040000);
             monitoredResourcesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getMonitoredResourcesFieldBuilder()
@@ -2769,13 +2777,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:
@@ -2817,43 +2825,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:
@@ -2871,19 +2879,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:
@@ -2926,44 +2934,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:
@@ -3055,8 +3063,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -3075,8 +3083,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;
     }
@@ -3100,8 +3108,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -3170,8 +3178,8 @@ public Builder setTitle(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       title_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -3188,8 +3196,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;
     }
@@ -3211,8 +3219,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       title_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -3278,8 +3286,8 @@ public Builder setProducerProjectId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       producerProjectId_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -3295,8 +3303,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;
     }
@@ -3317,8 +3325,8 @@ public Builder setProducerProjectIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       producerProjectId_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -3393,8 +3401,8 @@ public Builder setId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       id_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -3413,8 +3421,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;
     }
@@ -3438,8 +3446,8 @@ public Builder setIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       id_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -3447,9 +3455,9 @@ public Builder setIdBytes(com.google.protobuf.ByteString value) {
     private java.util.List<com.google.protobuf.Api> apis_ = java.util.Collections.emptyList();
 
     private void ensureApisIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         apis_ = new java.util.ArrayList<com.google.protobuf.Api>(apis_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000010;
       }
     }
 
@@ -3705,7 +3713,7 @@ public Builder addAllApis(java.lang.Iterable<? extends com.google.protobuf.Api>
     public Builder clearApis() {
       if (apisBuilder_ == null) {
         apis_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
       } else {
         apisBuilder_.clear();
@@ -3851,7 +3859,7 @@ public java.util.List<com.google.protobuf.Api.Builder> getApisBuilderList() {
                 com.google.protobuf.Api,
                 com.google.protobuf.Api.Builder,
                 com.google.protobuf.ApiOrBuilder>(
-                apis_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                apis_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
         apis_ = null;
       }
       return apisBuilder_;
@@ -3860,9 +3868,9 @@ public java.util.List<com.google.protobuf.Api.Builder> getApisBuilderList() {
     private java.util.List<com.google.protobuf.Type> types_ = java.util.Collections.emptyList();
 
     private void ensureTypesIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000020) != 0)) {
         types_ = new java.util.ArrayList<com.google.protobuf.Type>(types_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000020;
       }
     }
 
@@ -4140,7 +4148,7 @@ public Builder addAllTypes(java.lang.Iterable<? extends com.google.protobuf.Type
     public Builder clearTypes() {
       if (typesBuilder_ == null) {
         types_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000020);
         onChanged();
       } else {
         typesBuilder_.clear();
@@ -4301,7 +4309,7 @@ public java.util.List<com.google.protobuf.Type.Builder> getTypesBuilderList() {
                 com.google.protobuf.Type,
                 com.google.protobuf.Type.Builder,
                 com.google.protobuf.TypeOrBuilder>(
-                types_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                types_, ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean());
         types_ = null;
       }
       return typesBuilder_;
@@ -4310,9 +4318,9 @@ public java.util.List<com.google.protobuf.Type.Builder> getTypesBuilderList() {
     private java.util.List<com.google.protobuf.Enum> enums_ = java.util.Collections.emptyList();
 
     private void ensureEnumsIsMutable() {
-      if (!((bitField0_ & 0x00000004) != 0)) {
+      if (!((bitField0_ & 0x00000040) != 0)) {
         enums_ = new java.util.ArrayList<com.google.protobuf.Enum>(enums_);
-        bitField0_ |= 0x00000004;
+        bitField0_ |= 0x00000040;
       }
     }
 
@@ -4579,7 +4587,7 @@ public Builder addAllEnums(java.lang.Iterable<? extends com.google.protobuf.Enum
     public Builder clearEnums() {
       if (enumsBuilder_ == null) {
         enums_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000040);
         onChanged();
       } else {
         enumsBuilder_.clear();
@@ -4733,7 +4741,7 @@ public java.util.List<com.google.protobuf.Enum.Builder> getEnumsBuilderList() {
                 com.google.protobuf.Enum,
                 com.google.protobuf.Enum.Builder,
                 com.google.protobuf.EnumOrBuilder>(
-                enums_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
+                enums_, ((bitField0_ & 0x00000040) != 0), getParentForChildren(), isClean());
         enums_ = null;
       }
       return enumsBuilder_;
@@ -4757,7 +4765,7 @@ public java.util.List<com.google.protobuf.Enum.Builder> getEnumsBuilderList() {
      * @return Whether the documentation field is set.
      */
     public boolean hasDocumentation() {
-      return documentationBuilder_ != null || documentation_ != null;
+      return ((bitField0_ & 0x00000080) != 0);
     }
     /**
      *
@@ -4794,11 +4802,11 @@ public Builder setDocumentation(com.google.api.Documentation value) {
           throw new NullPointerException();
         }
         documentation_ = value;
-        onChanged();
       } else {
         documentationBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -4813,11 +4821,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;
     }
     /**
@@ -4831,19 +4839,18 @@ public Builder setDocumentation(com.google.api.Documentation.Builder builderForV
      */
     public Builder mergeDocumentation(com.google.api.Documentation value) {
       if (documentationBuilder_ == null) {
-        if (documentation_ != null) {
-          documentation_ =
-              com.google.api.Documentation.newBuilder(documentation_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000080) != 0)
+            && documentation_ != null
+            && documentation_ != com.google.api.Documentation.getDefaultInstance()) {
+          getDocumentationBuilder().mergeFrom(value);
         } else {
           documentation_ = value;
         }
-        onChanged();
       } else {
         documentationBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -4856,14 +4863,13 @@ public Builder mergeDocumentation(com.google.api.Documentation value) {
      * <code>.google.api.Documentation documentation = 6;</code>
      */
     public Builder clearDocumentation() {
-      if (documentationBuilder_ == null) {
-        documentation_ = null;
-        onChanged();
-      } else {
-        documentation_ = null;
+      bitField0_ = (bitField0_ & ~0x00000080);
+      documentation_ = null;
+      if (documentationBuilder_ != null) {
+        documentationBuilder_.dispose();
         documentationBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -4876,7 +4882,7 @@ public Builder clearDocumentation() {
      * <code>.google.api.Documentation documentation = 6;</code>
      */
     public com.google.api.Documentation.Builder getDocumentationBuilder() {
-
+      bitField0_ |= 0x00000080;
       onChanged();
       return getDocumentationFieldBuilder().getBuilder();
     }
@@ -4940,7 +4946,7 @@ public com.google.api.DocumentationOrBuilder getDocumentationOrBuilder() {
      * @return Whether the backend field is set.
      */
     public boolean hasBackend() {
-      return backendBuilder_ != null || backend_ != null;
+      return ((bitField0_ & 0x00000100) != 0);
     }
     /**
      *
@@ -4975,11 +4981,11 @@ public Builder setBackend(com.google.api.Backend value) {
           throw new NullPointerException();
         }
         backend_ = value;
-        onChanged();
       } else {
         backendBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -4994,11 +5000,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;
     }
     /**
@@ -5012,16 +5018,18 @@ public Builder setBackend(com.google.api.Backend.Builder builderForValue) {
      */
     public Builder mergeBackend(com.google.api.Backend value) {
       if (backendBuilder_ == null) {
-        if (backend_ != null) {
-          backend_ = com.google.api.Backend.newBuilder(backend_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000100) != 0)
+            && backend_ != null
+            && backend_ != com.google.api.Backend.getDefaultInstance()) {
+          getBackendBuilder().mergeFrom(value);
         } else {
           backend_ = value;
         }
-        onChanged();
       } else {
         backendBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -5034,14 +5042,13 @@ public Builder mergeBackend(com.google.api.Backend value) {
      * <code>.google.api.Backend backend = 8;</code>
      */
     public Builder clearBackend() {
-      if (backendBuilder_ == null) {
-        backend_ = null;
-        onChanged();
-      } else {
-        backend_ = null;
+      bitField0_ = (bitField0_ & ~0x00000100);
+      backend_ = null;
+      if (backendBuilder_ != null) {
+        backendBuilder_.dispose();
         backendBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -5054,7 +5061,7 @@ public Builder clearBackend() {
      * <code>.google.api.Backend backend = 8;</code>
      */
     public com.google.api.Backend.Builder getBackendBuilder() {
-
+      bitField0_ |= 0x00000100;
       onChanged();
       return getBackendFieldBuilder().getBuilder();
     }
@@ -5113,7 +5120,7 @@ public com.google.api.BackendOrBuilder getBackendOrBuilder() {
      * @return Whether the http field is set.
      */
     public boolean hasHttp() {
-      return httpBuilder_ != null || http_ != null;
+      return ((bitField0_ & 0x00000200) != 0);
     }
     /**
      *
@@ -5148,11 +5155,11 @@ public Builder setHttp(com.google.api.Http value) {
           throw new NullPointerException();
         }
         http_ = value;
-        onChanged();
       } else {
         httpBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -5167,11 +5174,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;
     }
     /**
@@ -5185,16 +5192,18 @@ public Builder setHttp(com.google.api.Http.Builder builderForValue) {
      */
     public Builder mergeHttp(com.google.api.Http value) {
       if (httpBuilder_ == null) {
-        if (http_ != null) {
-          http_ = com.google.api.Http.newBuilder(http_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000200) != 0)
+            && http_ != null
+            && http_ != com.google.api.Http.getDefaultInstance()) {
+          getHttpBuilder().mergeFrom(value);
         } else {
           http_ = value;
         }
-        onChanged();
       } else {
         httpBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -5207,14 +5216,13 @@ public Builder mergeHttp(com.google.api.Http value) {
      * <code>.google.api.Http http = 9;</code>
      */
     public Builder clearHttp() {
-      if (httpBuilder_ == null) {
-        http_ = null;
-        onChanged();
-      } else {
-        http_ = null;
+      bitField0_ = (bitField0_ & ~0x00000200);
+      http_ = null;
+      if (httpBuilder_ != null) {
+        httpBuilder_.dispose();
         httpBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -5227,7 +5235,7 @@ public Builder clearHttp() {
      * <code>.google.api.Http http = 9;</code>
      */
     public com.google.api.Http.Builder getHttpBuilder() {
-
+      bitField0_ |= 0x00000200;
       onChanged();
       return getHttpFieldBuilder().getBuilder();
     }
@@ -5285,7 +5293,7 @@ public com.google.api.HttpOrBuilder getHttpOrBuilder() {
      * @return Whether the quota field is set.
      */
     public boolean hasQuota() {
-      return quotaBuilder_ != null || quota_ != null;
+      return ((bitField0_ & 0x00000400) != 0);
     }
     /**
      *
@@ -5320,11 +5328,11 @@ public Builder setQuota(com.google.api.Quota value) {
           throw new NullPointerException();
         }
         quota_ = value;
-        onChanged();
       } else {
         quotaBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000400;
+      onChanged();
       return this;
     }
     /**
@@ -5339,11 +5347,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;
     }
     /**
@@ -5357,16 +5365,18 @@ public Builder setQuota(com.google.api.Quota.Builder builderForValue) {
      */
     public Builder mergeQuota(com.google.api.Quota value) {
       if (quotaBuilder_ == null) {
-        if (quota_ != null) {
-          quota_ = com.google.api.Quota.newBuilder(quota_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000400) != 0)
+            && quota_ != null
+            && quota_ != com.google.api.Quota.getDefaultInstance()) {
+          getQuotaBuilder().mergeFrom(value);
         } else {
           quota_ = value;
         }
-        onChanged();
       } else {
         quotaBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000400;
+      onChanged();
       return this;
     }
     /**
@@ -5379,14 +5389,13 @@ public Builder mergeQuota(com.google.api.Quota value) {
      * <code>.google.api.Quota quota = 10;</code>
      */
     public Builder clearQuota() {
-      if (quotaBuilder_ == null) {
-        quota_ = null;
-        onChanged();
-      } else {
-        quota_ = null;
+      bitField0_ = (bitField0_ & ~0x00000400);
+      quota_ = null;
+      if (quotaBuilder_ != null) {
+        quotaBuilder_.dispose();
         quotaBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -5399,7 +5408,7 @@ public Builder clearQuota() {
      * <code>.google.api.Quota quota = 10;</code>
      */
     public com.google.api.Quota.Builder getQuotaBuilder() {
-
+      bitField0_ |= 0x00000400;
       onChanged();
       return getQuotaFieldBuilder().getBuilder();
     }
@@ -5459,7 +5468,7 @@ public com.google.api.QuotaOrBuilder getQuotaOrBuilder() {
      * @return Whether the authentication field is set.
      */
     public boolean hasAuthentication() {
-      return authenticationBuilder_ != null || authentication_ != null;
+      return ((bitField0_ & 0x00000800) != 0);
     }
     /**
      *
@@ -5496,11 +5505,11 @@ public Builder setAuthentication(com.google.api.Authentication value) {
           throw new NullPointerException();
         }
         authentication_ = value;
-        onChanged();
       } else {
         authenticationBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000800;
+      onChanged();
       return this;
     }
     /**
@@ -5515,11 +5524,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;
     }
     /**
@@ -5533,19 +5542,18 @@ public Builder setAuthentication(com.google.api.Authentication.Builder builderFo
      */
     public Builder mergeAuthentication(com.google.api.Authentication value) {
       if (authenticationBuilder_ == null) {
-        if (authentication_ != null) {
-          authentication_ =
-              com.google.api.Authentication.newBuilder(authentication_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000800) != 0)
+            && authentication_ != null
+            && authentication_ != com.google.api.Authentication.getDefaultInstance()) {
+          getAuthenticationBuilder().mergeFrom(value);
         } else {
           authentication_ = value;
         }
-        onChanged();
       } else {
         authenticationBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000800;
+      onChanged();
       return this;
     }
     /**
@@ -5558,14 +5566,13 @@ public Builder mergeAuthentication(com.google.api.Authentication value) {
      * <code>.google.api.Authentication authentication = 11;</code>
      */
     public Builder clearAuthentication() {
-      if (authenticationBuilder_ == null) {
-        authentication_ = null;
-        onChanged();
-      } else {
-        authentication_ = null;
+      bitField0_ = (bitField0_ & ~0x00000800);
+      authentication_ = null;
+      if (authenticationBuilder_ != null) {
+        authenticationBuilder_.dispose();
         authenticationBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -5578,7 +5585,7 @@ public Builder clearAuthentication() {
      * <code>.google.api.Authentication authentication = 11;</code>
      */
     public com.google.api.Authentication.Builder getAuthenticationBuilder() {
-
+      bitField0_ |= 0x00000800;
       onChanged();
       return getAuthenticationFieldBuilder().getBuilder();
     }
@@ -5642,7 +5649,7 @@ public com.google.api.AuthenticationOrBuilder getAuthenticationOrBuilder() {
      * @return Whether the context field is set.
      */
     public boolean hasContext() {
-      return contextBuilder_ != null || context_ != null;
+      return ((bitField0_ & 0x00001000) != 0);
     }
     /**
      *
@@ -5677,11 +5684,11 @@ public Builder setContext(com.google.api.Context value) {
           throw new NullPointerException();
         }
         context_ = value;
-        onChanged();
       } else {
         contextBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00001000;
+      onChanged();
       return this;
     }
     /**
@@ -5696,11 +5703,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;
     }
     /**
@@ -5714,16 +5721,18 @@ public Builder setContext(com.google.api.Context.Builder builderForValue) {
      */
     public Builder mergeContext(com.google.api.Context value) {
       if (contextBuilder_ == null) {
-        if (context_ != null) {
-          context_ = com.google.api.Context.newBuilder(context_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00001000) != 0)
+            && context_ != null
+            && context_ != com.google.api.Context.getDefaultInstance()) {
+          getContextBuilder().mergeFrom(value);
         } else {
           context_ = value;
         }
-        onChanged();
       } else {
         contextBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00001000;
+      onChanged();
       return this;
     }
     /**
@@ -5736,14 +5745,13 @@ public Builder mergeContext(com.google.api.Context value) {
      * <code>.google.api.Context context = 12;</code>
      */
     public Builder clearContext() {
-      if (contextBuilder_ == null) {
-        context_ = null;
-        onChanged();
-      } else {
-        context_ = null;
+      bitField0_ = (bitField0_ & ~0x00001000);
+      context_ = null;
+      if (contextBuilder_ != null) {
+        contextBuilder_.dispose();
         contextBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -5756,7 +5764,7 @@ public Builder clearContext() {
      * <code>.google.api.Context context = 12;</code>
      */
     public com.google.api.Context.Builder getContextBuilder() {
-
+      bitField0_ |= 0x00001000;
       onChanged();
       return getContextFieldBuilder().getBuilder();
     }
@@ -5815,7 +5823,7 @@ public com.google.api.ContextOrBuilder getContextOrBuilder() {
      * @return Whether the usage field is set.
      */
     public boolean hasUsage() {
-      return usageBuilder_ != null || usage_ != null;
+      return ((bitField0_ & 0x00002000) != 0);
     }
     /**
      *
@@ -5850,11 +5858,11 @@ public Builder setUsage(com.google.api.Usage value) {
           throw new NullPointerException();
         }
         usage_ = value;
-        onChanged();
       } else {
         usageBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00002000;
+      onChanged();
       return this;
     }
     /**
@@ -5869,11 +5877,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;
     }
     /**
@@ -5887,16 +5895,18 @@ public Builder setUsage(com.google.api.Usage.Builder builderForValue) {
      */
     public Builder mergeUsage(com.google.api.Usage value) {
       if (usageBuilder_ == null) {
-        if (usage_ != null) {
-          usage_ = com.google.api.Usage.newBuilder(usage_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00002000) != 0)
+            && usage_ != null
+            && usage_ != com.google.api.Usage.getDefaultInstance()) {
+          getUsageBuilder().mergeFrom(value);
         } else {
           usage_ = value;
         }
-        onChanged();
       } else {
         usageBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00002000;
+      onChanged();
       return this;
     }
     /**
@@ -5909,14 +5919,13 @@ public Builder mergeUsage(com.google.api.Usage value) {
      * <code>.google.api.Usage usage = 15;</code>
      */
     public Builder clearUsage() {
-      if (usageBuilder_ == null) {
-        usage_ = null;
-        onChanged();
-      } else {
-        usage_ = null;
+      bitField0_ = (bitField0_ & ~0x00002000);
+      usage_ = null;
+      if (usageBuilder_ != null) {
+        usageBuilder_.dispose();
         usageBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -5929,7 +5938,7 @@ public Builder clearUsage() {
      * <code>.google.api.Usage usage = 15;</code>
      */
     public com.google.api.Usage.Builder getUsageBuilder() {
-
+      bitField0_ |= 0x00002000;
       onChanged();
       return getUsageFieldBuilder().getBuilder();
     }
@@ -5974,9 +5983,9 @@ public com.google.api.UsageOrBuilder getUsageOrBuilder() {
     private java.util.List<com.google.api.Endpoint> endpoints_ = java.util.Collections.emptyList();
 
     private void ensureEndpointsIsMutable() {
-      if (!((bitField0_ & 0x00000008) != 0)) {
+      if (!((bitField0_ & 0x00004000) != 0)) {
         endpoints_ = new java.util.ArrayList<com.google.api.Endpoint>(endpoints_);
-        bitField0_ |= 0x00000008;
+        bitField0_ |= 0x00004000;
       }
     }
 
@@ -6210,7 +6219,7 @@ public Builder addAllEndpoints(java.lang.Iterable<? extends com.google.api.Endpo
     public Builder clearEndpoints() {
       if (endpointsBuilder_ == null) {
         endpoints_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00004000);
         onChanged();
       } else {
         endpointsBuilder_.clear();
@@ -6343,7 +6352,7 @@ public java.util.List<com.google.api.Endpoint.Builder> getEndpointsBuilderList()
                 com.google.api.Endpoint,
                 com.google.api.Endpoint.Builder,
                 com.google.api.EndpointOrBuilder>(
-                endpoints_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
+                endpoints_, ((bitField0_ & 0x00004000) != 0), getParentForChildren(), isClean());
         endpoints_ = null;
       }
       return endpointsBuilder_;
@@ -6365,7 +6374,7 @@ public java.util.List<com.google.api.Endpoint.Builder> getEndpointsBuilderList()
      * @return Whether the control field is set.
      */
     public boolean hasControl() {
-      return controlBuilder_ != null || control_ != null;
+      return ((bitField0_ & 0x00008000) != 0);
     }
     /**
      *
@@ -6400,11 +6409,11 @@ public Builder setControl(com.google.api.Control value) {
           throw new NullPointerException();
         }
         control_ = value;
-        onChanged();
       } else {
         controlBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00008000;
+      onChanged();
       return this;
     }
     /**
@@ -6419,11 +6428,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;
     }
     /**
@@ -6437,16 +6446,18 @@ public Builder setControl(com.google.api.Control.Builder builderForValue) {
      */
     public Builder mergeControl(com.google.api.Control value) {
       if (controlBuilder_ == null) {
-        if (control_ != null) {
-          control_ = com.google.api.Control.newBuilder(control_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00008000) != 0)
+            && control_ != null
+            && control_ != com.google.api.Control.getDefaultInstance()) {
+          getControlBuilder().mergeFrom(value);
         } else {
           control_ = value;
         }
-        onChanged();
       } else {
         controlBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00008000;
+      onChanged();
       return this;
     }
     /**
@@ -6459,14 +6470,13 @@ public Builder mergeControl(com.google.api.Control value) {
      * <code>.google.api.Control control = 21;</code>
      */
     public Builder clearControl() {
-      if (controlBuilder_ == null) {
-        control_ = null;
-        onChanged();
-      } else {
-        control_ = null;
+      bitField0_ = (bitField0_ & ~0x00008000);
+      control_ = null;
+      if (controlBuilder_ != null) {
+        controlBuilder_.dispose();
         controlBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -6479,7 +6489,7 @@ public Builder clearControl() {
      * <code>.google.api.Control control = 21;</code>
      */
     public com.google.api.Control.Builder getControlBuilder() {
-
+      bitField0_ |= 0x00008000;
       onChanged();
       return getControlFieldBuilder().getBuilder();
     }
@@ -6525,9 +6535,9 @@ public com.google.api.ControlOrBuilder getControlOrBuilder() {
     private java.util.List<com.google.api.LogDescriptor> logs_ = java.util.Collections.emptyList();
 
     private void ensureLogsIsMutable() {
-      if (!((bitField0_ & 0x00000010) != 0)) {
+      if (!((bitField0_ & 0x00010000) != 0)) {
         logs_ = new java.util.ArrayList<com.google.api.LogDescriptor>(logs_);
-        bitField0_ |= 0x00000010;
+        bitField0_ |= 0x00010000;
       }
     }
 
@@ -6739,7 +6749,7 @@ public Builder addAllLogs(java.lang.Iterable<? extends com.google.api.LogDescrip
     public Builder clearLogs() {
       if (logsBuilder_ == null) {
         logs_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000010);
+        bitField0_ = (bitField0_ & ~0x00010000);
         onChanged();
       } else {
         logsBuilder_.clear();
@@ -6858,7 +6868,7 @@ public java.util.List<com.google.api.LogDescriptor.Builder> getLogsBuilderList()
                 com.google.api.LogDescriptor,
                 com.google.api.LogDescriptor.Builder,
                 com.google.api.LogDescriptorOrBuilder>(
-                logs_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
+                logs_, ((bitField0_ & 0x00010000) != 0), getParentForChildren(), isClean());
         logs_ = null;
       }
       return logsBuilder_;
@@ -6868,9 +6878,9 @@ public java.util.List<com.google.api.LogDescriptor.Builder> getLogsBuilderList()
         java.util.Collections.emptyList();
 
     private void ensureMetricsIsMutable() {
-      if (!((bitField0_ & 0x00000020) != 0)) {
+      if (!((bitField0_ & 0x00020000) != 0)) {
         metrics_ = new java.util.ArrayList<com.google.api.MetricDescriptor>(metrics_);
-        bitField0_ |= 0x00000020;
+        bitField0_ |= 0x00020000;
       }
     }
 
@@ -7083,7 +7093,7 @@ public Builder addAllMetrics(
     public Builder clearMetrics() {
       if (metricsBuilder_ == null) {
         metrics_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000020);
+        bitField0_ = (bitField0_ & ~0x00020000);
         onChanged();
       } else {
         metricsBuilder_.clear();
@@ -7204,7 +7214,7 @@ public java.util.List<com.google.api.MetricDescriptor.Builder> getMetricsBuilder
                 com.google.api.MetricDescriptor,
                 com.google.api.MetricDescriptor.Builder,
                 com.google.api.MetricDescriptorOrBuilder>(
-                metrics_, ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean());
+                metrics_, ((bitField0_ & 0x00020000) != 0), getParentForChildren(), isClean());
         metrics_ = null;
       }
       return metricsBuilder_;
@@ -7214,11 +7224,11 @@ public java.util.List<com.google.api.MetricDescriptor.Builder> getMetricsBuilder
         java.util.Collections.emptyList();
 
     private void ensureMonitoredResourcesIsMutable() {
-      if (!((bitField0_ & 0x00000040) != 0)) {
+      if (!((bitField0_ & 0x00040000) != 0)) {
         monitoredResources_ =
             new java.util.ArrayList<com.google.api.MonitoredResourceDescriptor>(
                 monitoredResources_);
-        bitField0_ |= 0x00000040;
+        bitField0_ |= 0x00040000;
       }
     }
 
@@ -7447,7 +7457,7 @@ public Builder addAllMonitoredResources(
     public Builder clearMonitoredResources() {
       if (monitoredResourcesBuilder_ == null) {
         monitoredResources_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000040);
+        bitField0_ = (bitField0_ & ~0x00040000);
         onChanged();
       } else {
         monitoredResourcesBuilder_.clear();
@@ -7580,7 +7590,7 @@ public com.google.api.MonitoredResourceDescriptor.Builder addMonitoredResourcesB
                 com.google.api.MonitoredResourceDescriptor.Builder,
                 com.google.api.MonitoredResourceDescriptorOrBuilder>(
                 monitoredResources_,
-                ((bitField0_ & 0x00000040) != 0),
+                ((bitField0_ & 0x00040000) != 0),
                 getParentForChildren(),
                 isClean());
         monitoredResources_ = null;
@@ -7604,7 +7614,7 @@ public com.google.api.MonitoredResourceDescriptor.Builder addMonitoredResourcesB
      * @return Whether the billing field is set.
      */
     public boolean hasBilling() {
-      return billingBuilder_ != null || billing_ != null;
+      return ((bitField0_ & 0x00080000) != 0);
     }
     /**
      *
@@ -7639,11 +7649,11 @@ public Builder setBilling(com.google.api.Billing value) {
           throw new NullPointerException();
         }
         billing_ = value;
-        onChanged();
       } else {
         billingBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00080000;
+      onChanged();
       return this;
     }
     /**
@@ -7658,11 +7668,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;
     }
     /**
@@ -7676,16 +7686,18 @@ public Builder setBilling(com.google.api.Billing.Builder builderForValue) {
      */
     public Builder mergeBilling(com.google.api.Billing value) {
       if (billingBuilder_ == null) {
-        if (billing_ != null) {
-          billing_ = com.google.api.Billing.newBuilder(billing_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00080000) != 0)
+            && billing_ != null
+            && billing_ != com.google.api.Billing.getDefaultInstance()) {
+          getBillingBuilder().mergeFrom(value);
         } else {
           billing_ = value;
         }
-        onChanged();
       } else {
         billingBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00080000;
+      onChanged();
       return this;
     }
     /**
@@ -7698,14 +7710,13 @@ public Builder mergeBilling(com.google.api.Billing value) {
      * <code>.google.api.Billing billing = 26;</code>
      */
     public Builder clearBilling() {
-      if (billingBuilder_ == null) {
-        billing_ = null;
-        onChanged();
-      } else {
-        billing_ = null;
+      bitField0_ = (bitField0_ & ~0x00080000);
+      billing_ = null;
+      if (billingBuilder_ != null) {
+        billingBuilder_.dispose();
         billingBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -7718,7 +7729,7 @@ public Builder clearBilling() {
      * <code>.google.api.Billing billing = 26;</code>
      */
     public com.google.api.Billing.Builder getBillingBuilder() {
-
+      bitField0_ |= 0x00080000;
       onChanged();
       return getBillingFieldBuilder().getBuilder();
     }
@@ -7777,7 +7788,7 @@ public com.google.api.BillingOrBuilder getBillingOrBuilder() {
      * @return Whether the logging field is set.
      */
     public boolean hasLogging() {
-      return loggingBuilder_ != null || logging_ != null;
+      return ((bitField0_ & 0x00100000) != 0);
     }
     /**
      *
@@ -7812,11 +7823,11 @@ public Builder setLogging(com.google.api.Logging value) {
           throw new NullPointerException();
         }
         logging_ = value;
-        onChanged();
       } else {
         loggingBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00100000;
+      onChanged();
       return this;
     }
     /**
@@ -7831,11 +7842,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;
     }
     /**
@@ -7849,16 +7860,18 @@ public Builder setLogging(com.google.api.Logging.Builder builderForValue) {
      */
     public Builder mergeLogging(com.google.api.Logging value) {
       if (loggingBuilder_ == null) {
-        if (logging_ != null) {
-          logging_ = com.google.api.Logging.newBuilder(logging_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00100000) != 0)
+            && logging_ != null
+            && logging_ != com.google.api.Logging.getDefaultInstance()) {
+          getLoggingBuilder().mergeFrom(value);
         } else {
           logging_ = value;
         }
-        onChanged();
       } else {
         loggingBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00100000;
+      onChanged();
       return this;
     }
     /**
@@ -7871,14 +7884,13 @@ public Builder mergeLogging(com.google.api.Logging value) {
      * <code>.google.api.Logging logging = 27;</code>
      */
     public Builder clearLogging() {
-      if (loggingBuilder_ == null) {
-        logging_ = null;
-        onChanged();
-      } else {
-        logging_ = null;
+      bitField0_ = (bitField0_ & ~0x00100000);
+      logging_ = null;
+      if (loggingBuilder_ != null) {
+        loggingBuilder_.dispose();
         loggingBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -7891,7 +7903,7 @@ public Builder clearLogging() {
      * <code>.google.api.Logging logging = 27;</code>
      */
     public com.google.api.Logging.Builder getLoggingBuilder() {
-
+      bitField0_ |= 0x00100000;
       onChanged();
       return getLoggingFieldBuilder().getBuilder();
     }
@@ -7952,7 +7964,7 @@ public com.google.api.LoggingOrBuilder getLoggingOrBuilder() {
      * @return Whether the monitoring field is set.
      */
     public boolean hasMonitoring() {
-      return monitoringBuilder_ != null || monitoring_ != null;
+      return ((bitField0_ & 0x00200000) != 0);
     }
     /**
      *
@@ -7987,11 +7999,11 @@ public Builder setMonitoring(com.google.api.Monitoring value) {
           throw new NullPointerException();
         }
         monitoring_ = value;
-        onChanged();
       } else {
         monitoringBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00200000;
+      onChanged();
       return this;
     }
     /**
@@ -8006,11 +8018,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;
     }
     /**
@@ -8024,17 +8036,18 @@ public Builder setMonitoring(com.google.api.Monitoring.Builder builderForValue)
      */
     public Builder mergeMonitoring(com.google.api.Monitoring value) {
       if (monitoringBuilder_ == null) {
-        if (monitoring_ != null) {
-          monitoring_ =
-              com.google.api.Monitoring.newBuilder(monitoring_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00200000) != 0)
+            && monitoring_ != null
+            && monitoring_ != com.google.api.Monitoring.getDefaultInstance()) {
+          getMonitoringBuilder().mergeFrom(value);
         } else {
           monitoring_ = value;
         }
-        onChanged();
       } else {
         monitoringBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00200000;
+      onChanged();
       return this;
     }
     /**
@@ -8047,14 +8060,13 @@ public Builder mergeMonitoring(com.google.api.Monitoring value) {
      * <code>.google.api.Monitoring monitoring = 28;</code>
      */
     public Builder clearMonitoring() {
-      if (monitoringBuilder_ == null) {
-        monitoring_ = null;
-        onChanged();
-      } else {
-        monitoring_ = null;
+      bitField0_ = (bitField0_ & ~0x00200000);
+      monitoring_ = null;
+      if (monitoringBuilder_ != null) {
+        monitoringBuilder_.dispose();
         monitoringBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -8067,7 +8079,7 @@ public Builder clearMonitoring() {
      * <code>.google.api.Monitoring monitoring = 28;</code>
      */
     public com.google.api.Monitoring.Builder getMonitoringBuilder() {
-
+      bitField0_ |= 0x00200000;
       onChanged();
       return getMonitoringFieldBuilder().getBuilder();
     }
@@ -8131,7 +8143,7 @@ public com.google.api.MonitoringOrBuilder getMonitoringOrBuilder() {
      * @return Whether the systemParameters field is set.
      */
     public boolean hasSystemParameters() {
-      return systemParametersBuilder_ != null || systemParameters_ != null;
+      return ((bitField0_ & 0x00400000) != 0);
     }
     /**
      *
@@ -8168,11 +8180,11 @@ public Builder setSystemParameters(com.google.api.SystemParameters value) {
           throw new NullPointerException();
         }
         systemParameters_ = value;
-        onChanged();
       } else {
         systemParametersBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00400000;
+      onChanged();
       return this;
     }
     /**
@@ -8187,11 +8199,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;
     }
     /**
@@ -8205,19 +8217,18 @@ public Builder setSystemParameters(com.google.api.SystemParameters.Builder build
      */
     public Builder mergeSystemParameters(com.google.api.SystemParameters value) {
       if (systemParametersBuilder_ == null) {
-        if (systemParameters_ != null) {
-          systemParameters_ =
-              com.google.api.SystemParameters.newBuilder(systemParameters_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00400000) != 0)
+            && systemParameters_ != null
+            && systemParameters_ != com.google.api.SystemParameters.getDefaultInstance()) {
+          getSystemParametersBuilder().mergeFrom(value);
         } else {
           systemParameters_ = value;
         }
-        onChanged();
       } else {
         systemParametersBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00400000;
+      onChanged();
       return this;
     }
     /**
@@ -8230,14 +8241,13 @@ public Builder mergeSystemParameters(com.google.api.SystemParameters value) {
      * <code>.google.api.SystemParameters system_parameters = 29;</code>
      */
     public Builder clearSystemParameters() {
-      if (systemParametersBuilder_ == null) {
-        systemParameters_ = null;
-        onChanged();
-      } else {
-        systemParameters_ = null;
+      bitField0_ = (bitField0_ & ~0x00400000);
+      systemParameters_ = null;
+      if (systemParametersBuilder_ != null) {
+        systemParametersBuilder_.dispose();
         systemParametersBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -8250,7 +8260,7 @@ public Builder clearSystemParameters() {
      * <code>.google.api.SystemParameters system_parameters = 29;</code>
      */
     public com.google.api.SystemParameters.Builder getSystemParametersBuilder() {
-
+      bitField0_ |= 0x00400000;
       onChanged();
       return getSystemParametersFieldBuilder().getBuilder();
     }
@@ -8316,7 +8326,7 @@ public com.google.api.SystemParametersOrBuilder getSystemParametersOrBuilder() {
      * @return Whether the sourceInfo field is set.
      */
     public boolean hasSourceInfo() {
-      return sourceInfoBuilder_ != null || sourceInfo_ != null;
+      return ((bitField0_ & 0x00800000) != 0);
     }
     /**
      *
@@ -8351,11 +8361,11 @@ public Builder setSourceInfo(com.google.api.SourceInfo value) {
           throw new NullPointerException();
         }
         sourceInfo_ = value;
-        onChanged();
       } else {
         sourceInfoBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00800000;
+      onChanged();
       return this;
     }
     /**
@@ -8370,11 +8380,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;
     }
     /**
@@ -8388,17 +8398,18 @@ public Builder setSourceInfo(com.google.api.SourceInfo.Builder builderForValue)
      */
     public Builder mergeSourceInfo(com.google.api.SourceInfo value) {
       if (sourceInfoBuilder_ == null) {
-        if (sourceInfo_ != null) {
-          sourceInfo_ =
-              com.google.api.SourceInfo.newBuilder(sourceInfo_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00800000) != 0)
+            && sourceInfo_ != null
+            && sourceInfo_ != com.google.api.SourceInfo.getDefaultInstance()) {
+          getSourceInfoBuilder().mergeFrom(value);
         } else {
           sourceInfo_ = value;
         }
-        onChanged();
       } else {
         sourceInfoBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00800000;
+      onChanged();
       return this;
     }
     /**
@@ -8411,14 +8422,13 @@ public Builder mergeSourceInfo(com.google.api.SourceInfo value) {
      * <code>.google.api.SourceInfo source_info = 37;</code>
      */
     public Builder clearSourceInfo() {
-      if (sourceInfoBuilder_ == null) {
-        sourceInfo_ = null;
-        onChanged();
-      } else {
-        sourceInfo_ = null;
+      bitField0_ = (bitField0_ & ~0x00800000);
+      sourceInfo_ = null;
+      if (sourceInfoBuilder_ != null) {
+        sourceInfoBuilder_.dispose();
         sourceInfoBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -8431,7 +8441,7 @@ public Builder clearSourceInfo() {
      * <code>.google.api.SourceInfo source_info = 37;</code>
      */
     public com.google.api.SourceInfo.Builder getSourceInfoBuilder() {
-
+      bitField0_ |= 0x00800000;
       onChanged();
       return getSourceInfoFieldBuilder().getBuilder();
     }
@@ -8497,7 +8507,7 @@ public com.google.api.SourceInfoOrBuilder getSourceInfoOrBuilder() {
      * @return Whether the publishing field is set.
      */
     public boolean hasPublishing() {
-      return publishingBuilder_ != null || publishing_ != null;
+      return ((bitField0_ & 0x01000000) != 0);
     }
     /**
      *
@@ -8536,11 +8546,11 @@ public Builder setPublishing(com.google.api.Publishing value) {
           throw new NullPointerException();
         }
         publishing_ = value;
-        onChanged();
       } else {
         publishingBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x01000000;
+      onChanged();
       return this;
     }
     /**
@@ -8557,11 +8567,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;
     }
     /**
@@ -8577,17 +8587,18 @@ public Builder setPublishing(com.google.api.Publishing.Builder builderForValue)
      */
     public Builder mergePublishing(com.google.api.Publishing value) {
       if (publishingBuilder_ == null) {
-        if (publishing_ != null) {
-          publishing_ =
-              com.google.api.Publishing.newBuilder(publishing_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x01000000) != 0)
+            && publishing_ != null
+            && publishing_ != com.google.api.Publishing.getDefaultInstance()) {
+          getPublishingBuilder().mergeFrom(value);
         } else {
           publishing_ = value;
         }
-        onChanged();
       } else {
         publishingBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x01000000;
+      onChanged();
       return this;
     }
     /**
@@ -8602,14 +8613,13 @@ public Builder mergePublishing(com.google.api.Publishing value) {
      * <code>.google.api.Publishing publishing = 45;</code>
      */
     public Builder clearPublishing() {
-      if (publishingBuilder_ == null) {
-        publishing_ = null;
-        onChanged();
-      } else {
-        publishing_ = null;
+      bitField0_ = (bitField0_ & ~0x01000000);
+      publishing_ = null;
+      if (publishingBuilder_ != null) {
+        publishingBuilder_.dispose();
         publishingBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -8624,7 +8634,7 @@ public Builder clearPublishing() {
      * <code>.google.api.Publishing publishing = 45;</code>
      */
     public com.google.api.Publishing.Builder getPublishingBuilder() {
-
+      bitField0_ |= 0x01000000;
       onChanged();
       return getPublishingFieldBuilder().getBuilder();
     }
@@ -8694,7 +8704,7 @@ public com.google.api.PublishingOrBuilder getPublishingOrBuilder() {
      * @return Whether the configVersion field is set.
      */
     public boolean hasConfigVersion() {
-      return configVersionBuilder_ != null || configVersion_ != null;
+      return ((bitField0_ & 0x02000000) != 0);
     }
     /**
      *
@@ -8735,11 +8745,11 @@ public Builder setConfigVersion(com.google.protobuf.UInt32Value value) {
           throw new NullPointerException();
         }
         configVersion_ = value;
-        onChanged();
       } else {
         configVersionBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x02000000;
+      onChanged();
       return this;
     }
     /**
@@ -8756,11 +8766,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;
     }
     /**
@@ -8776,19 +8786,18 @@ public Builder setConfigVersion(com.google.protobuf.UInt32Value.Builder builderF
      */
     public Builder mergeConfigVersion(com.google.protobuf.UInt32Value value) {
       if (configVersionBuilder_ == null) {
-        if (configVersion_ != null) {
-          configVersion_ =
-              com.google.protobuf.UInt32Value.newBuilder(configVersion_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x02000000) != 0)
+            && configVersion_ != null
+            && configVersion_ != com.google.protobuf.UInt32Value.getDefaultInstance()) {
+          getConfigVersionBuilder().mergeFrom(value);
         } else {
           configVersion_ = value;
         }
-        onChanged();
       } else {
         configVersionBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x02000000;
+      onChanged();
       return this;
     }
     /**
@@ -8803,14 +8812,13 @@ public Builder mergeConfigVersion(com.google.protobuf.UInt32Value value) {
      * <code>.google.protobuf.UInt32Value config_version = 20;</code>
      */
     public Builder clearConfigVersion() {
-      if (configVersionBuilder_ == null) {
-        configVersion_ = null;
-        onChanged();
-      } else {
-        configVersion_ = null;
+      bitField0_ = (bitField0_ & ~0x02000000);
+      configVersion_ = null;
+      if (configVersionBuilder_ != null) {
+        configVersionBuilder_.dispose();
         configVersionBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -8825,7 +8833,7 @@ public Builder clearConfigVersion() {
      * <code>.google.protobuf.UInt32Value config_version = 20;</code>
      */
     public com.google.protobuf.UInt32Value.Builder getConfigVersionBuilder() {
-
+      bitField0_ |= 0x02000000;
       onChanged();
       return getConfigVersionFieldBuilder().getBuilder();
     }
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 a35ffe5eae..eb2384b6e5 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SourceInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SourceInfo.java
@@ -65,6 +65,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SOURCE_FILES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.protobuf.Any> sourceFiles_;
   /**
    *
@@ -326,6 +328,7 @@ 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 {
@@ -358,7 +361,15 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.SourceInfo result) {
       if (sourceFilesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           sourceFiles_ = java.util.Collections.unmodifiableList(sourceFiles_);
@@ -368,8 +379,10 @@ public com.google.api.SourceInfo buildPartial() {
       } else {
         result.sourceFiles_ = sourceFilesBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.api.SourceInfo result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
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 2fe9e527a1..10cd4584bb 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameter.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameter.java
@@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -120,7 +122,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int HTTP_HEADER_FIELD_NUMBER = 2;
-  private volatile java.lang.Object httpHeader_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object httpHeader_ = "";
   /**
    *
    *
@@ -171,7 +175,9 @@ public com.google.protobuf.ByteString getHttpHeaderBytes() {
   }
 
   public static final int URL_QUERY_PARAMETER_FIELD_NUMBER = 3;
-  private volatile java.lang.Object urlQueryParameter_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object urlQueryParameter_ = "";
   /**
    *
    *
@@ -435,12 +441,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       httpHeader_ = "";
-
       urlQueryParameter_ = "";
-
       return this;
     }
 
@@ -467,13 +471,26 @@ 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);
-      result.name_ = name_;
-      result.httpHeader_ = httpHeader_;
-      result.urlQueryParameter_ = urlQueryParameter_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -521,14 +538,17 @@ 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());
@@ -560,19 +580,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:
@@ -592,6 +612,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -653,8 +675,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -670,8 +692,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;
     }
@@ -692,8 +714,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -762,8 +784,8 @@ public Builder setHttpHeader(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       httpHeader_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -780,8 +802,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;
     }
@@ -803,8 +825,8 @@ public Builder setHttpHeaderBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       httpHeader_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -873,8 +895,8 @@ public Builder setUrlQueryParameter(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       urlQueryParameter_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -891,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;
     }
@@ -914,8 +936,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/SystemParameterRule.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameterRule.java
index a51c856069..dc2b8cbd14 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
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SELECTOR_FIELD_NUMBER = 1;
-  private volatile java.lang.Object selector_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object selector_ = "";
   /**
    *
    *
@@ -123,6 +125,8 @@ public com.google.protobuf.ByteString getSelectorBytes() {
   }
 
   public static final int PARAMETERS_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.SystemParameter> parameters_;
   /**
    *
@@ -418,15 +422,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_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -453,19 +457,31 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.selector_ = selector_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.SystemParameterRule result) {
       if (parametersBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           parameters_ = java.util.Collections.unmodifiableList(parameters_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.parameters_ = parameters_;
       } else {
         result.parameters_ = parametersBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.api.SystemParameterRule result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.selector_ = selector_;
+      }
     }
 
     @java.lang.Override
@@ -515,13 +531,14 @@ 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_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureParametersIsMutable();
             parameters_.addAll(other.parameters_);
@@ -534,7 +551,7 @@ public Builder mergeFrom(com.google.api.SystemParameterRule other) {
             parametersBuilder_.dispose();
             parametersBuilder_ = null;
             parameters_ = other.parameters_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             parametersBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getParametersFieldBuilder()
@@ -573,7 +590,7 @@ public Builder mergeFrom(
             case 10:
               {
                 selector_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -674,8 +691,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       selector_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -693,8 +710,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;
     }
@@ -717,8 +734,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       selector_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -727,9 +744,9 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureParametersIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         parameters_ = new java.util.ArrayList<com.google.api.SystemParameter>(parameters_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -988,7 +1005,7 @@ public Builder addAllParameters(
     public Builder clearParameters() {
       if (parametersBuilder_ == null) {
         parameters_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         parametersBuilder_.clear();
@@ -1137,7 +1154,7 @@ public java.util.List<com.google.api.SystemParameter.Builder> getParametersBuild
                 com.google.api.SystemParameter,
                 com.google.api.SystemParameter.Builder,
                 com.google.api.SystemParameterOrBuilder>(
-                parameters_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                parameters_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         parameters_ = null;
       }
       return parametersBuilder_;
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 a9244090dc..9d6e6d830b 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameters.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameters.java
@@ -71,6 +71,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RULES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.SystemParameterRule> rules_;
   /**
    *
@@ -444,6 +446,7 @@ 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 {
@@ -477,7 +480,15 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.SystemParameters result) {
       if (rulesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           rules_ = java.util.Collections.unmodifiableList(rules_);
@@ -487,8 +498,10 @@ public com.google.api.SystemParameters buildPartial() {
       } else {
         result.rules_ = rulesBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.api.SystemParameters result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
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 6cd73a5bc2..1fcbcf7751 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Usage.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Usage.java
@@ -67,6 +67,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int REQUIREMENTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList requirements_;
   /**
    *
@@ -156,6 +158,8 @@ public com.google.protobuf.ByteString getRequirementsBytes(int index) {
   }
 
   public static final int RULES_FIELD_NUMBER = 6;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.UsageRule> rules_;
   /**
    *
@@ -229,7 +233,9 @@ public com.google.api.UsageRuleOrBuilder getRulesOrBuilder(int index) {
   }
 
   public static final int PRODUCER_NOTIFICATION_CHANNEL_FIELD_NUMBER = 7;
-  private volatile java.lang.Object producerNotificationChannel_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object producerNotificationChannel_ = "";
   /**
    *
    *
@@ -510,6 +516,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       requirements_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000001);
       if (rulesBuilder_ == null) {
@@ -520,7 +527,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000002);
       producerNotificationChannel_ = "";
-
       return this;
     }
 
@@ -546,7 +552,15 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.Usage result) {
       if (((bitField0_ & 0x00000001) != 0)) {
         requirements_ = requirements_.getUnmodifiableView();
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -561,9 +575,13 @@ public com.google.api.Usage buildPartial() {
       } else {
         result.rules_ = rulesBuilder_.build();
       }
-      result.producerNotificationChannel_ = producerNotificationChannel_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.api.Usage result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.producerNotificationChannel_ = producerNotificationChannel_;
+      }
     }
 
     @java.lang.Override
@@ -650,6 +668,7 @@ public Builder mergeFrom(com.google.api.Usage other) {
       }
       if (!other.getProducerNotificationChannel().isEmpty()) {
         producerNotificationChannel_ = other.producerNotificationChannel_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -700,7 +719,7 @@ public Builder mergeFrom(
             case 58:
               {
                 producerNotificationChannel_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 58
             default:
@@ -1392,8 +1411,8 @@ public Builder setProducerNotificationChannel(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       producerNotificationChannel_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1415,8 +1434,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;
     }
@@ -1443,8 +1462,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/UsageRule.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/UsageRule.java
index 4bcca4d312..ffd9c31c06 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
@@ -82,7 +82,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SELECTOR_FIELD_NUMBER = 1;
-  private volatile java.lang.Object selector_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object selector_ = "";
   /**
    *
    *
@@ -135,7 +137,7 @@ public com.google.protobuf.ByteString getSelectorBytes() {
   }
 
   public static final int ALLOW_UNREGISTERED_CALLS_FIELD_NUMBER = 2;
-  private boolean allowUnregisteredCalls_;
+  private boolean allowUnregisteredCalls_ = false;
   /**
    *
    *
@@ -154,7 +156,7 @@ public boolean getAllowUnregisteredCalls() {
   }
 
   public static final int SKIP_SERVICE_CONTROL_FIELD_NUMBER = 3;
-  private boolean skipServiceControl_;
+  private boolean skipServiceControl_ = false;
   /**
    *
    *
@@ -401,12 +403,10 @@ 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;
     }
 
@@ -432,13 +432,26 @@ 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);
-      result.selector_ = selector_;
-      result.allowUnregisteredCalls_ = allowUnregisteredCalls_;
-      result.skipServiceControl_ = skipServiceControl_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -486,6 +499,7 @@ 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) {
@@ -523,19 +537,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:
@@ -555,6 +569,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object selector_ = "";
     /**
      *
@@ -622,8 +638,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       selector_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -641,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;
     }
@@ -665,8 +681,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       selector_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -704,6 +720,7 @@ public boolean getAllowUnregisteredCalls() {
     public Builder setAllowUnregisteredCalls(boolean value) {
 
       allowUnregisteredCalls_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -720,7 +737,7 @@ public Builder setAllowUnregisteredCalls(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearAllowUnregisteredCalls() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       allowUnregisteredCalls_ = false;
       onChanged();
       return this;
@@ -763,6 +780,7 @@ public boolean getSkipServiceControl() {
     public Builder setSkipServiceControl(boolean value) {
 
       skipServiceControl_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -781,7 +799,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/Visibility.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Visibility.java
index 328a2c1d58..e74061dbf2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Visibility.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Visibility.java
@@ -82,6 +82,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RULES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.api.VisibilityRule> rules_;
   /**
    *
@@ -365,6 +367,7 @@ 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 {
@@ -397,7 +400,15 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.api.Visibility result) {
       if (rulesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           rules_ = java.util.Collections.unmodifiableList(rules_);
@@ -407,8 +418,10 @@ public com.google.api.Visibility buildPartial() {
       } else {
         result.rules_ = rulesBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.api.Visibility result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
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 b17af76f69..e86d808534 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/VisibilityRule.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/VisibilityRule.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SELECTOR_FIELD_NUMBER = 1;
-  private volatile java.lang.Object selector_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object selector_ = "";
   /**
    *
    *
@@ -121,7 +123,9 @@ public com.google.protobuf.ByteString getSelectorBytes() {
   }
 
   public static final int RESTRICTION_FIELD_NUMBER = 2;
-  private volatile java.lang.Object restriction_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object restriction_ = "";
   /**
    *
    *
@@ -392,10 +396,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       selector_ = "";
-
       restriction_ = "";
-
       return this;
     }
 
@@ -421,12 +424,23 @@ 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);
-      result.selector_ = selector_;
-      result.restriction_ = restriction_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -474,10 +488,12 @@ 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());
@@ -509,13 +525,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:
@@ -535,6 +551,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object selector_ = "";
     /**
      *
@@ -602,8 +620,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       selector_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -621,8 +639,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;
     }
@@ -645,8 +663,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       selector_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -742,8 +760,8 @@ public Builder setRestriction(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       restriction_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -769,8 +787,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;
     }
@@ -801,8 +819,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/cloud/audit/AuditLog.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLog.java
index fcf5897a8d..32b9812d7b 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLog.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLog.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SERVICE_NAME_FIELD_NUMBER = 7;
-  private volatile java.lang.Object serviceName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object serviceName_ = "";
   /**
    *
    *
@@ -121,7 +123,9 @@ public com.google.protobuf.ByteString getServiceNameBytes() {
   }
 
   public static final int METHOD_NAME_FIELD_NUMBER = 8;
-  private volatile java.lang.Object methodName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object methodName_ = "";
   /**
    *
    *
@@ -178,7 +182,9 @@ public com.google.protobuf.ByteString getMethodNameBytes() {
   }
 
   public static final int RESOURCE_NAME_FIELD_NUMBER = 11;
-  private volatile java.lang.Object resourceName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object resourceName_ = "";
   /**
    *
    *
@@ -279,7 +285,9 @@ public com.google.cloud.audit.ResourceLocation getResourceLocation() {
    */
   @java.lang.Override
   public com.google.cloud.audit.ResourceLocationOrBuilder getResourceLocationOrBuilder() {
-    return getResourceLocation();
+    return resourceLocation_ == null
+        ? com.google.cloud.audit.ResourceLocation.getDefaultInstance()
+        : resourceLocation_;
   }
 
   public static final int RESOURCE_ORIGINAL_STATE_FIELD_NUMBER = 19;
@@ -345,11 +353,13 @@ public com.google.protobuf.Struct getResourceOriginalState() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getResourceOriginalStateOrBuilder() {
-    return getResourceOriginalState();
+    return resourceOriginalState_ == null
+        ? com.google.protobuf.Struct.getDefaultInstance()
+        : resourceOriginalState_;
   }
 
   public static final int NUM_RESPONSE_ITEMS_FIELD_NUMBER = 12;
-  private long numResponseItems_;
+  private long numResponseItems_ = 0L;
   /**
    *
    *
@@ -410,7 +420,7 @@ public com.google.rpc.Status getStatus() {
    */
   @java.lang.Override
   public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
-    return getStatus();
+    return status_ == null ? com.google.rpc.Status.getDefaultInstance() : status_;
   }
 
   public static final int AUTHENTICATION_INFO_FIELD_NUMBER = 3;
@@ -458,10 +468,14 @@ public com.google.cloud.audit.AuthenticationInfo getAuthenticationInfo() {
    */
   @java.lang.Override
   public com.google.cloud.audit.AuthenticationInfoOrBuilder getAuthenticationInfoOrBuilder() {
-    return getAuthenticationInfo();
+    return authenticationInfo_ == null
+        ? com.google.cloud.audit.AuthenticationInfo.getDefaultInstance()
+        : authenticationInfo_;
   }
 
   public static final int AUTHORIZATION_INFO_FIELD_NUMBER = 9;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.audit.AuthorizationInfo> authorizationInfo_;
   /**
    *
@@ -592,7 +606,9 @@ public com.google.cloud.audit.PolicyViolationInfo getPolicyViolationInfo() {
    */
   @java.lang.Override
   public com.google.cloud.audit.PolicyViolationInfoOrBuilder getPolicyViolationInfoOrBuilder() {
-    return getPolicyViolationInfo();
+    return policyViolationInfo_ == null
+        ? com.google.cloud.audit.PolicyViolationInfo.getDefaultInstance()
+        : policyViolationInfo_;
   }
 
   public static final int REQUEST_METADATA_FIELD_NUMBER = 4;
@@ -640,7 +656,9 @@ public com.google.cloud.audit.RequestMetadata getRequestMetadata() {
    */
   @java.lang.Override
   public com.google.cloud.audit.RequestMetadataOrBuilder getRequestMetadataOrBuilder() {
-    return getRequestMetadata();
+    return requestMetadata_ == null
+        ? com.google.cloud.audit.RequestMetadata.getDefaultInstance()
+        : requestMetadata_;
   }
 
   public static final int REQUEST_FIELD_NUMBER = 16;
@@ -701,7 +719,7 @@ public com.google.protobuf.Struct getRequest() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getRequestOrBuilder() {
-    return getRequest();
+    return request_ == null ? com.google.protobuf.Struct.getDefaultInstance() : request_;
   }
 
   public static final int RESPONSE_FIELD_NUMBER = 17;
@@ -762,7 +780,7 @@ public com.google.protobuf.Struct getResponse() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getResponseOrBuilder() {
-    return getResponse();
+    return response_ == null ? com.google.protobuf.Struct.getDefaultInstance() : response_;
   }
 
   public static final int METADATA_FIELD_NUMBER = 18;
@@ -811,7 +829,7 @@ public com.google.protobuf.Struct getMetadata() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getMetadataOrBuilder() {
-    return getMetadata();
+    return metadata_ == null ? com.google.protobuf.Struct.getDefaultInstance() : metadata_;
   }
 
   public static final int SERVICE_DATA_FIELD_NUMBER = 15;
@@ -870,7 +888,7 @@ public com.google.protobuf.Any getServiceData() {
   @java.lang.Override
   @java.lang.Deprecated
   public com.google.protobuf.AnyOrBuilder getServiceDataOrBuilder() {
-    return getServiceData();
+    return serviceData_ == null ? com.google.protobuf.Any.getDefaultInstance() : serviceData_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -1248,36 +1266,29 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       serviceName_ = "";
-
       methodName_ = "";
-
       resourceName_ = "";
-
-      if (resourceLocationBuilder_ == null) {
-        resourceLocation_ = null;
-      } else {
-        resourceLocation_ = null;
+      resourceLocation_ = null;
+      if (resourceLocationBuilder_ != null) {
+        resourceLocationBuilder_.dispose();
         resourceLocationBuilder_ = null;
       }
-      if (resourceOriginalStateBuilder_ == null) {
-        resourceOriginalState_ = null;
-      } else {
-        resourceOriginalState_ = null;
+      resourceOriginalState_ = null;
+      if (resourceOriginalStateBuilder_ != null) {
+        resourceOriginalStateBuilder_.dispose();
         resourceOriginalStateBuilder_ = null;
       }
       numResponseItems_ = 0L;
-
-      if (statusBuilder_ == null) {
-        status_ = null;
-      } else {
-        status_ = null;
+      status_ = null;
+      if (statusBuilder_ != null) {
+        statusBuilder_.dispose();
         statusBuilder_ = null;
       }
-      if (authenticationInfoBuilder_ == null) {
-        authenticationInfo_ = null;
-      } else {
-        authenticationInfo_ = null;
+      authenticationInfo_ = null;
+      if (authenticationInfoBuilder_ != null) {
+        authenticationInfoBuilder_.dispose();
         authenticationInfoBuilder_ = null;
       }
       if (authorizationInfoBuilder_ == null) {
@@ -1286,41 +1297,35 @@ public Builder clear() {
         authorizationInfo_ = null;
         authorizationInfoBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
-      if (policyViolationInfoBuilder_ == null) {
-        policyViolationInfo_ = null;
-      } else {
-        policyViolationInfo_ = null;
+      bitField0_ = (bitField0_ & ~0x00000100);
+      policyViolationInfo_ = null;
+      if (policyViolationInfoBuilder_ != null) {
+        policyViolationInfoBuilder_.dispose();
         policyViolationInfoBuilder_ = null;
       }
-      if (requestMetadataBuilder_ == null) {
-        requestMetadata_ = null;
-      } else {
-        requestMetadata_ = null;
+      requestMetadata_ = null;
+      if (requestMetadataBuilder_ != null) {
+        requestMetadataBuilder_.dispose();
         requestMetadataBuilder_ = null;
       }
-      if (requestBuilder_ == null) {
-        request_ = null;
-      } else {
-        request_ = null;
+      request_ = null;
+      if (requestBuilder_ != null) {
+        requestBuilder_.dispose();
         requestBuilder_ = null;
       }
-      if (responseBuilder_ == null) {
-        response_ = null;
-      } else {
-        response_ = null;
+      response_ = null;
+      if (responseBuilder_ != null) {
+        responseBuilder_.dispose();
         responseBuilder_ = null;
       }
-      if (metadataBuilder_ == null) {
-        metadata_ = null;
-      } else {
-        metadata_ = null;
+      metadata_ = null;
+      if (metadataBuilder_ != null) {
+        metadataBuilder_.dispose();
         metadataBuilder_ = null;
       }
-      if (serviceDataBuilder_ == null) {
-        serviceData_ = null;
-      } else {
-        serviceData_ = null;
+      serviceData_ = null;
+      if (serviceDataBuilder_ != null) {
+        serviceDataBuilder_.dispose();
         serviceDataBuilder_ = null;
       }
       return this;
@@ -1349,72 +1354,82 @@ 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);
-      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();
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.cloud.audit.AuditLog result) {
       if (authorizationInfoBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000100) != 0)) {
           authorizationInfo_ = java.util.Collections.unmodifiableList(authorizationInfo_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000100);
         }
         result.authorizationInfo_ = authorizationInfo_;
       } else {
         result.authorizationInfo_ = authorizationInfoBuilder_.build();
       }
-      if (policyViolationInfoBuilder_ == null) {
-        result.policyViolationInfo_ = policyViolationInfo_;
-      } else {
-        result.policyViolationInfo_ = policyViolationInfoBuilder_.build();
+    }
+
+    private void buildPartial0(com.google.cloud.audit.AuditLog result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.serviceName_ = serviceName_;
       }
-      if (requestMetadataBuilder_ == null) {
-        result.requestMetadata_ = requestMetadata_;
-      } else {
-        result.requestMetadata_ = requestMetadataBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.methodName_ = methodName_;
       }
-      if (requestBuilder_ == null) {
-        result.request_ = request_;
-      } else {
-        result.request_ = requestBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.resourceName_ = resourceName_;
       }
-      if (responseBuilder_ == null) {
-        result.response_ = response_;
-      } else {
-        result.response_ = responseBuilder_.build();
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.resourceLocation_ =
+            resourceLocationBuilder_ == null ? resourceLocation_ : resourceLocationBuilder_.build();
       }
-      if (metadataBuilder_ == null) {
-        result.metadata_ = metadata_;
-      } else {
-        result.metadata_ = metadataBuilder_.build();
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.resourceOriginalState_ =
+            resourceOriginalStateBuilder_ == null
+                ? resourceOriginalState_
+                : resourceOriginalStateBuilder_.build();
       }
-      if (serviceDataBuilder_ == null) {
-        result.serviceData_ = serviceData_;
-      } else {
-        result.serviceData_ = serviceDataBuilder_.build();
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.numResponseItems_ = numResponseItems_;
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.status_ = statusBuilder_ == null ? status_ : statusBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.authenticationInfo_ =
+            authenticationInfoBuilder_ == null
+                ? authenticationInfo_
+                : authenticationInfoBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000200) != 0)) {
+        result.policyViolationInfo_ =
+            policyViolationInfoBuilder_ == null
+                ? policyViolationInfo_
+                : policyViolationInfoBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000400) != 0)) {
+        result.requestMetadata_ =
+            requestMetadataBuilder_ == null ? requestMetadata_ : requestMetadataBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000800) != 0)) {
+        result.request_ = requestBuilder_ == null ? request_ : requestBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00001000) != 0)) {
+        result.response_ = responseBuilder_ == null ? response_ : responseBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00002000) != 0)) {
+        result.metadata_ = metadataBuilder_ == null ? metadata_ : metadataBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00004000) != 0)) {
+        result.serviceData_ =
+            serviceDataBuilder_ == null ? serviceData_ : serviceDataBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -1464,14 +1479,17 @@ 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()) {
@@ -1493,7 +1511,7 @@ public Builder mergeFrom(com.google.cloud.audit.AuditLog other) {
         if (!other.authorizationInfo_.isEmpty()) {
           if (authorizationInfo_.isEmpty()) {
             authorizationInfo_ = other.authorizationInfo_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000100);
           } else {
             ensureAuthorizationInfoIsMutable();
             authorizationInfo_.addAll(other.authorizationInfo_);
@@ -1506,7 +1524,7 @@ public Builder mergeFrom(com.google.cloud.audit.AuditLog other) {
             authorizationInfoBuilder_.dispose();
             authorizationInfoBuilder_ = null;
             authorizationInfo_ = other.authorizationInfo_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000100);
             authorizationInfoBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getAuthorizationInfoFieldBuilder()
@@ -1563,32 +1581,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:
@@ -1607,58 +1625,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:
@@ -1744,8 +1762,8 @@ public Builder setServiceName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       serviceName_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1762,8 +1780,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;
     }
@@ -1785,8 +1803,8 @@ public Builder setServiceNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       serviceName_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1864,8 +1882,8 @@ public Builder setMethodName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       methodName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1885,8 +1903,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;
     }
@@ -1911,8 +1929,8 @@ public Builder setMethodNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       methodName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1990,8 +2008,8 @@ public Builder setResourceName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       resourceName_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2011,8 +2029,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;
     }
@@ -2037,8 +2055,8 @@ public Builder setResourceNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       resourceName_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2061,7 +2079,7 @@ public Builder setResourceNameBytes(com.google.protobuf.ByteString value) {
      * @return Whether the resourceLocation field is set.
      */
     public boolean hasResourceLocation() {
-      return resourceLocationBuilder_ != null || resourceLocation_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -2098,11 +2116,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;
     }
     /**
@@ -2118,11 +2136,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;
     }
     /**
@@ -2136,19 +2154,18 @@ public Builder setResourceLocation(
      */
     public Builder mergeResourceLocation(com.google.cloud.audit.ResourceLocation value) {
       if (resourceLocationBuilder_ == null) {
-        if (resourceLocation_ != null) {
-          resourceLocation_ =
-              com.google.cloud.audit.ResourceLocation.newBuilder(resourceLocation_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && resourceLocation_ != null
+            && resourceLocation_ != com.google.cloud.audit.ResourceLocation.getDefaultInstance()) {
+          getResourceLocationBuilder().mergeFrom(value);
         } else {
           resourceLocation_ = value;
         }
-        onChanged();
       } else {
         resourceLocationBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -2161,14 +2178,13 @@ public Builder mergeResourceLocation(com.google.cloud.audit.ResourceLocation val
      * <code>.google.cloud.audit.ResourceLocation resource_location = 20;</code>
      */
     public Builder clearResourceLocation() {
-      if (resourceLocationBuilder_ == null) {
-        resourceLocation_ = null;
-        onChanged();
-      } else {
-        resourceLocation_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      resourceLocation_ = null;
+      if (resourceLocationBuilder_ != null) {
+        resourceLocationBuilder_.dispose();
         resourceLocationBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2181,7 +2197,7 @@ public Builder clearResourceLocation() {
      * <code>.google.cloud.audit.ResourceLocation resource_location = 20;</code>
      */
     public com.google.cloud.audit.ResourceLocation.Builder getResourceLocationBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getResourceLocationFieldBuilder().getBuilder();
     }
@@ -2253,7 +2269,7 @@ public com.google.cloud.audit.ResourceLocationOrBuilder getResourceLocationOrBui
      * @return Whether the resourceOriginalState field is set.
      */
     public boolean hasResourceOriginalState() {
-      return resourceOriginalStateBuilder_ != null || resourceOriginalState_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -2302,11 +2318,11 @@ public Builder setResourceOriginalState(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         resourceOriginalState_ = value;
-        onChanged();
       } else {
         resourceOriginalStateBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2327,11 +2343,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;
     }
     /**
@@ -2351,19 +2367,18 @@ public Builder setResourceOriginalState(com.google.protobuf.Struct.Builder build
      */
     public Builder mergeResourceOriginalState(com.google.protobuf.Struct value) {
       if (resourceOriginalStateBuilder_ == null) {
-        if (resourceOriginalState_ != null) {
-          resourceOriginalState_ =
-              com.google.protobuf.Struct.newBuilder(resourceOriginalState_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && resourceOriginalState_ != null
+            && resourceOriginalState_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getResourceOriginalStateBuilder().mergeFrom(value);
         } else {
           resourceOriginalState_ = value;
         }
-        onChanged();
       } else {
         resourceOriginalStateBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2382,14 +2397,13 @@ public Builder mergeResourceOriginalState(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct resource_original_state = 19;</code>
      */
     public Builder clearResourceOriginalState() {
-      if (resourceOriginalStateBuilder_ == null) {
-        resourceOriginalState_ = null;
-        onChanged();
-      } else {
-        resourceOriginalState_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      resourceOriginalState_ = null;
+      if (resourceOriginalStateBuilder_ != null) {
+        resourceOriginalStateBuilder_.dispose();
         resourceOriginalStateBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2408,7 +2422,7 @@ public Builder clearResourceOriginalState() {
      * <code>.google.protobuf.Struct resource_original_state = 19;</code>
      */
     public com.google.protobuf.Struct.Builder getResourceOriginalStateBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getResourceOriginalStateFieldBuilder().getBuilder();
     }
@@ -2501,6 +2515,7 @@ public long getNumResponseItems() {
     public Builder setNumResponseItems(long value) {
 
       numResponseItems_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2517,7 +2532,7 @@ public Builder setNumResponseItems(long value) {
      * @return This builder for chaining.
      */
     public Builder clearNumResponseItems() {
-
+      bitField0_ = (bitField0_ & ~0x00000020);
       numResponseItems_ = 0L;
       onChanged();
       return this;
@@ -2539,7 +2554,7 @@ public Builder clearNumResponseItems() {
      * @return Whether the status field is set.
      */
     public boolean hasStatus() {
-      return statusBuilder_ != null || status_ != null;
+      return ((bitField0_ & 0x00000040) != 0);
     }
     /**
      *
@@ -2574,11 +2589,11 @@ public Builder setStatus(com.google.rpc.Status value) {
           throw new NullPointerException();
         }
         status_ = value;
-        onChanged();
       } else {
         statusBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2593,11 +2608,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;
     }
     /**
@@ -2611,16 +2626,18 @@ public Builder setStatus(com.google.rpc.Status.Builder builderForValue) {
      */
     public Builder mergeStatus(com.google.rpc.Status value) {
       if (statusBuilder_ == null) {
-        if (status_ != null) {
-          status_ = com.google.rpc.Status.newBuilder(status_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000040) != 0)
+            && status_ != null
+            && status_ != com.google.rpc.Status.getDefaultInstance()) {
+          getStatusBuilder().mergeFrom(value);
         } else {
           status_ = value;
         }
-        onChanged();
       } else {
         statusBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2633,14 +2650,13 @@ public Builder mergeStatus(com.google.rpc.Status value) {
      * <code>.google.rpc.Status status = 2;</code>
      */
     public Builder clearStatus() {
-      if (statusBuilder_ == null) {
-        status_ = null;
-        onChanged();
-      } else {
-        status_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      status_ = null;
+      if (statusBuilder_ != null) {
+        statusBuilder_.dispose();
         statusBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2653,7 +2669,7 @@ public Builder clearStatus() {
      * <code>.google.rpc.Status status = 2;</code>
      */
     public com.google.rpc.Status.Builder getStatusBuilder() {
-
+      bitField0_ |= 0x00000040;
       onChanged();
       return getStatusFieldBuilder().getBuilder();
     }
@@ -2714,7 +2730,7 @@ public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
      * @return Whether the authenticationInfo field is set.
      */
     public boolean hasAuthenticationInfo() {
-      return authenticationInfoBuilder_ != null || authenticationInfo_ != null;
+      return ((bitField0_ & 0x00000080) != 0);
     }
     /**
      *
@@ -2751,11 +2767,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;
     }
     /**
@@ -2771,11 +2787,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;
     }
     /**
@@ -2789,19 +2805,19 @@ public Builder setAuthenticationInfo(
      */
     public Builder mergeAuthenticationInfo(com.google.cloud.audit.AuthenticationInfo value) {
       if (authenticationInfoBuilder_ == null) {
-        if (authenticationInfo_ != null) {
-          authenticationInfo_ =
-              com.google.cloud.audit.AuthenticationInfo.newBuilder(authenticationInfo_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000080) != 0)
+            && authenticationInfo_ != null
+            && authenticationInfo_
+                != com.google.cloud.audit.AuthenticationInfo.getDefaultInstance()) {
+          getAuthenticationInfoBuilder().mergeFrom(value);
         } else {
           authenticationInfo_ = value;
         }
-        onChanged();
       } else {
         authenticationInfoBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2814,14 +2830,13 @@ public Builder mergeAuthenticationInfo(com.google.cloud.audit.AuthenticationInfo
      * <code>.google.cloud.audit.AuthenticationInfo authentication_info = 3;</code>
      */
     public Builder clearAuthenticationInfo() {
-      if (authenticationInfoBuilder_ == null) {
-        authenticationInfo_ = null;
-        onChanged();
-      } else {
-        authenticationInfo_ = null;
+      bitField0_ = (bitField0_ & ~0x00000080);
+      authenticationInfo_ = null;
+      if (authenticationInfoBuilder_ != null) {
+        authenticationInfoBuilder_.dispose();
         authenticationInfoBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2834,7 +2849,7 @@ public Builder clearAuthenticationInfo() {
      * <code>.google.cloud.audit.AuthenticationInfo authentication_info = 3;</code>
      */
     public com.google.cloud.audit.AuthenticationInfo.Builder getAuthenticationInfoBuilder() {
-
+      bitField0_ |= 0x00000080;
       onChanged();
       return getAuthenticationInfoFieldBuilder().getBuilder();
     }
@@ -2886,10 +2901,10 @@ public com.google.cloud.audit.AuthenticationInfoOrBuilder getAuthenticationInfoO
         java.util.Collections.emptyList();
 
     private void ensureAuthorizationInfoIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000100) != 0)) {
         authorizationInfo_ =
             new java.util.ArrayList<com.google.cloud.audit.AuthorizationInfo>(authorizationInfo_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000100;
       }
     }
 
@@ -3127,7 +3142,7 @@ public Builder addAllAuthorizationInfo(
     public Builder clearAuthorizationInfo() {
       if (authorizationInfoBuilder_ == null) {
         authorizationInfo_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000100);
         onChanged();
       } else {
         authorizationInfoBuilder_.clear();
@@ -3265,7 +3280,7 @@ public com.google.cloud.audit.AuthorizationInfo.Builder addAuthorizationInfoBuil
                 com.google.cloud.audit.AuthorizationInfo.Builder,
                 com.google.cloud.audit.AuthorizationInfoOrBuilder>(
                 authorizationInfo_,
-                ((bitField0_ & 0x00000001) != 0),
+                ((bitField0_ & 0x00000100) != 0),
                 getParentForChildren(),
                 isClean());
         authorizationInfo_ = null;
@@ -3293,7 +3308,7 @@ public com.google.cloud.audit.AuthorizationInfo.Builder addAuthorizationInfoBuil
      * @return Whether the policyViolationInfo field is set.
      */
     public boolean hasPolicyViolationInfo() {
-      return policyViolationInfoBuilder_ != null || policyViolationInfo_ != null;
+      return ((bitField0_ & 0x00000200) != 0);
     }
     /**
      *
@@ -3334,11 +3349,11 @@ public Builder setPolicyViolationInfo(com.google.cloud.audit.PolicyViolationInfo
           throw new NullPointerException();
         }
         policyViolationInfo_ = value;
-        onChanged();
       } else {
         policyViolationInfoBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -3356,11 +3371,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;
     }
     /**
@@ -3376,19 +3391,19 @@ public Builder setPolicyViolationInfo(
      */
     public Builder mergePolicyViolationInfo(com.google.cloud.audit.PolicyViolationInfo value) {
       if (policyViolationInfoBuilder_ == null) {
-        if (policyViolationInfo_ != null) {
-          policyViolationInfo_ =
-              com.google.cloud.audit.PolicyViolationInfo.newBuilder(policyViolationInfo_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000200) != 0)
+            && policyViolationInfo_ != null
+            && policyViolationInfo_
+                != com.google.cloud.audit.PolicyViolationInfo.getDefaultInstance()) {
+          getPolicyViolationInfoBuilder().mergeFrom(value);
         } else {
           policyViolationInfo_ = value;
         }
-        onChanged();
       } else {
         policyViolationInfoBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -3403,14 +3418,13 @@ public Builder mergePolicyViolationInfo(com.google.cloud.audit.PolicyViolationIn
      * <code>.google.cloud.audit.PolicyViolationInfo policy_violation_info = 25;</code>
      */
     public Builder clearPolicyViolationInfo() {
-      if (policyViolationInfoBuilder_ == null) {
-        policyViolationInfo_ = null;
-        onChanged();
-      } else {
-        policyViolationInfo_ = null;
+      bitField0_ = (bitField0_ & ~0x00000200);
+      policyViolationInfo_ = null;
+      if (policyViolationInfoBuilder_ != null) {
+        policyViolationInfoBuilder_.dispose();
         policyViolationInfoBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3425,7 +3439,7 @@ public Builder clearPolicyViolationInfo() {
      * <code>.google.cloud.audit.PolicyViolationInfo policy_violation_info = 25;</code>
      */
     public com.google.cloud.audit.PolicyViolationInfo.Builder getPolicyViolationInfoBuilder() {
-
+      bitField0_ |= 0x00000200;
       onChanged();
       return getPolicyViolationInfoFieldBuilder().getBuilder();
     }
@@ -3495,7 +3509,7 @@ public com.google.cloud.audit.PolicyViolationInfoOrBuilder getPolicyViolationInf
      * @return Whether the requestMetadata field is set.
      */
     public boolean hasRequestMetadata() {
-      return requestMetadataBuilder_ != null || requestMetadata_ != null;
+      return ((bitField0_ & 0x00000400) != 0);
     }
     /**
      *
@@ -3532,11 +3546,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;
     }
     /**
@@ -3552,11 +3566,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;
     }
     /**
@@ -3570,19 +3584,18 @@ public Builder setRequestMetadata(
      */
     public Builder mergeRequestMetadata(com.google.cloud.audit.RequestMetadata value) {
       if (requestMetadataBuilder_ == null) {
-        if (requestMetadata_ != null) {
-          requestMetadata_ =
-              com.google.cloud.audit.RequestMetadata.newBuilder(requestMetadata_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000400) != 0)
+            && requestMetadata_ != null
+            && requestMetadata_ != com.google.cloud.audit.RequestMetadata.getDefaultInstance()) {
+          getRequestMetadataBuilder().mergeFrom(value);
         } else {
           requestMetadata_ = value;
         }
-        onChanged();
       } else {
         requestMetadataBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000400;
+      onChanged();
       return this;
     }
     /**
@@ -3595,14 +3608,13 @@ public Builder mergeRequestMetadata(com.google.cloud.audit.RequestMetadata value
      * <code>.google.cloud.audit.RequestMetadata request_metadata = 4;</code>
      */
     public Builder clearRequestMetadata() {
-      if (requestMetadataBuilder_ == null) {
-        requestMetadata_ = null;
-        onChanged();
-      } else {
-        requestMetadata_ = null;
+      bitField0_ = (bitField0_ & ~0x00000400);
+      requestMetadata_ = null;
+      if (requestMetadataBuilder_ != null) {
+        requestMetadataBuilder_.dispose();
         requestMetadataBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3615,7 +3627,7 @@ public Builder clearRequestMetadata() {
      * <code>.google.cloud.audit.RequestMetadata request_metadata = 4;</code>
      */
     public com.google.cloud.audit.RequestMetadata.Builder getRequestMetadataBuilder() {
-
+      bitField0_ |= 0x00000400;
       onChanged();
       return getRequestMetadataFieldBuilder().getBuilder();
     }
@@ -3686,7 +3698,7 @@ public com.google.cloud.audit.RequestMetadataOrBuilder getRequestMetadataOrBuild
      * @return Whether the request field is set.
      */
     public boolean hasRequest() {
-      return requestBuilder_ != null || request_ != null;
+      return ((bitField0_ & 0x00000800) != 0);
     }
     /**
      *
@@ -3731,11 +3743,11 @@ public Builder setRequest(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         request_ = value;
-        onChanged();
       } else {
         requestBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000800;
+      onChanged();
       return this;
     }
     /**
@@ -3755,11 +3767,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;
     }
     /**
@@ -3778,17 +3790,18 @@ public Builder setRequest(com.google.protobuf.Struct.Builder builderForValue) {
      */
     public Builder mergeRequest(com.google.protobuf.Struct value) {
       if (requestBuilder_ == null) {
-        if (request_ != null) {
-          request_ =
-              com.google.protobuf.Struct.newBuilder(request_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000800) != 0)
+            && request_ != null
+            && request_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getRequestBuilder().mergeFrom(value);
         } else {
           request_ = value;
         }
-        onChanged();
       } else {
         requestBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000800;
+      onChanged();
       return this;
     }
     /**
@@ -3806,14 +3819,13 @@ public Builder mergeRequest(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct request = 16;</code>
      */
     public Builder clearRequest() {
-      if (requestBuilder_ == null) {
-        request_ = null;
-        onChanged();
-      } else {
-        request_ = null;
+      bitField0_ = (bitField0_ & ~0x00000800);
+      request_ = null;
+      if (requestBuilder_ != null) {
+        requestBuilder_.dispose();
         requestBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3831,7 +3843,7 @@ public Builder clearRequest() {
      * <code>.google.protobuf.Struct request = 16;</code>
      */
     public com.google.protobuf.Struct.Builder getRequestBuilder() {
-
+      bitField0_ |= 0x00000800;
       onChanged();
       return getRequestFieldBuilder().getBuilder();
     }
@@ -3910,7 +3922,7 @@ public com.google.protobuf.StructOrBuilder getRequestOrBuilder() {
      * @return Whether the response field is set.
      */
     public boolean hasResponse() {
-      return responseBuilder_ != null || response_ != null;
+      return ((bitField0_ & 0x00001000) != 0);
     }
     /**
      *
@@ -3955,11 +3967,11 @@ public Builder setResponse(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         response_ = value;
-        onChanged();
       } else {
         responseBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00001000;
+      onChanged();
       return this;
     }
     /**
@@ -3979,11 +3991,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;
     }
     /**
@@ -4002,17 +4014,18 @@ public Builder setResponse(com.google.protobuf.Struct.Builder builderForValue) {
      */
     public Builder mergeResponse(com.google.protobuf.Struct value) {
       if (responseBuilder_ == null) {
-        if (response_ != null) {
-          response_ =
-              com.google.protobuf.Struct.newBuilder(response_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00001000) != 0)
+            && response_ != null
+            && response_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getResponseBuilder().mergeFrom(value);
         } else {
           response_ = value;
         }
-        onChanged();
       } else {
         responseBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00001000;
+      onChanged();
       return this;
     }
     /**
@@ -4030,14 +4043,13 @@ public Builder mergeResponse(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct response = 17;</code>
      */
     public Builder clearResponse() {
-      if (responseBuilder_ == null) {
-        response_ = null;
-        onChanged();
-      } else {
-        response_ = null;
+      bitField0_ = (bitField0_ & ~0x00001000);
+      response_ = null;
+      if (responseBuilder_ != null) {
+        responseBuilder_.dispose();
         responseBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -4055,7 +4067,7 @@ public Builder clearResponse() {
      * <code>.google.protobuf.Struct response = 17;</code>
      */
     public com.google.protobuf.Struct.Builder getResponseBuilder() {
-
+      bitField0_ |= 0x00001000;
       onChanged();
       return getResponseFieldBuilder().getBuilder();
     }
@@ -4130,7 +4142,7 @@ public com.google.protobuf.StructOrBuilder getResponseOrBuilder() {
      * @return Whether the metadata field is set.
      */
     public boolean hasMetadata() {
-      return metadataBuilder_ != null || metadata_ != null;
+      return ((bitField0_ & 0x00002000) != 0);
     }
     /**
      *
@@ -4167,11 +4179,11 @@ public Builder setMetadata(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         metadata_ = value;
-        onChanged();
       } else {
         metadataBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00002000;
+      onChanged();
       return this;
     }
     /**
@@ -4187,11 +4199,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;
     }
     /**
@@ -4206,17 +4218,18 @@ public Builder setMetadata(com.google.protobuf.Struct.Builder builderForValue) {
      */
     public Builder mergeMetadata(com.google.protobuf.Struct value) {
       if (metadataBuilder_ == null) {
-        if (metadata_ != null) {
-          metadata_ =
-              com.google.protobuf.Struct.newBuilder(metadata_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00002000) != 0)
+            && metadata_ != null
+            && metadata_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getMetadataBuilder().mergeFrom(value);
         } else {
           metadata_ = value;
         }
-        onChanged();
       } else {
         metadataBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00002000;
+      onChanged();
       return this;
     }
     /**
@@ -4230,14 +4243,13 @@ public Builder mergeMetadata(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct metadata = 18;</code>
      */
     public Builder clearMetadata() {
-      if (metadataBuilder_ == null) {
-        metadata_ = null;
-        onChanged();
-      } else {
-        metadata_ = null;
+      bitField0_ = (bitField0_ & ~0x00002000);
+      metadata_ = null;
+      if (metadataBuilder_ != null) {
+        metadataBuilder_.dispose();
         metadataBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -4251,7 +4263,7 @@ public Builder clearMetadata() {
      * <code>.google.protobuf.Struct metadata = 18;</code>
      */
     public com.google.protobuf.Struct.Builder getMetadataBuilder() {
-
+      bitField0_ |= 0x00002000;
       onChanged();
       return getMetadataFieldBuilder().getBuilder();
     }
@@ -4322,7 +4334,7 @@ public com.google.protobuf.StructOrBuilder getMetadataOrBuilder() {
      */
     @java.lang.Deprecated
     public boolean hasServiceData() {
-      return serviceDataBuilder_ != null || serviceData_ != null;
+      return ((bitField0_ & 0x00004000) != 0);
     }
     /**
      *
@@ -4365,11 +4377,11 @@ public Builder setServiceData(com.google.protobuf.Any value) {
           throw new NullPointerException();
         }
         serviceData_ = value;
-        onChanged();
       } else {
         serviceDataBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00004000;
+      onChanged();
       return this;
     }
     /**
@@ -4387,11 +4399,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;
     }
     /**
@@ -4408,17 +4420,18 @@ public Builder setServiceData(com.google.protobuf.Any.Builder builderForValue) {
     @java.lang.Deprecated
     public Builder mergeServiceData(com.google.protobuf.Any value) {
       if (serviceDataBuilder_ == null) {
-        if (serviceData_ != null) {
-          serviceData_ =
-              com.google.protobuf.Any.newBuilder(serviceData_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00004000) != 0)
+            && serviceData_ != null
+            && serviceData_ != com.google.protobuf.Any.getDefaultInstance()) {
+          getServiceDataBuilder().mergeFrom(value);
         } else {
           serviceData_ = value;
         }
-        onChanged();
       } else {
         serviceDataBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00004000;
+      onChanged();
       return this;
     }
     /**
@@ -4434,14 +4447,13 @@ public Builder mergeServiceData(com.google.protobuf.Any value) {
      */
     @java.lang.Deprecated
     public Builder clearServiceData() {
-      if (serviceDataBuilder_ == null) {
-        serviceData_ = null;
-        onChanged();
-      } else {
-        serviceData_ = null;
+      bitField0_ = (bitField0_ & ~0x00004000);
+      serviceData_ = null;
+      if (serviceDataBuilder_ != null) {
+        serviceDataBuilder_.dispose();
         serviceDataBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -4457,7 +4469,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/AuthenticationInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthenticationInfo.java
index d3c4627e8b..01d8e1e744 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthenticationInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthenticationInfo.java
@@ -72,7 +72,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PRINCIPAL_EMAIL_FIELD_NUMBER = 1;
-  private volatile java.lang.Object principalEmail_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object principalEmail_ = "";
   /**
    *
    *
@@ -131,7 +133,9 @@ public com.google.protobuf.ByteString getPrincipalEmailBytes() {
   }
 
   public static final int AUTHORITY_SELECTOR_FIELD_NUMBER = 2;
-  private volatile java.lang.Object authoritySelector_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object authoritySelector_ = "";
   /**
    *
    *
@@ -235,11 +239,15 @@ public com.google.protobuf.Struct getThirdPartyPrincipal() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getThirdPartyPrincipalOrBuilder() {
-    return getThirdPartyPrincipal();
+    return thirdPartyPrincipal_ == null
+        ? com.google.protobuf.Struct.getDefaultInstance()
+        : thirdPartyPrincipal_;
   }
 
   public static final int SERVICE_ACCOUNT_KEY_NAME_FIELD_NUMBER = 5;
-  private volatile java.lang.Object serviceAccountKeyName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object serviceAccountKeyName_ = "";
   /**
    *
    *
@@ -294,6 +302,8 @@ public com.google.protobuf.ByteString getServiceAccountKeyNameBytes() {
   }
 
   public static final int SERVICE_ACCOUNT_DELEGATION_INFO_FIELD_NUMBER = 6;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.audit.ServiceAccountDelegationInfo>
       serviceAccountDelegationInfo_;
   /**
@@ -397,7 +407,9 @@ public com.google.cloud.audit.ServiceAccountDelegationInfo getServiceAccountDele
   }
 
   public static final int PRINCIPAL_SUBJECT_FIELD_NUMBER = 8;
-  private volatile java.lang.Object principalSubject_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object principalSubject_ = "";
   /**
    *
    *
@@ -699,27 +711,23 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       principalEmail_ = "";
-
       authoritySelector_ = "";
-
-      if (thirdPartyPrincipalBuilder_ == null) {
-        thirdPartyPrincipal_ = null;
-      } else {
-        thirdPartyPrincipal_ = null;
+      thirdPartyPrincipal_ = null;
+      if (thirdPartyPrincipalBuilder_ != null) {
+        thirdPartyPrincipalBuilder_.dispose();
         thirdPartyPrincipalBuilder_ = null;
       }
       serviceAccountKeyName_ = "";
-
       if (serviceAccountDelegationInfoBuilder_ == null) {
         serviceAccountDelegationInfo_ = java.util.Collections.emptyList();
       } else {
         serviceAccountDelegationInfo_ = null;
         serviceAccountDelegationInfoBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000010);
       principalSubject_ = "";
-
       return this;
     }
 
@@ -747,28 +755,47 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.principalEmail_ = principalEmail_;
-      result.authoritySelector_ = authoritySelector_;
-      if (thirdPartyPrincipalBuilder_ == null) {
-        result.thirdPartyPrincipal_ = thirdPartyPrincipal_;
-      } else {
-        result.thirdPartyPrincipal_ = thirdPartyPrincipalBuilder_.build();
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.serviceAccountKeyName_ = serviceAccountKeyName_;
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.cloud.audit.AuthenticationInfo result) {
       if (serviceAccountDelegationInfoBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000010) != 0)) {
           serviceAccountDelegationInfo_ =
               java.util.Collections.unmodifiableList(serviceAccountDelegationInfo_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000010);
         }
         result.serviceAccountDelegationInfo_ = serviceAccountDelegationInfo_;
       } else {
         result.serviceAccountDelegationInfo_ = serviceAccountDelegationInfoBuilder_.build();
       }
-      result.principalSubject_ = principalSubject_;
-      onBuilt();
-      return result;
+    }
+
+    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_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.thirdPartyPrincipal_ =
+            thirdPartyPrincipalBuilder_ == null
+                ? thirdPartyPrincipal_
+                : thirdPartyPrincipalBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.serviceAccountKeyName_ = serviceAccountKeyName_;
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.principalSubject_ = principalSubject_;
+      }
     }
 
     @java.lang.Override
@@ -818,10 +845,12 @@ 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()) {
@@ -829,13 +858,14 @@ 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_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
             ensureServiceAccountDelegationInfoIsMutable();
             serviceAccountDelegationInfo_.addAll(other.serviceAccountDelegationInfo_);
@@ -848,7 +878,7 @@ public Builder mergeFrom(com.google.cloud.audit.AuthenticationInfo other) {
             serviceAccountDelegationInfoBuilder_.dispose();
             serviceAccountDelegationInfoBuilder_ = null;
             serviceAccountDelegationInfo_ = other.serviceAccountDelegationInfo_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
             serviceAccountDelegationInfoBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getServiceAccountDelegationInfoFieldBuilder()
@@ -861,6 +891,7 @@ public Builder mergeFrom(com.google.cloud.audit.AuthenticationInfo other) {
       }
       if (!other.getPrincipalSubject().isEmpty()) {
         principalSubject_ = other.principalSubject_;
+        bitField0_ |= 0x00000020;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -892,26 +923,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:
@@ -931,7 +962,7 @@ public Builder mergeFrom(
             case 66:
               {
                 principalSubject_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 66
             default:
@@ -1029,8 +1060,8 @@ public Builder setPrincipalEmail(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       principalEmail_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1051,8 +1082,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;
     }
@@ -1078,8 +1109,8 @@ public Builder setPrincipalEmailBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       principalEmail_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1148,8 +1179,8 @@ public Builder setAuthoritySelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       authoritySelector_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1166,8 +1197,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;
     }
@@ -1189,8 +1220,8 @@ public Builder setAuthoritySelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       authoritySelector_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1216,7 +1247,7 @@ public Builder setAuthoritySelectorBytes(com.google.protobuf.ByteString value) {
      * @return Whether the thirdPartyPrincipal field is set.
      */
     public boolean hasThirdPartyPrincipal() {
-      return thirdPartyPrincipalBuilder_ != null || thirdPartyPrincipal_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1259,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;
     }
     /**
@@ -1281,11 +1312,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;
     }
     /**
@@ -1302,19 +1333,18 @@ public Builder setThirdPartyPrincipal(com.google.protobuf.Struct.Builder builder
      */
     public Builder mergeThirdPartyPrincipal(com.google.protobuf.Struct value) {
       if (thirdPartyPrincipalBuilder_ == null) {
-        if (thirdPartyPrincipal_ != null) {
-          thirdPartyPrincipal_ =
-              com.google.protobuf.Struct.newBuilder(thirdPartyPrincipal_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && thirdPartyPrincipal_ != null
+            && thirdPartyPrincipal_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getThirdPartyPrincipalBuilder().mergeFrom(value);
         } else {
           thirdPartyPrincipal_ = value;
         }
-        onChanged();
       } else {
         thirdPartyPrincipalBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1330,14 +1360,13 @@ public Builder mergeThirdPartyPrincipal(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct third_party_principal = 4;</code>
      */
     public Builder clearThirdPartyPrincipal() {
-      if (thirdPartyPrincipalBuilder_ == null) {
-        thirdPartyPrincipal_ = null;
-        onChanged();
-      } else {
-        thirdPartyPrincipal_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      thirdPartyPrincipal_ = null;
+      if (thirdPartyPrincipalBuilder_ != null) {
+        thirdPartyPrincipalBuilder_.dispose();
         thirdPartyPrincipalBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1353,7 +1382,7 @@ public Builder clearThirdPartyPrincipal() {
      * <code>.google.protobuf.Struct third_party_principal = 4;</code>
      */
     public com.google.protobuf.Struct.Builder getThirdPartyPrincipalBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getThirdPartyPrincipalFieldBuilder().getBuilder();
     }
@@ -1477,8 +1506,8 @@ public Builder setServiceAccountKeyName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       serviceAccountKeyName_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1497,8 +1526,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;
     }
@@ -1522,8 +1551,8 @@ public Builder setServiceAccountKeyNameBytes(com.google.protobuf.ByteString valu
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       serviceAccountKeyName_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1532,11 +1561,11 @@ public Builder setServiceAccountKeyNameBytes(com.google.protobuf.ByteString valu
         serviceAccountDelegationInfo_ = java.util.Collections.emptyList();
 
     private void ensureServiceAccountDelegationInfoIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         serviceAccountDelegationInfo_ =
             new java.util.ArrayList<com.google.cloud.audit.ServiceAccountDelegationInfo>(
                 serviceAccountDelegationInfo_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000010;
       }
     }
 
@@ -1824,7 +1853,7 @@ public Builder addAllServiceAccountDelegationInfo(
     public Builder clearServiceAccountDelegationInfo() {
       if (serviceAccountDelegationInfoBuilder_ == null) {
         serviceAccountDelegationInfo_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
       } else {
         serviceAccountDelegationInfoBuilder_.clear();
@@ -1994,7 +2023,7 @@ public Builder removeServiceAccountDelegationInfo(int index) {
                 com.google.cloud.audit.ServiceAccountDelegationInfo.Builder,
                 com.google.cloud.audit.ServiceAccountDelegationInfoOrBuilder>(
                 serviceAccountDelegationInfo_,
-                ((bitField0_ & 0x00000001) != 0),
+                ((bitField0_ & 0x00000010) != 0),
                 getParentForChildren(),
                 isClean());
         serviceAccountDelegationInfo_ = null;
@@ -2066,8 +2095,8 @@ public Builder setPrincipalSubject(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       principalSubject_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2084,8 +2113,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;
     }
@@ -2107,8 +2136,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/AuthorizationInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthorizationInfo.java
index 4983366351..faccc6595e 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthorizationInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthorizationInfo.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RESOURCE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object resource_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object resource_ = "";
   /**
    *
    *
@@ -126,7 +128,9 @@ public com.google.protobuf.ByteString getResourceBytes() {
   }
 
   public static final int PERMISSION_FIELD_NUMBER = 2;
-  private volatile java.lang.Object permission_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object permission_ = "";
   /**
    *
    *
@@ -175,7 +179,7 @@ public com.google.protobuf.ByteString getPermissionBytes() {
   }
 
   public static final int GRANTED_FIELD_NUMBER = 3;
-  private boolean granted_;
+  private boolean granted_ = false;
   /**
    *
    *
@@ -251,7 +255,9 @@ public com.google.rpc.context.AttributeContext.Resource getResourceAttributes()
   @java.lang.Override
   public com.google.rpc.context.AttributeContext.ResourceOrBuilder
       getResourceAttributesOrBuilder() {
-    return getResourceAttributes();
+    return resourceAttributes_ == null
+        ? com.google.rpc.context.AttributeContext.Resource.getDefaultInstance()
+        : resourceAttributes_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -482,16 +488,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       resource_ = "";
-
       permission_ = "";
-
       granted_ = false;
-
-      if (resourceAttributesBuilder_ == null) {
-        resourceAttributes_ = null;
-      } else {
-        resourceAttributes_ = null;
+      resourceAttributes_ = null;
+      if (resourceAttributesBuilder_ != null) {
+        resourceAttributesBuilder_.dispose();
         resourceAttributesBuilder_ = null;
       }
       return this;
@@ -521,18 +524,32 @@ 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);
-      result.resource_ = resource_;
-      result.permission_ = permission_;
-      result.granted_ = granted_;
-      if (resourceAttributesBuilder_ == null) {
-        result.resourceAttributes_ = resourceAttributes_;
-      } else {
-        result.resourceAttributes_ = resourceAttributesBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       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_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.resourceAttributes_ =
+            resourceAttributesBuilder_ == null
+                ? resourceAttributes_
+                : resourceAttributesBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -580,10 +597,12 @@ 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) {
@@ -621,26 +640,26 @@ 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
             default:
@@ -660,6 +679,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object resource_ = "";
     /**
      *
@@ -733,8 +754,8 @@ public Builder setResource(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       resource_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -754,8 +775,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;
     }
@@ -780,8 +801,8 @@ public Builder setResourceBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       resource_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -847,8 +868,8 @@ public Builder setPermission(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       permission_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -864,8 +885,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;
     }
@@ -886,8 +907,8 @@ public Builder setPermissionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       permission_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -925,6 +946,7 @@ public boolean getGranted() {
     public Builder setGranted(boolean value) {
 
       granted_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -941,7 +963,7 @@ public Builder setGranted(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearGranted() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       granted_ = false;
       onChanged();
       return this;
@@ -969,7 +991,7 @@ public Builder clearGranted() {
      * @return Whether the resourceAttributes field is set.
      */
     public boolean hasResourceAttributes() {
-      return resourceAttributesBuilder_ != null || resourceAttributes_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1014,11 +1036,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;
     }
     /**
@@ -1038,11 +1060,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;
     }
     /**
@@ -1060,19 +1082,19 @@ public Builder setResourceAttributes(
      */
     public Builder mergeResourceAttributes(com.google.rpc.context.AttributeContext.Resource value) {
       if (resourceAttributesBuilder_ == null) {
-        if (resourceAttributes_ != null) {
-          resourceAttributes_ =
-              com.google.rpc.context.AttributeContext.Resource.newBuilder(resourceAttributes_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && resourceAttributes_ != null
+            && resourceAttributes_
+                != com.google.rpc.context.AttributeContext.Resource.getDefaultInstance()) {
+          getResourceAttributesBuilder().mergeFrom(value);
         } else {
           resourceAttributes_ = value;
         }
-        onChanged();
       } else {
         resourceAttributesBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1089,14 +1111,13 @@ public Builder mergeResourceAttributes(com.google.rpc.context.AttributeContext.R
      * <code>.google.rpc.context.AttributeContext.Resource resource_attributes = 5;</code>
      */
     public Builder clearResourceAttributes() {
-      if (resourceAttributesBuilder_ == null) {
-        resourceAttributes_ = null;
-        onChanged();
-      } else {
-        resourceAttributes_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      resourceAttributes_ = null;
+      if (resourceAttributesBuilder_ != null) {
+        resourceAttributesBuilder_.dispose();
         resourceAttributesBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1113,7 +1134,7 @@ public Builder clearResourceAttributes() {
      * <code>.google.rpc.context.AttributeContext.Resource resource_attributes = 5;</code>
      */
     public com.google.rpc.context.AttributeContext.Resource.Builder getResourceAttributesBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getResourceAttributesFieldBuilder().getBuilder();
     }
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 d7c61fadeb..ca555dfe16 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/OrgPolicyViolationInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/OrgPolicyViolationInfo.java
@@ -128,11 +128,13 @@ public com.google.protobuf.Struct getPayload() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() {
-    return getPayload();
+    return payload_ == null ? com.google.protobuf.Struct.getDefaultInstance() : payload_;
   }
 
   public static final int RESOURCE_TYPE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object resourceType_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object resourceType_ = "";
   /**
    *
    *
@@ -195,6 +197,7 @@ private static final class ResourceTagsDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> resourceTags_;
 
   private com.google.protobuf.MapField<java.lang.String, java.lang.String>
@@ -272,8 +275,10 @@ public java.util.Map<java.lang.String, java.lang.String> getResourceTagsMap() {
    * </code>
    */
   @java.lang.Override
-  public java.lang.String getResourceTagsOrDefault(
-      java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getResourceTagsOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -308,6 +313,8 @@ public java.lang.String getResourceTagsOrThrow(java.lang.String key) {
   }
 
   public static final int VIOLATION_INFO_FIELD_NUMBER = 4;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.audit.ViolationInfo> violationInfo_;
   /**
    *
@@ -645,14 +652,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (payloadBuilder_ == null) {
-        payload_ = null;
-      } else {
-        payload_ = null;
+      bitField0_ = 0;
+      payload_ = null;
+      if (payloadBuilder_ != null) {
+        payloadBuilder_.dispose();
         payloadBuilder_ = null;
       }
       resourceType_ = "";
-
       internalGetMutableResourceTags().clear();
       if (violationInfoBuilder_ == null) {
         violationInfo_ = java.util.Collections.emptyList();
@@ -660,7 +666,7 @@ public Builder clear() {
         violationInfo_ = null;
         violationInfoBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000008);
       return this;
     }
 
@@ -688,26 +694,38 @@ 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);
-      int from_bitField0_ = bitField0_;
-      if (payloadBuilder_ == null) {
-        result.payload_ = payload_;
-      } else {
-        result.payload_ = payloadBuilder_.build();
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.resourceType_ = resourceType_;
-      result.resourceTags_ = internalGetResourceTags();
-      result.resourceTags_.makeImmutable();
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.cloud.audit.OrgPolicyViolationInfo result) {
       if (violationInfoBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000008) != 0)) {
           violationInfo_ = java.util.Collections.unmodifiableList(violationInfo_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000008);
         }
         result.violationInfo_ = violationInfo_;
       } else {
         result.violationInfo_ = violationInfoBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.audit.OrgPolicyViolationInfo result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.payload_ = payloadBuilder_ == null ? payload_ : payloadBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.resourceType_ = resourceType_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.resourceTags_ = internalGetResourceTags();
+        result.resourceTags_.makeImmutable();
+      }
     }
 
     @java.lang.Override
@@ -760,14 +778,16 @@ 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_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000008);
           } else {
             ensureViolationInfoIsMutable();
             violationInfo_.addAll(other.violationInfo_);
@@ -780,7 +800,7 @@ public Builder mergeFrom(com.google.cloud.audit.OrgPolicyViolationInfo other) {
             violationInfoBuilder_.dispose();
             violationInfoBuilder_ = null;
             violationInfo_ = other.violationInfo_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000008);
             violationInfoBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getViolationInfoFieldBuilder()
@@ -819,13 +839,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:
@@ -837,6 +857,7 @@ public Builder mergeFrom(
                 internalGetMutableResourceTags()
                     .getMutableMap()
                     .put(resourceTags__.getKey(), resourceTags__.getValue());
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
@@ -891,7 +912,7 @@ public Builder mergeFrom(
      * @return Whether the payload field is set.
      */
     public boolean hasPayload() {
-      return payloadBuilder_ != null || payload_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -930,11 +951,11 @@ public Builder setPayload(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         payload_ = value;
-        onChanged();
       } else {
         payloadBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -951,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;
     }
     /**
@@ -971,17 +992,18 @@ public Builder setPayload(com.google.protobuf.Struct.Builder builderForValue) {
      */
     public Builder mergePayload(com.google.protobuf.Struct value) {
       if (payloadBuilder_ == null) {
-        if (payload_ != null) {
-          payload_ =
-              com.google.protobuf.Struct.newBuilder(payload_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && payload_ != null
+            && payload_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getPayloadBuilder().mergeFrom(value);
         } else {
           payload_ = value;
         }
-        onChanged();
       } else {
         payloadBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -996,14 +1018,13 @@ public Builder mergePayload(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct payload = 1 [(.google.api.field_behavior) = OPTIONAL];</code>
      */
     public Builder clearPayload() {
-      if (payloadBuilder_ == null) {
-        payload_ = null;
-        onChanged();
-      } else {
-        payload_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      payload_ = null;
+      if (payloadBuilder_ != null) {
+        payloadBuilder_.dispose();
         payloadBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1018,7 +1039,7 @@ public Builder clearPayload() {
      * <code>.google.protobuf.Struct payload = 1 [(.google.api.field_behavior) = OPTIONAL];</code>
      */
     public com.google.protobuf.Struct.Builder getPayloadBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getPayloadFieldBuilder().getBuilder();
     }
@@ -1132,8 +1153,8 @@ public Builder setResourceType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       resourceType_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1150,8 +1171,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;
     }
@@ -1173,8 +1194,8 @@ public Builder setResourceTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       resourceType_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1192,8 +1213,6 @@ public Builder setResourceTypeBytes(com.google.protobuf.ByteString value) {
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
         internalGetMutableResourceTags() {
-      onChanged();
-      ;
       if (resourceTags_ == null) {
         resourceTags_ =
             com.google.protobuf.MapField.newMapField(ResourceTagsDefaultEntryHolder.defaultEntry);
@@ -1201,6 +1220,8 @@ public Builder setResourceTypeBytes(com.google.protobuf.ByteString value) {
       if (!resourceTags_.isMutable()) {
         resourceTags_ = resourceTags_.copy();
       }
+      bitField0_ |= 0x00000004;
+      onChanged();
       return resourceTags_;
     }
 
@@ -1270,8 +1291,10 @@ public java.util.Map<java.lang.String, java.lang.String> getResourceTagsMap() {
      * </code>
      */
     @java.lang.Override
-    public java.lang.String getResourceTagsOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getResourceTagsOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1306,6 +1329,7 @@ public java.lang.String getResourceTagsOrThrow(java.lang.String key) {
     }
 
     public Builder clearResourceTags() {
+      bitField0_ = (bitField0_ & ~0x00000004);
       internalGetMutableResourceTags().getMutableMap().clear();
       return this;
     }
@@ -1334,6 +1358,7 @@ public Builder removeResourceTags(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMutableResourceTags() {
+      bitField0_ |= 0x00000004;
       return internalGetMutableResourceTags().getMutableMap();
     }
     /**
@@ -1358,8 +1383,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;
     }
     /**
@@ -1379,6 +1404,7 @@ public Builder putResourceTags(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllResourceTags(java.util.Map<java.lang.String, java.lang.String> values) {
       internalGetMutableResourceTags().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000004;
       return this;
     }
 
@@ -1386,10 +1412,10 @@ public Builder putAllResourceTags(java.util.Map<java.lang.String, java.lang.Stri
         java.util.Collections.emptyList();
 
     private void ensureViolationInfoIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         violationInfo_ =
             new java.util.ArrayList<com.google.cloud.audit.ViolationInfo>(violationInfo_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000008;
       }
     }
 
@@ -1626,7 +1652,7 @@ public Builder addAllViolationInfo(
     public Builder clearViolationInfo() {
       if (violationInfoBuilder_ == null) {
         violationInfo_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
       } else {
         violationInfoBuilder_.clear();
@@ -1763,7 +1789,7 @@ public com.google.cloud.audit.ViolationInfo.Builder addViolationInfoBuilder(int
                 com.google.cloud.audit.ViolationInfo.Builder,
                 com.google.cloud.audit.ViolationInfoOrBuilder>(
                 violationInfo_,
-                ((bitField0_ & 0x00000002) != 0),
+                ((bitField0_ & 0x00000008) != 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 a41399ce41..e05a56411b 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/OrgPolicyViolationInfoOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/OrgPolicyViolationInfoOrBuilder.java
@@ -157,7 +157,6 @@ public interface OrgPolicyViolationInfoOrBuilder
    * <code>map&lt;string, string&gt; resource_tags = 3 [(.google.api.field_behavior) = OPTIONAL];
    * </code>
    */
-
   /* nullable */
   java.lang.String getResourceTagsOrDefault(
       java.lang.String key,
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 4f8d213fb3..d7e928e22b 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/PolicyViolationInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/PolicyViolationInfo.java
@@ -111,7 +111,9 @@ public com.google.cloud.audit.OrgPolicyViolationInfo getOrgPolicyViolationInfo()
   @java.lang.Override
   public com.google.cloud.audit.OrgPolicyViolationInfoOrBuilder
       getOrgPolicyViolationInfoOrBuilder() {
-    return getOrgPolicyViolationInfo();
+    return orgPolicyViolationInfo_ == null
+        ? com.google.cloud.audit.OrgPolicyViolationInfo.getDefaultInstance()
+        : orgPolicyViolationInfo_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -317,10 +319,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (orgPolicyViolationInfoBuilder_ == null) {
-        orgPolicyViolationInfo_ = null;
-      } else {
-        orgPolicyViolationInfo_ = null;
+      bitField0_ = 0;
+      orgPolicyViolationInfo_ = null;
+      if (orgPolicyViolationInfoBuilder_ != null) {
+        orgPolicyViolationInfoBuilder_.dispose();
         orgPolicyViolationInfoBuilder_ = null;
       }
       return this;
@@ -350,15 +352,23 @@ 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 (orgPolicyViolationInfoBuilder_ == null) {
-        result.orgPolicyViolationInfo_ = orgPolicyViolationInfo_;
-      } else {
-        result.orgPolicyViolationInfo_ = orgPolicyViolationInfoBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.audit.PolicyViolationInfo result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.orgPolicyViolationInfo_ =
+            orgPolicyViolationInfoBuilder_ == null
+                ? orgPolicyViolationInfo_
+                : orgPolicyViolationInfoBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -437,7 +447,7 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getOrgPolicyViolationInfoFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -457,6 +467,8 @@ 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,
@@ -475,7 +487,7 @@ public Builder mergeFrom(
      * @return Whether the orgPolicyViolationInfo field is set.
      */
     public boolean hasOrgPolicyViolationInfo() {
-      return orgPolicyViolationInfoBuilder_ != null || orgPolicyViolationInfo_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -512,11 +524,11 @@ public Builder setOrgPolicyViolationInfo(com.google.cloud.audit.OrgPolicyViolati
           throw new NullPointerException();
         }
         orgPolicyViolationInfo_ = value;
-        onChanged();
       } else {
         orgPolicyViolationInfoBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -532,11 +544,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;
     }
     /**
@@ -551,19 +563,19 @@ public Builder setOrgPolicyViolationInfo(
     public Builder mergeOrgPolicyViolationInfo(
         com.google.cloud.audit.OrgPolicyViolationInfo value) {
       if (orgPolicyViolationInfoBuilder_ == null) {
-        if (orgPolicyViolationInfo_ != null) {
-          orgPolicyViolationInfo_ =
-              com.google.cloud.audit.OrgPolicyViolationInfo.newBuilder(orgPolicyViolationInfo_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && orgPolicyViolationInfo_ != null
+            && orgPolicyViolationInfo_
+                != com.google.cloud.audit.OrgPolicyViolationInfo.getDefaultInstance()) {
+          getOrgPolicyViolationInfoBuilder().mergeFrom(value);
         } else {
           orgPolicyViolationInfo_ = value;
         }
-        onChanged();
       } else {
         orgPolicyViolationInfoBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -576,14 +588,13 @@ public Builder mergeOrgPolicyViolationInfo(
      * <code>.google.cloud.audit.OrgPolicyViolationInfo org_policy_violation_info = 1;</code>
      */
     public Builder clearOrgPolicyViolationInfo() {
-      if (orgPolicyViolationInfoBuilder_ == null) {
-        orgPolicyViolationInfo_ = null;
-        onChanged();
-      } else {
-        orgPolicyViolationInfo_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      orgPolicyViolationInfo_ = null;
+      if (orgPolicyViolationInfoBuilder_ != null) {
+        orgPolicyViolationInfoBuilder_.dispose();
         orgPolicyViolationInfoBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -597,7 +608,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/RequestMetadata.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/RequestMetadata.java
index a9789399ec..5a977fc9f0 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/RequestMetadata.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/RequestMetadata.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CALLER_IP_FIELD_NUMBER = 1;
-  private volatile java.lang.Object callerIp_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object callerIp_ = "";
   /**
    *
    *
@@ -139,7 +141,9 @@ public com.google.protobuf.ByteString getCallerIpBytes() {
   }
 
   public static final int CALLER_SUPPLIED_USER_AGENT_FIELD_NUMBER = 2;
-  private volatile java.lang.Object callerSuppliedUserAgent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object callerSuppliedUserAgent_ = "";
   /**
    *
    *
@@ -206,7 +210,9 @@ public com.google.protobuf.ByteString getCallerSuppliedUserAgentBytes() {
   }
 
   public static final int CALLER_NETWORK_FIELD_NUMBER = 3;
-  private volatile java.lang.Object callerNetwork_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object callerNetwork_ = "";
   /**
    *
    *
@@ -324,7 +330,9 @@ public com.google.rpc.context.AttributeContext.Request getRequestAttributes() {
    */
   @java.lang.Override
   public com.google.rpc.context.AttributeContext.RequestOrBuilder getRequestAttributesOrBuilder() {
-    return getRequestAttributes();
+    return requestAttributes_ == null
+        ? com.google.rpc.context.AttributeContext.Request.getDefaultInstance()
+        : requestAttributes_;
   }
 
   public static final int DESTINATION_ATTRIBUTES_FIELD_NUMBER = 8;
@@ -384,7 +392,9 @@ public com.google.rpc.context.AttributeContext.Peer getDestinationAttributes() {
    */
   @java.lang.Override
   public com.google.rpc.context.AttributeContext.PeerOrBuilder getDestinationAttributesOrBuilder() {
-    return getDestinationAttributes();
+    return destinationAttributes_ == null
+        ? com.google.rpc.context.AttributeContext.Peer.getDefaultInstance()
+        : destinationAttributes_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -630,22 +640,18 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       callerIp_ = "";
-
       callerSuppliedUserAgent_ = "";
-
       callerNetwork_ = "";
-
-      if (requestAttributesBuilder_ == null) {
-        requestAttributes_ = null;
-      } else {
-        requestAttributes_ = null;
+      requestAttributes_ = null;
+      if (requestAttributesBuilder_ != null) {
+        requestAttributesBuilder_.dispose();
         requestAttributesBuilder_ = null;
       }
-      if (destinationAttributesBuilder_ == null) {
-        destinationAttributes_ = null;
-      } else {
-        destinationAttributes_ = null;
+      destinationAttributes_ = null;
+      if (destinationAttributesBuilder_ != null) {
+        destinationAttributesBuilder_.dispose();
         destinationAttributesBuilder_ = null;
       }
       return this;
@@ -675,23 +681,38 @@ 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);
-      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();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       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_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.requestAttributes_ =
+            requestAttributesBuilder_ == null
+                ? requestAttributes_
+                : requestAttributesBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.destinationAttributes_ =
+            destinationAttributesBuilder_ == null
+                ? destinationAttributes_
+                : destinationAttributesBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -739,14 +760,17 @@ 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()) {
@@ -784,33 +808,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:
@@ -830,6 +854,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object callerIp_ = "";
     /**
      *
@@ -921,8 +947,8 @@ public Builder setCallerIp(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       callerIp_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -948,8 +974,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;
     }
@@ -980,8 +1006,8 @@ public Builder setCallerIpBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       callerIp_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1074,8 +1100,8 @@ public Builder setCallerSuppliedUserAgent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       callerSuppliedUserAgent_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1100,8 +1126,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;
     }
@@ -1131,8 +1157,8 @@ public Builder setCallerSuppliedUserAgentBytes(com.google.protobuf.ByteString va
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       callerSuppliedUserAgent_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1213,8 +1239,8 @@ public Builder setCallerNetwork(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       callerNetwork_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1235,8 +1261,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;
     }
@@ -1262,8 +1288,8 @@ public Builder setCallerNetworkBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       callerNetwork_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1291,7 +1317,7 @@ public Builder setCallerNetworkBytes(com.google.protobuf.ByteString value) {
      * @return Whether the requestAttributes field is set.
      */
     public boolean hasRequestAttributes() {
-      return requestAttributesBuilder_ != null || requestAttributes_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1338,11 +1364,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;
     }
     /**
@@ -1363,11 +1389,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;
     }
     /**
@@ -1386,19 +1412,19 @@ public Builder setRequestAttributes(
      */
     public Builder mergeRequestAttributes(com.google.rpc.context.AttributeContext.Request value) {
       if (requestAttributesBuilder_ == null) {
-        if (requestAttributes_ != null) {
-          requestAttributes_ =
-              com.google.rpc.context.AttributeContext.Request.newBuilder(requestAttributes_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && requestAttributes_ != null
+            && requestAttributes_
+                != com.google.rpc.context.AttributeContext.Request.getDefaultInstance()) {
+          getRequestAttributesBuilder().mergeFrom(value);
         } else {
           requestAttributes_ = value;
         }
-        onChanged();
       } else {
         requestAttributesBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1416,14 +1442,13 @@ public Builder mergeRequestAttributes(com.google.rpc.context.AttributeContext.Re
      * <code>.google.rpc.context.AttributeContext.Request request_attributes = 7;</code>
      */
     public Builder clearRequestAttributes() {
-      if (requestAttributesBuilder_ == null) {
-        requestAttributes_ = null;
-        onChanged();
-      } else {
-        requestAttributes_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      requestAttributes_ = null;
+      if (requestAttributesBuilder_ != null) {
+        requestAttributesBuilder_.dispose();
         requestAttributesBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1441,7 +1466,7 @@ public Builder clearRequestAttributes() {
      * <code>.google.rpc.context.AttributeContext.Request request_attributes = 7;</code>
      */
     public com.google.rpc.context.AttributeContext.Request.Builder getRequestAttributesBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getRequestAttributesFieldBuilder().getBuilder();
     }
@@ -1522,7 +1547,7 @@ public com.google.rpc.context.AttributeContext.Request.Builder getRequestAttribu
      * @return Whether the destinationAttributes field is set.
      */
     public boolean hasDestinationAttributes() {
-      return destinationAttributesBuilder_ != null || destinationAttributes_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -1567,11 +1592,11 @@ public Builder setDestinationAttributes(com.google.rpc.context.AttributeContext.
           throw new NullPointerException();
         }
         destinationAttributes_ = value;
-        onChanged();
       } else {
         destinationAttributesBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1591,11 +1616,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;
     }
     /**
@@ -1613,19 +1638,19 @@ public Builder setDestinationAttributes(
      */
     public Builder mergeDestinationAttributes(com.google.rpc.context.AttributeContext.Peer value) {
       if (destinationAttributesBuilder_ == null) {
-        if (destinationAttributes_ != null) {
-          destinationAttributes_ =
-              com.google.rpc.context.AttributeContext.Peer.newBuilder(destinationAttributes_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && destinationAttributes_ != null
+            && destinationAttributes_
+                != com.google.rpc.context.AttributeContext.Peer.getDefaultInstance()) {
+          getDestinationAttributesBuilder().mergeFrom(value);
         } else {
           destinationAttributes_ = value;
         }
-        onChanged();
       } else {
         destinationAttributesBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1642,14 +1667,13 @@ public Builder mergeDestinationAttributes(com.google.rpc.context.AttributeContex
      * <code>.google.rpc.context.AttributeContext.Peer destination_attributes = 8;</code>
      */
     public Builder clearDestinationAttributes() {
-      if (destinationAttributesBuilder_ == null) {
-        destinationAttributes_ = null;
-        onChanged();
-      } else {
-        destinationAttributes_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      destinationAttributes_ = null;
+      if (destinationAttributesBuilder_ != null) {
+        destinationAttributesBuilder_.dispose();
         destinationAttributesBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1666,7 +1690,7 @@ public Builder clearDestinationAttributes() {
      * <code>.google.rpc.context.AttributeContext.Peer destination_attributes = 8;</code>
      */
     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/ResourceLocation.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ResourceLocation.java
index a745982081..0c5b2caaa2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ResourceLocation.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ResourceLocation.java
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CURRENT_LOCATIONS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList currentLocations_;
   /**
    *
@@ -154,6 +156,8 @@ public com.google.protobuf.ByteString getCurrentLocationsBytes(int index) {
   }
 
   public static final int ORIGINAL_LOCATIONS_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList originalLocations_;
   /**
    *
@@ -457,6 +461,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       currentLocations_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000001);
       originalLocations_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -488,7 +493,15 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.cloud.audit.ResourceLocation result) {
       if (((bitField0_ & 0x00000001) != 0)) {
         currentLocations_ = currentLocations_.getUnmodifiableView();
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -499,8 +512,10 @@ public com.google.cloud.audit.ResourceLocation buildPartial() {
         bitField0_ = (bitField0_ & ~0x00000002);
       }
       result.originalLocations_ = originalLocations_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.audit.ResourceLocation result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
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 8128d5afd5..e0a88f5878 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ServiceAccountDelegationInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ServiceAccountDelegationInfo.java
@@ -183,7 +183,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int PRINCIPAL_EMAIL_FIELD_NUMBER = 1;
-    private volatile java.lang.Object principalEmail_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object principalEmail_ = "";
     /**
      *
      *
@@ -276,7 +278,9 @@ public com.google.protobuf.Struct getServiceMetadata() {
      */
     @java.lang.Override
     public com.google.protobuf.StructOrBuilder getServiceMetadataOrBuilder() {
-      return getServiceMetadata();
+      return serviceMetadata_ == null
+          ? com.google.protobuf.Struct.getDefaultInstance()
+          : serviceMetadata_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -497,12 +501,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         principalEmail_ = "";
-
-        if (serviceMetadataBuilder_ == null) {
-          serviceMetadata_ = null;
-        } else {
-          serviceMetadata_ = null;
+        serviceMetadata_ = null;
+        if (serviceMetadataBuilder_ != null) {
+          serviceMetadataBuilder_.dispose();
           serviceMetadataBuilder_ = null;
         }
         return this;
@@ -536,16 +539,25 @@ public com.google.cloud.audit.ServiceAccountDelegationInfo.FirstPartyPrincipal b
           buildPartial() {
         com.google.cloud.audit.ServiceAccountDelegationInfo.FirstPartyPrincipal result =
             new com.google.cloud.audit.ServiceAccountDelegationInfo.FirstPartyPrincipal(this);
-        result.principalEmail_ = principalEmail_;
-        if (serviceMetadataBuilder_ == null) {
-          result.serviceMetadata_ = serviceMetadata_;
-        } else {
-          result.serviceMetadata_ = serviceMetadataBuilder_.build();
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
         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_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.serviceMetadata_ =
+              serviceMetadataBuilder_ == null ? serviceMetadata_ : serviceMetadataBuilder_.build();
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -600,6 +612,7 @@ public Builder mergeFrom(
                 .getDefaultInstance()) return this;
         if (!other.getPrincipalEmail().isEmpty()) {
           principalEmail_ = other.principalEmail_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasServiceMetadata()) {
@@ -634,14 +647,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:
@@ -661,6 +674,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object principalEmail_ = "";
       /**
        *
@@ -722,8 +737,8 @@ public Builder setPrincipalEmail(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         principalEmail_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -739,8 +754,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;
       }
@@ -761,8 +776,8 @@ public Builder setPrincipalEmailBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         principalEmail_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -785,7 +800,7 @@ public Builder setPrincipalEmailBytes(com.google.protobuf.ByteString value) {
        * @return Whether the serviceMetadata field is set.
        */
       public boolean hasServiceMetadata() {
-        return serviceMetadataBuilder_ != null || serviceMetadata_ != null;
+        return ((bitField0_ & 0x00000002) != 0);
       }
       /**
        *
@@ -822,11 +837,11 @@ public Builder setServiceMetadata(com.google.protobuf.Struct value) {
             throw new NullPointerException();
           }
           serviceMetadata_ = value;
-          onChanged();
         } else {
           serviceMetadataBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -841,11 +856,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;
       }
       /**
@@ -859,19 +874,18 @@ public Builder setServiceMetadata(com.google.protobuf.Struct.Builder builderForV
        */
       public Builder mergeServiceMetadata(com.google.protobuf.Struct value) {
         if (serviceMetadataBuilder_ == null) {
-          if (serviceMetadata_ != null) {
-            serviceMetadata_ =
-                com.google.protobuf.Struct.newBuilder(serviceMetadata_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000002) != 0)
+              && serviceMetadata_ != null
+              && serviceMetadata_ != com.google.protobuf.Struct.getDefaultInstance()) {
+            getServiceMetadataBuilder().mergeFrom(value);
           } else {
             serviceMetadata_ = value;
           }
-          onChanged();
         } else {
           serviceMetadataBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -884,14 +898,13 @@ public Builder mergeServiceMetadata(com.google.protobuf.Struct value) {
        * <code>.google.protobuf.Struct service_metadata = 2;</code>
        */
       public Builder clearServiceMetadata() {
-        if (serviceMetadataBuilder_ == null) {
-          serviceMetadata_ = null;
-          onChanged();
-        } else {
-          serviceMetadata_ = null;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        serviceMetadata_ = null;
+        if (serviceMetadataBuilder_ != null) {
+          serviceMetadataBuilder_.dispose();
           serviceMetadataBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -904,7 +917,7 @@ public Builder clearServiceMetadata() {
        * <code>.google.protobuf.Struct service_metadata = 2;</code>
        */
       public com.google.protobuf.Struct.Builder getServiceMetadataBuilder() {
-
+        bitField0_ |= 0x00000002;
         onChanged();
         return getServiceMetadataFieldBuilder().getBuilder();
       }
@@ -1153,7 +1166,9 @@ public com.google.protobuf.Struct getThirdPartyClaims() {
      */
     @java.lang.Override
     public com.google.protobuf.StructOrBuilder getThirdPartyClaimsOrBuilder() {
-      return getThirdPartyClaims();
+      return thirdPartyClaims_ == null
+          ? com.google.protobuf.Struct.getDefaultInstance()
+          : thirdPartyClaims_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -1365,10 +1380,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (thirdPartyClaimsBuilder_ == null) {
-          thirdPartyClaims_ = null;
-        } else {
-          thirdPartyClaims_ = null;
+        bitField0_ = 0;
+        thirdPartyClaims_ = null;
+        if (thirdPartyClaimsBuilder_ != null) {
+          thirdPartyClaimsBuilder_.dispose();
           thirdPartyClaimsBuilder_ = null;
         }
         return this;
@@ -1402,15 +1417,24 @@ 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 (thirdPartyClaimsBuilder_ == null) {
-          result.thirdPartyClaims_ = thirdPartyClaims_;
-        } else {
-          result.thirdPartyClaims_ = thirdPartyClaimsBuilder_.build();
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.audit.ServiceAccountDelegationInfo.ThirdPartyPrincipal result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.thirdPartyClaims_ =
+              thirdPartyClaimsBuilder_ == null
+                  ? thirdPartyClaims_
+                  : thirdPartyClaimsBuilder_.build();
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1496,7 +1520,7 @@ public Builder mergeFrom(
                 {
                   input.readMessage(
                       getThirdPartyClaimsFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               default:
@@ -1516,6 +1540,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private com.google.protobuf.Struct thirdPartyClaims_;
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.protobuf.Struct,
@@ -1534,7 +1560,7 @@ public Builder mergeFrom(
        * @return Whether the thirdPartyClaims field is set.
        */
       public boolean hasThirdPartyClaims() {
-        return thirdPartyClaimsBuilder_ != null || thirdPartyClaims_ != null;
+        return ((bitField0_ & 0x00000001) != 0);
       }
       /**
        *
@@ -1571,11 +1597,11 @@ public Builder setThirdPartyClaims(com.google.protobuf.Struct value) {
             throw new NullPointerException();
           }
           thirdPartyClaims_ = value;
-          onChanged();
         } else {
           thirdPartyClaimsBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1590,11 +1616,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;
       }
       /**
@@ -1608,19 +1634,18 @@ public Builder setThirdPartyClaims(com.google.protobuf.Struct.Builder builderFor
        */
       public Builder mergeThirdPartyClaims(com.google.protobuf.Struct value) {
         if (thirdPartyClaimsBuilder_ == null) {
-          if (thirdPartyClaims_ != null) {
-            thirdPartyClaims_ =
-                com.google.protobuf.Struct.newBuilder(thirdPartyClaims_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000001) != 0)
+              && thirdPartyClaims_ != null
+              && thirdPartyClaims_ != com.google.protobuf.Struct.getDefaultInstance()) {
+            getThirdPartyClaimsBuilder().mergeFrom(value);
           } else {
             thirdPartyClaims_ = value;
           }
-          onChanged();
         } else {
           thirdPartyClaimsBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1633,14 +1658,13 @@ public Builder mergeThirdPartyClaims(com.google.protobuf.Struct value) {
        * <code>.google.protobuf.Struct third_party_claims = 1;</code>
        */
       public Builder clearThirdPartyClaims() {
-        if (thirdPartyClaimsBuilder_ == null) {
-          thirdPartyClaims_ = null;
-          onChanged();
-        } else {
-          thirdPartyClaims_ = null;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        thirdPartyClaims_ = null;
+        if (thirdPartyClaimsBuilder_ != null) {
+          thirdPartyClaimsBuilder_.dispose();
           thirdPartyClaimsBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -1653,7 +1677,7 @@ public Builder clearThirdPartyClaims() {
        * <code>.google.protobuf.Struct third_party_claims = 1;</code>
        */
       public com.google.protobuf.Struct.Builder getThirdPartyClaimsBuilder() {
-
+        bitField0_ |= 0x00000001;
         onChanged();
         return getThirdPartyClaimsFieldBuilder().getBuilder();
       }
@@ -1817,7 +1841,9 @@ public AuthorityCase getAuthorityCase() {
   }
 
   public static final int PRINCIPAL_SUBJECT_FIELD_NUMBER = 3;
-  private volatile java.lang.Object principalSubject_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object principalSubject_ = "";
   /**
    *
    *
@@ -2237,8 +2263,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();
       }
@@ -2274,26 +2300,32 @@ 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);
-      result.principalSubject_ = principalSubject_;
-      if (authorityCase_ == 1) {
-        if (firstPartyPrincipalBuilder_ == null) {
-          result.authority_ = authority_;
-        } else {
-          result.authority_ = firstPartyPrincipalBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (authorityCase_ == 2) {
-        if (thirdPartyPrincipalBuilder_ == null) {
-          result.authority_ = authority_;
-        } else {
-          result.authority_ = thirdPartyPrincipalBuilder_.build();
-        }
-      }
-      result.authorityCase_ = authorityCase_;
+      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_;
+      }
+    }
+
+    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();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -2342,6 +2374,7 @@ public Builder mergeFrom(com.google.cloud.audit.ServiceAccountDelegationInfo oth
         return this;
       if (!other.getPrincipalSubject().isEmpty()) {
         principalSubject_ = other.principalSubject_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       switch (other.getAuthorityCase()) {
@@ -2403,7 +2436,7 @@ public Builder mergeFrom(
             case 26:
               {
                 principalSubject_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 26
             default:
@@ -2437,6 +2470,8 @@ public Builder clearAuthority() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object principalSubject_ = "";
     /**
      *
@@ -2513,8 +2548,8 @@ public Builder setPrincipalSubject(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       principalSubject_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2535,8 +2570,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;
     }
@@ -2562,8 +2597,8 @@ public Builder setPrincipalSubjectBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       principalSubject_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2809,7 +2844,6 @@ public Builder clearFirstPartyPrincipal() {
       }
       authorityCase_ = 1;
       onChanged();
-      ;
       return firstPartyPrincipalBuilder_;
     }
 
@@ -3054,7 +3088,6 @@ 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/ViolationInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ViolationInfo.java
index 8137443e70..3311f42a98 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ViolationInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ViolationInfo.java
@@ -250,7 +250,9 @@ private PolicyType(int value) {
   }
 
   public static final int CONSTRAINT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object constraint_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object constraint_ = "";
   /**
    *
    *
@@ -299,7 +301,9 @@ public com.google.protobuf.ByteString getConstraintBytes() {
   }
 
   public static final int ERROR_MESSAGE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object errorMessage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object errorMessage_ = "";
   /**
    *
    *
@@ -348,7 +352,9 @@ public com.google.protobuf.ByteString getErrorMessageBytes() {
   }
 
   public static final int CHECKED_VALUE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object checkedValue_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object checkedValue_ = "";
   /**
    *
    *
@@ -401,7 +407,7 @@ public com.google.protobuf.ByteString getCheckedValueBytes() {
   }
 
   public static final int POLICY_TYPE_FIELD_NUMBER = 4;
-  private int policyType_;
+  private int policyType_ = 0;
   /**
    *
    *
@@ -434,9 +440,8 @@ 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.valueOf(policyType_);
+        com.google.cloud.audit.ViolationInfo.PolicyType.forNumber(policyType_);
     return result == null ? com.google.cloud.audit.ViolationInfo.PolicyType.UNRECOGNIZED : result;
   }
 
@@ -664,14 +669,11 @@ 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;
     }
 
@@ -698,14 +700,29 @@ 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);
-      result.constraint_ = constraint_;
-      result.errorMessage_ = errorMessage_;
-      result.checkedValue_ = checkedValue_;
-      result.policyType_ = policyType_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -753,14 +770,17 @@ 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) {
@@ -795,25 +815,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:
@@ -833,6 +853,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object constraint_ = "";
     /**
      *
@@ -894,8 +916,8 @@ public Builder setConstraint(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       constraint_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -911,8 +933,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;
     }
@@ -933,8 +955,8 @@ public Builder setConstraintBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       constraint_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1000,8 +1022,8 @@ public Builder setErrorMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       errorMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1017,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;
     }
@@ -1039,8 +1061,8 @@ public Builder setErrorMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       errorMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1112,8 +1134,8 @@ public Builder setCheckedValue(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       checkedValue_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1131,8 +1153,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;
     }
@@ -1155,8 +1177,8 @@ public Builder setCheckedValueBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       checkedValue_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1194,8 +1216,8 @@ public int getPolicyTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setPolicyTypeValue(int value) {
-
       policyType_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1214,9 +1236,8 @@ 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.valueOf(policyType_);
+          com.google.cloud.audit.ViolationInfo.PolicyType.forNumber(policyType_);
       return result == null ? com.google.cloud.audit.ViolationInfo.PolicyType.UNRECOGNIZED : result;
     }
     /**
@@ -1237,7 +1258,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;
@@ -1256,7 +1277,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/location/GetLocationRequest.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/GetLocationRequest.java
index fe5cbbd1de..ccb3932003 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/GetLocationRequest.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/GetLocationRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -313,8 +315,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -342,11 +344,20 @@ 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);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -394,6 +405,7 @@ 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());
@@ -425,7 +437,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -445,6 +457,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -506,8 +520,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -523,8 +537,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;
     }
@@ -545,8 +559,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/ListLocationsRequest.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsRequest.java
index feebcfe536..8f0385f283 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsRequest.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -119,7 +121,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int FILTER_FIELD_NUMBER = 2;
-  private volatile java.lang.Object filter_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object filter_ = "";
   /**
    *
    *
@@ -168,7 +172,7 @@ public com.google.protobuf.ByteString getFilterBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 3;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -186,7 +190,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 4;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -458,14 +464,11 @@ 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;
     }
 
@@ -493,14 +496,29 @@ 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);
-      result.name_ = name_;
-      result.filter_ = filter_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -548,10 +566,12 @@ 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) {
@@ -559,6 +579,7 @@ public Builder mergeFrom(com.google.cloud.location.ListLocationsRequest other) {
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -590,25 +611,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:
@@ -628,6 +649,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -689,8 +712,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -706,8 +729,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,8 +751,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -795,8 +818,8 @@ public Builder setFilter(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       filter_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -812,8 +835,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;
     }
@@ -834,8 +857,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       filter_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -871,6 +894,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -886,7 +910,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -953,8 +977,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -970,8 +994,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;
     }
@@ -992,8 +1016,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/ListLocationsResponse.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsResponse.java
index 6bb4a4dd7a..5367d42a46 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsResponse.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsResponse.java
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int LOCATIONS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.location.Location> locations_;
   /**
    *
@@ -138,7 +140,9 @@ public com.google.cloud.location.LocationOrBuilder getLocationsOrBuilder(int ind
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -394,6 +398,7 @@ 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 {
@@ -402,7 +407,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -430,7 +434,16 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.location.ListLocationsResponse result) {
       if (locationsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           locations_ = java.util.Collections.unmodifiableList(locations_);
@@ -440,9 +453,13 @@ public com.google.cloud.location.ListLocationsResponse buildPartial() {
       } else {
         result.locations_ = locationsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.location.ListLocationsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -520,6 +537,7 @@ public Builder mergeFrom(com.google.cloud.location.ListLocationsResponse other)
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -564,7 +582,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -995,8 +1013,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1012,8 +1030,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;
     }
@@ -1034,8 +1052,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/Location.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/Location.java
index bcd19d5c9a..936101f085 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/Location.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/Location.java
@@ -81,7 +81,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -132,7 +134,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int LOCATION_ID_FIELD_NUMBER = 4;
-  private volatile java.lang.Object locationId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object locationId_ = "";
   /**
    *
    *
@@ -181,7 +185,9 @@ public com.google.protobuf.ByteString getLocationIdBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 5;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
@@ -244,6 +250,7 @@ private static final class LabelsDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> labels_;
 
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> internalGetLabels() {
@@ -304,7 +311,10 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
    * <code>map&lt;string, string&gt; labels = 2;</code>
    */
   @java.lang.Override
-  public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getLabelsOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -379,7 +389,7 @@ public com.google.protobuf.Any getMetadata() {
    */
   @java.lang.Override
   public com.google.protobuf.AnyOrBuilder getMetadataOrBuilder() {
-    return getMetadata();
+    return metadata_ == null ? com.google.protobuf.Any.getDefaultInstance() : metadata_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -646,17 +656,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       locationId_ = "";
-
       displayName_ = "";
-
       internalGetMutableLabels().clear();
-      if (metadataBuilder_ == null) {
-        metadata_ = null;
-      } else {
-        metadata_ = null;
+      metadata_ = null;
+      if (metadataBuilder_ != null) {
+        metadataBuilder_.dispose();
         metadataBuilder_ = null;
       }
       return this;
@@ -685,21 +692,33 @@ 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);
-      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();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       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();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.metadata_ = metadataBuilder_ == null ? metadata_ : metadataBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -747,17 +766,21 @@ 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());
       }
@@ -790,7 +813,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -802,24 +825,25 @@ 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:
@@ -905,8 +929,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -923,8 +947,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;
     }
@@ -946,8 +970,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1013,8 +1037,8 @@ public Builder setLocationId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       locationId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1030,8 +1054,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;
     }
@@ -1052,8 +1076,8 @@ public Builder setLocationIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       locationId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1122,8 +1146,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1140,8 +1164,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;
     }
@@ -1163,8 +1187,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       displayName_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1180,14 +1204,14 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
         internalGetMutableLabels() {
-      onChanged();
-      ;
       if (labels_ == null) {
         labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
       }
       if (!labels_.isMutable()) {
         labels_ = labels_.copy();
       }
+      bitField0_ |= 0x00000008;
+      onChanged();
       return labels_;
     }
 
@@ -1242,8 +1266,10 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
      * <code>map&lt;string, string&gt; labels = 2;</code>
      */
     @java.lang.Override
-    public java.lang.String getLabelsOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getLabelsOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1273,6 +1299,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
     }
 
     public Builder clearLabels() {
+      bitField0_ = (bitField0_ & ~0x00000008);
       internalGetMutableLabels().getMutableMap().clear();
       return this;
     }
@@ -1296,6 +1323,7 @@ public Builder removeLabels(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMutableLabels() {
+      bitField0_ |= 0x00000008;
       return internalGetMutableLabels().getMutableMap();
     }
     /**
@@ -1315,8 +1343,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;
     }
     /**
@@ -1331,6 +1359,7 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllLabels(java.util.Map<java.lang.String, java.lang.String> values) {
       internalGetMutableLabels().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000008;
       return this;
     }
 
@@ -1353,7 +1382,7 @@ public Builder putAllLabels(java.util.Map<java.lang.String, java.lang.String> va
      * @return Whether the metadata field is set.
      */
     public boolean hasMetadata() {
-      return metadataBuilder_ != null || metadata_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -1390,11 +1419,11 @@ public Builder setMetadata(com.google.protobuf.Any value) {
           throw new NullPointerException();
         }
         metadata_ = value;
-        onChanged();
       } else {
         metadataBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1410,11 +1439,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;
     }
     /**
@@ -1429,16 +1458,18 @@ public Builder setMetadata(com.google.protobuf.Any.Builder builderForValue) {
      */
     public Builder mergeMetadata(com.google.protobuf.Any value) {
       if (metadataBuilder_ == null) {
-        if (metadata_ != null) {
-          metadata_ = com.google.protobuf.Any.newBuilder(metadata_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && metadata_ != null
+            && metadata_ != com.google.protobuf.Any.getDefaultInstance()) {
+          getMetadataBuilder().mergeFrom(value);
         } else {
           metadata_ = value;
         }
-        onChanged();
       } else {
         metadataBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1452,14 +1483,13 @@ public Builder mergeMetadata(com.google.protobuf.Any value) {
      * <code>.google.protobuf.Any metadata = 3;</code>
      */
     public Builder clearMetadata() {
-      if (metadataBuilder_ == null) {
-        metadata_ = null;
-        onChanged();
-      } else {
-        metadata_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      metadata_ = null;
+      if (metadataBuilder_ != null) {
+        metadataBuilder_.dispose();
         metadataBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1473,7 +1503,7 @@ public Builder clearMetadata() {
      * <code>.google.protobuf.Any metadata = 3;</code>
      */
     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 e1fb6694c6..72eade68c2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/LocationOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/LocationOrBuilder.java
@@ -148,7 +148,6 @@ public interface LocationOrBuilder
    *
    * <code>map&lt;string, string&gt; labels = 2;</code>
    */
-
   /* nullable */
   java.lang.String getLabelsOrDefault(
       java.lang.String key,
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 f4a41457b2..c0eaf905ee 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/geo/type/Viewport.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/geo/type/Viewport.java
@@ -132,7 +132,7 @@ public com.google.type.LatLng getLow() {
    */
   @java.lang.Override
   public com.google.type.LatLngOrBuilder getLowOrBuilder() {
-    return getLow();
+    return low_ == null ? com.google.type.LatLng.getDefaultInstance() : low_;
   }
 
   public static final int HIGH_FIELD_NUMBER = 2;
@@ -178,7 +178,7 @@ public com.google.type.LatLng getHigh() {
    */
   @java.lang.Override
   public com.google.type.LatLngOrBuilder getHighOrBuilder() {
-    return getHigh();
+    return high_ == null ? com.google.type.LatLng.getDefaultInstance() : high_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -419,16 +419,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (lowBuilder_ == null) {
-        low_ = null;
-      } else {
-        low_ = null;
+      bitField0_ = 0;
+      low_ = null;
+      if (lowBuilder_ != null) {
+        lowBuilder_.dispose();
         lowBuilder_ = null;
       }
-      if (highBuilder_ == null) {
-        high_ = null;
-      } else {
-        high_ = null;
+      high_ = null;
+      if (highBuilder_ != null) {
+        highBuilder_.dispose();
         highBuilder_ = null;
       }
       return this;
@@ -456,20 +455,23 @@ 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 (lowBuilder_ == null) {
-        result.low_ = low_;
-      } else {
-        result.low_ = lowBuilder_.build();
-      }
-      if (highBuilder_ == null) {
-        result.high_ = high_;
-      } else {
-        result.high_ = highBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.geo.type.Viewport result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.low_ = lowBuilder_ == null ? low_ : lowBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.high_ = highBuilder_ == null ? high_ : highBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -550,13 +552,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:
@@ -576,6 +578,8 @@ 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>
@@ -592,7 +596,7 @@ public Builder mergeFrom(
      * @return Whether the low field is set.
      */
     public boolean hasLow() {
-      return lowBuilder_ != null || low_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -627,11 +631,11 @@ public Builder setLow(com.google.type.LatLng value) {
           throw new NullPointerException();
         }
         low_ = value;
-        onChanged();
       } else {
         lowBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -646,11 +650,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;
     }
     /**
@@ -664,16 +668,18 @@ public Builder setLow(com.google.type.LatLng.Builder builderForValue) {
      */
     public Builder mergeLow(com.google.type.LatLng value) {
       if (lowBuilder_ == null) {
-        if (low_ != null) {
-          low_ = com.google.type.LatLng.newBuilder(low_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && low_ != null
+            && low_ != com.google.type.LatLng.getDefaultInstance()) {
+          getLowBuilder().mergeFrom(value);
         } else {
           low_ = value;
         }
-        onChanged();
       } else {
         lowBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -686,14 +692,13 @@ public Builder mergeLow(com.google.type.LatLng value) {
      * <code>.google.type.LatLng low = 1;</code>
      */
     public Builder clearLow() {
-      if (lowBuilder_ == null) {
-        low_ = null;
-        onChanged();
-      } else {
-        low_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      low_ = null;
+      if (lowBuilder_ != null) {
+        lowBuilder_.dispose();
         lowBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -706,7 +711,7 @@ public Builder clearLow() {
      * <code>.google.type.LatLng low = 1;</code>
      */
     public com.google.type.LatLng.Builder getLowBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getLowFieldBuilder().getBuilder();
     }
@@ -765,7 +770,7 @@ public com.google.type.LatLngOrBuilder getLowOrBuilder() {
      * @return Whether the high field is set.
      */
     public boolean hasHigh() {
-      return highBuilder_ != null || high_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -800,11 +805,11 @@ public Builder setHigh(com.google.type.LatLng value) {
           throw new NullPointerException();
         }
         high_ = value;
-        onChanged();
       } else {
         highBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -819,11 +824,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;
     }
     /**
@@ -837,16 +842,18 @@ public Builder setHigh(com.google.type.LatLng.Builder builderForValue) {
      */
     public Builder mergeHigh(com.google.type.LatLng value) {
       if (highBuilder_ == null) {
-        if (high_ != null) {
-          high_ = com.google.type.LatLng.newBuilder(high_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && high_ != null
+            && high_ != com.google.type.LatLng.getDefaultInstance()) {
+          getHighBuilder().mergeFrom(value);
         } else {
           high_ = value;
         }
-        onChanged();
       } else {
         highBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -859,14 +866,13 @@ public Builder mergeHigh(com.google.type.LatLng value) {
      * <code>.google.type.LatLng high = 2;</code>
      */
     public Builder clearHigh() {
-      if (highBuilder_ == null) {
-        high_ = null;
-        onChanged();
-      } else {
-        high_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      high_ = null;
+      if (highBuilder_ != null) {
+        highBuilder_.dispose();
         highBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -879,7 +885,7 @@ public Builder clearHigh() {
      * <code>.google.type.LatLng high = 2;</code>
      */
     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/logging/type/HttpRequest.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequest.java
index 210ae36d52..ec6b3577e8 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
@@ -76,7 +76,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int REQUEST_METHOD_FIELD_NUMBER = 1;
-  private volatile java.lang.Object requestMethod_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object requestMethod_ = "";
   /**
    *
    *
@@ -125,7 +127,9 @@ public com.google.protobuf.ByteString getRequestMethodBytes() {
   }
 
   public static final int REQUEST_URL_FIELD_NUMBER = 2;
-  private volatile java.lang.Object requestUrl_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object requestUrl_ = "";
   /**
    *
    *
@@ -178,7 +182,7 @@ public com.google.protobuf.ByteString getRequestUrlBytes() {
   }
 
   public static final int REQUEST_SIZE_FIELD_NUMBER = 3;
-  private long requestSize_;
+  private long requestSize_ = 0L;
   /**
    *
    *
@@ -197,7 +201,7 @@ public long getRequestSize() {
   }
 
   public static final int STATUS_FIELD_NUMBER = 4;
-  private int status_;
+  private int status_ = 0;
   /**
    *
    *
@@ -216,7 +220,7 @@ public int getStatus() {
   }
 
   public static final int RESPONSE_SIZE_FIELD_NUMBER = 5;
-  private long responseSize_;
+  private long responseSize_ = 0L;
   /**
    *
    *
@@ -235,7 +239,9 @@ public long getResponseSize() {
   }
 
   public static final int USER_AGENT_FIELD_NUMBER = 6;
-  private volatile java.lang.Object userAgent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object userAgent_ = "";
   /**
    *
    *
@@ -288,7 +294,9 @@ public com.google.protobuf.ByteString getUserAgentBytes() {
   }
 
   public static final int REMOTE_IP_FIELD_NUMBER = 7;
-  private volatile java.lang.Object remoteIp_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object remoteIp_ = "";
   /**
    *
    *
@@ -341,7 +349,9 @@ public com.google.protobuf.ByteString getRemoteIpBytes() {
   }
 
   public static final int SERVER_IP_FIELD_NUMBER = 13;
-  private volatile java.lang.Object serverIp_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object serverIp_ = "";
   /**
    *
    *
@@ -394,7 +404,9 @@ public com.google.protobuf.ByteString getServerIpBytes() {
   }
 
   public static final int REFERER_FIELD_NUMBER = 8;
-  private volatile java.lang.Object referer_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object referer_ = "";
   /**
    *
    *
@@ -492,11 +504,11 @@ public com.google.protobuf.Duration getLatency() {
    */
   @java.lang.Override
   public com.google.protobuf.DurationOrBuilder getLatencyOrBuilder() {
-    return getLatency();
+    return latency_ == null ? com.google.protobuf.Duration.getDefaultInstance() : latency_;
   }
 
   public static final int CACHE_LOOKUP_FIELD_NUMBER = 11;
-  private boolean cacheLookup_;
+  private boolean cacheLookup_ = false;
   /**
    *
    *
@@ -514,7 +526,7 @@ public boolean getCacheLookup() {
   }
 
   public static final int CACHE_HIT_FIELD_NUMBER = 9;
-  private boolean cacheHit_;
+  private boolean cacheHit_ = false;
   /**
    *
    *
@@ -533,7 +545,7 @@ public boolean getCacheHit() {
   }
 
   public static final int CACHE_VALIDATED_WITH_ORIGIN_SERVER_FIELD_NUMBER = 10;
-  private boolean cacheValidatedWithOriginServer_;
+  private boolean cacheValidatedWithOriginServer_ = false;
   /**
    *
    *
@@ -553,7 +565,7 @@ public boolean getCacheValidatedWithOriginServer() {
   }
 
   public static final int CACHE_FILL_BYTES_FIELD_NUMBER = 12;
-  private long cacheFillBytes_;
+  private long cacheFillBytes_ = 0L;
   /**
    *
    *
@@ -572,7 +584,9 @@ public long getCacheFillBytes() {
   }
 
   public static final int PROTOCOL_FIELD_NUMBER = 15;
-  private volatile java.lang.Object protocol_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object protocol_ = "";
   /**
    *
    *
@@ -952,40 +966,26 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       requestMethod_ = "";
-
       requestUrl_ = "";
-
       requestSize_ = 0L;
-
       status_ = 0;
-
       responseSize_ = 0L;
-
       userAgent_ = "";
-
       remoteIp_ = "";
-
       serverIp_ = "";
-
       referer_ = "";
-
-      if (latencyBuilder_ == null) {
-        latency_ = null;
-      } else {
-        latency_ = null;
+      latency_ = null;
+      if (latencyBuilder_ != null) {
+        latencyBuilder_.dispose();
         latencyBuilder_ = null;
       }
       cacheLookup_ = false;
-
       cacheHit_ = false;
-
       cacheValidatedWithOriginServer_ = false;
-
       cacheFillBytes_ = 0L;
-
       protocol_ = "";
-
       return this;
     }
 
@@ -1012,29 +1012,62 @@ 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);
-      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();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      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_;
+      }
+      if (((from_bitField0_ & 0x00000200) != 0)) {
+        result.latency_ = latencyBuilder_ == null ? latency_ : latencyBuilder_.build();
+      }
+      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_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -1082,10 +1115,12 @@ 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) {
@@ -1099,18 +1134,22 @@ 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()) {
@@ -1130,6 +1169,7 @@ public Builder mergeFrom(com.google.logging.type.HttpRequest other) {
       }
       if (!other.getProtocol().isEmpty()) {
         protocol_ = other.protocol_;
+        bitField0_ |= 0x00004000;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -1161,91 +1201,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:
@@ -1265,6 +1305,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object requestMethod_ = "";
     /**
      *
@@ -1326,8 +1368,8 @@ public Builder setRequestMethod(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       requestMethod_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1343,8 +1385,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;
     }
@@ -1365,8 +1407,8 @@ public Builder setRequestMethodBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       requestMethod_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1438,8 +1480,8 @@ public Builder setRequestUrl(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       requestUrl_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1457,8 +1499,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;
     }
@@ -1481,8 +1523,8 @@ public Builder setRequestUrlBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       requestUrl_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1520,6 +1562,7 @@ public long getRequestSize() {
     public Builder setRequestSize(long value) {
 
       requestSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1536,7 +1579,7 @@ public Builder setRequestSize(long value) {
      * @return This builder for chaining.
      */
     public Builder clearRequestSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       requestSize_ = 0L;
       onChanged();
       return this;
@@ -1575,6 +1618,7 @@ public int getStatus() {
     public Builder setStatus(int value) {
 
       status_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1591,7 +1635,7 @@ public Builder setStatus(int value) {
      * @return This builder for chaining.
      */
     public Builder clearStatus() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       status_ = 0;
       onChanged();
       return this;
@@ -1630,6 +1674,7 @@ public long getResponseSize() {
     public Builder setResponseSize(long value) {
 
       responseSize_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1646,7 +1691,7 @@ public Builder setResponseSize(long value) {
      * @return This builder for chaining.
      */
     public Builder clearResponseSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000010);
       responseSize_ = 0L;
       onChanged();
       return this;
@@ -1719,8 +1764,8 @@ public Builder setUserAgent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       userAgent_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1738,8 +1783,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;
     }
@@ -1762,8 +1807,8 @@ public Builder setUserAgentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       userAgent_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1835,8 +1880,8 @@ public Builder setRemoteIp(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       remoteIp_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -1854,8 +1899,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;
     }
@@ -1878,8 +1923,8 @@ public Builder setRemoteIpBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       remoteIp_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -1951,8 +1996,8 @@ public Builder setServerIp(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       serverIp_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -1970,8 +2015,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;
     }
@@ -1994,8 +2039,8 @@ public Builder setServerIpBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       serverIp_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2067,8 +2112,8 @@ public Builder setReferer(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       referer_ = value;
+      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -2086,8 +2131,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;
     }
@@ -2110,8 +2155,8 @@ public Builder setRefererBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       referer_ = value;
+      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -2135,7 +2180,7 @@ public Builder setRefererBytes(com.google.protobuf.ByteString value) {
      * @return Whether the latency field is set.
      */
     public boolean hasLatency() {
-      return latencyBuilder_ != null || latency_ != null;
+      return ((bitField0_ & 0x00000200) != 0);
     }
     /**
      *
@@ -2172,11 +2217,11 @@ public Builder setLatency(com.google.protobuf.Duration value) {
           throw new NullPointerException();
         }
         latency_ = value;
-        onChanged();
       } else {
         latencyBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -2192,11 +2237,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;
     }
     /**
@@ -2211,17 +2256,18 @@ public Builder setLatency(com.google.protobuf.Duration.Builder builderForValue)
      */
     public Builder mergeLatency(com.google.protobuf.Duration value) {
       if (latencyBuilder_ == null) {
-        if (latency_ != null) {
-          latency_ =
-              com.google.protobuf.Duration.newBuilder(latency_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000200) != 0)
+            && latency_ != null
+            && latency_ != com.google.protobuf.Duration.getDefaultInstance()) {
+          getLatencyBuilder().mergeFrom(value);
         } else {
           latency_ = value;
         }
-        onChanged();
       } else {
         latencyBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -2235,14 +2281,13 @@ public Builder mergeLatency(com.google.protobuf.Duration value) {
      * <code>.google.protobuf.Duration latency = 14;</code>
      */
     public Builder clearLatency() {
-      if (latencyBuilder_ == null) {
-        latency_ = null;
-        onChanged();
-      } else {
-        latency_ = null;
+      bitField0_ = (bitField0_ & ~0x00000200);
+      latency_ = null;
+      if (latencyBuilder_ != null) {
+        latencyBuilder_.dispose();
         latencyBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2256,7 +2301,7 @@ public Builder clearLatency() {
      * <code>.google.protobuf.Duration latency = 14;</code>
      */
     public com.google.protobuf.Duration.Builder getLatencyBuilder() {
-
+      bitField0_ |= 0x00000200;
       onChanged();
       return getLatencyFieldBuilder().getBuilder();
     }
@@ -2335,6 +2380,7 @@ public boolean getCacheLookup() {
     public Builder setCacheLookup(boolean value) {
 
       cacheLookup_ = value;
+      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -2350,7 +2396,7 @@ public Builder setCacheLookup(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearCacheLookup() {
-
+      bitField0_ = (bitField0_ & ~0x00000400);
       cacheLookup_ = false;
       onChanged();
       return this;
@@ -2389,6 +2435,7 @@ public boolean getCacheHit() {
     public Builder setCacheHit(boolean value) {
 
       cacheHit_ = value;
+      bitField0_ |= 0x00000800;
       onChanged();
       return this;
     }
@@ -2405,7 +2452,7 @@ public Builder setCacheHit(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearCacheHit() {
-
+      bitField0_ = (bitField0_ & ~0x00000800);
       cacheHit_ = false;
       onChanged();
       return this;
@@ -2446,6 +2493,7 @@ public boolean getCacheValidatedWithOriginServer() {
     public Builder setCacheValidatedWithOriginServer(boolean value) {
 
       cacheValidatedWithOriginServer_ = value;
+      bitField0_ |= 0x00001000;
       onChanged();
       return this;
     }
@@ -2463,7 +2511,7 @@ public Builder setCacheValidatedWithOriginServer(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearCacheValidatedWithOriginServer() {
-
+      bitField0_ = (bitField0_ & ~0x00001000);
       cacheValidatedWithOriginServer_ = false;
       onChanged();
       return this;
@@ -2502,6 +2550,7 @@ public long getCacheFillBytes() {
     public Builder setCacheFillBytes(long value) {
 
       cacheFillBytes_ = value;
+      bitField0_ |= 0x00002000;
       onChanged();
       return this;
     }
@@ -2518,7 +2567,7 @@ public Builder setCacheFillBytes(long value) {
      * @return This builder for chaining.
      */
     public Builder clearCacheFillBytes() {
-
+      bitField0_ = (bitField0_ & ~0x00002000);
       cacheFillBytes_ = 0L;
       onChanged();
       return this;
@@ -2585,8 +2634,8 @@ public Builder setProtocol(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       protocol_ = value;
+      bitField0_ |= 0x00004000;
       onChanged();
       return this;
     }
@@ -2602,8 +2651,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;
     }
@@ -2624,8 +2673,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/longrunning/CancelOperationRequest.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/CancelOperationRequest.java
index 667ad12bd3..455e6539e5 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/CancelOperationRequest.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/CancelOperationRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -313,8 +315,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -342,11 +344,20 @@ public com.google.longrunning.CancelOperationRequest build() {
     public com.google.longrunning.CancelOperationRequest buildPartial() {
       com.google.longrunning.CancelOperationRequest result =
           new com.google.longrunning.CancelOperationRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -394,6 +405,7 @@ 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());
@@ -425,7 +437,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -445,6 +457,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -506,8 +520,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -523,8 +537,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;
     }
@@ -545,8 +559,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/DeleteOperationRequest.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/DeleteOperationRequest.java
index 0e8530ef0d..5d74c7f44c 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/DeleteOperationRequest.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/DeleteOperationRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -313,8 +315,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -342,11 +344,20 @@ public com.google.longrunning.DeleteOperationRequest build() {
     public com.google.longrunning.DeleteOperationRequest buildPartial() {
       com.google.longrunning.DeleteOperationRequest result =
           new com.google.longrunning.DeleteOperationRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -394,6 +405,7 @@ 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());
@@ -425,7 +437,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -445,6 +457,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -506,8 +520,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -523,8 +537,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;
     }
@@ -545,8 +559,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/GetOperationRequest.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/GetOperationRequest.java
index 5d46681a3d..c815fad8a1 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/GetOperationRequest.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/GetOperationRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -313,8 +315,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -342,11 +344,20 @@ public com.google.longrunning.GetOperationRequest build() {
     public com.google.longrunning.GetOperationRequest buildPartial() {
       com.google.longrunning.GetOperationRequest result =
           new com.google.longrunning.GetOperationRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -394,6 +405,7 @@ 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());
@@ -425,7 +437,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -445,6 +457,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -506,8 +520,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -523,8 +537,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;
     }
@@ -545,8 +559,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/ListOperationsRequest.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsRequest.java
index 39ba4f6f8e..7da625be76 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsRequest.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 4;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -119,7 +121,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int FILTER_FIELD_NUMBER = 1;
-  private volatile java.lang.Object filter_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object filter_ = "";
   /**
    *
    *
@@ -168,7 +172,7 @@ public com.google.protobuf.ByteString getFilterBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -186,7 +190,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -458,14 +464,11 @@ 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;
     }
 
@@ -493,14 +496,29 @@ public com.google.longrunning.ListOperationsRequest build() {
     public com.google.longrunning.ListOperationsRequest buildPartial() {
       com.google.longrunning.ListOperationsRequest result =
           new com.google.longrunning.ListOperationsRequest(this);
-      result.name_ = name_;
-      result.filter_ = filter_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -548,10 +566,12 @@ 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) {
@@ -559,6 +579,7 @@ public Builder mergeFrom(com.google.longrunning.ListOperationsRequest other) {
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -590,25 +611,25 @@ 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
             default:
@@ -628,6 +649,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -689,8 +712,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -706,8 +729,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,8 +751,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -795,8 +818,8 @@ public Builder setFilter(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       filter_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -812,8 +835,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;
     }
@@ -834,8 +857,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       filter_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -871,6 +894,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -886,7 +910,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -953,8 +977,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -970,8 +994,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;
     }
@@ -992,8 +1016,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/longrunning/ListOperationsResponse.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsResponse.java
index 06d2173cf3..af082c12a4 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsResponse.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsResponse.java
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int OPERATIONS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.longrunning.Operation> operations_;
   /**
    *
@@ -138,7 +140,9 @@ public com.google.longrunning.OperationOrBuilder getOperationsOrBuilder(int inde
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -394,6 +398,7 @@ 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 {
@@ -402,7 +407,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -430,7 +434,15 @@ public com.google.longrunning.ListOperationsResponse build() {
     public com.google.longrunning.ListOperationsResponse buildPartial() {
       com.google.longrunning.ListOperationsResponse result =
           new com.google.longrunning.ListOperationsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.longrunning.ListOperationsResponse result) {
       if (operationsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           operations_ = java.util.Collections.unmodifiableList(operations_);
@@ -440,9 +452,13 @@ public com.google.longrunning.ListOperationsResponse buildPartial() {
       } else {
         result.operations_ = operationsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.longrunning.ListOperationsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -519,6 +535,7 @@ public Builder mergeFrom(com.google.longrunning.ListOperationsResponse other) {
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -562,7 +579,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -993,8 +1010,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1010,8 +1027,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;
     }
@@ -1032,8 +1049,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/longrunning/Operation.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/Operation.java
index 1f1601dabd..16832c02ce 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/Operation.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/Operation.java
@@ -115,7 +115,9 @@ public ResultCase getResultCase() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -219,11 +221,11 @@ public com.google.protobuf.Any getMetadata() {
    */
   @java.lang.Override
   public com.google.protobuf.AnyOrBuilder getMetadataOrBuilder() {
-    return getMetadata();
+    return metadata_ == null ? com.google.protobuf.Any.getDefaultInstance() : metadata_;
   }
 
   public static final int DONE_FIELD_NUMBER = 3;
-  private boolean done_;
+  private boolean done_ = false;
   /**
    *
    *
@@ -623,16 +625,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
-      if (metadataBuilder_ == null) {
-        metadata_ = null;
-      } else {
-        metadata_ = null;
+      metadata_ = null;
+      if (metadataBuilder_ != null) {
+        metadataBuilder_.dispose();
         metadataBuilder_ = null;
       }
       done_ = false;
-
       if (errorBuilder_ != null) {
         errorBuilder_.clear();
       }
@@ -667,30 +667,36 @@ 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);
-      result.name_ = name_;
-      if (metadataBuilder_ == null) {
-        result.metadata_ = metadata_;
-      } else {
-        result.metadata_ = metadataBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.done_ = done_;
-      if (resultCase_ == 4) {
-        if (errorBuilder_ == null) {
-          result.result_ = result_;
-        } else {
-          result.result_ = errorBuilder_.build();
-        }
+      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_;
       }
-      if (resultCase_ == 5) {
-        if (responseBuilder_ == null) {
-          result.result_ = result_;
-        } else {
-          result.result_ = responseBuilder_.build();
-        }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.metadata_ = metadataBuilder_ == null ? metadata_ : metadataBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.done_ = done_;
       }
+    }
+
+    private void buildPartialOneofs(com.google.longrunning.Operation result) {
       result.resultCase_ = resultCase_;
-      onBuilt();
-      return result;
+      result.result_ = this.result_;
+      if (resultCase_ == 4 && errorBuilder_ != null) {
+        result.result_ = errorBuilder_.build();
+      }
+      if (resultCase_ == 5 && responseBuilder_ != null) {
+        result.result_ = responseBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -740,6 +746,7 @@ 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()) {
@@ -793,19 +800,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:
@@ -851,6 +858,8 @@ public Builder clearResult() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -918,8 +927,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -937,8 +946,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;
     }
@@ -961,8 +970,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -988,7 +997,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      * @return Whether the metadata field is set.
      */
     public boolean hasMetadata() {
-      return metadataBuilder_ != null || metadata_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -1029,11 +1038,11 @@ public Builder setMetadata(com.google.protobuf.Any value) {
           throw new NullPointerException();
         }
         metadata_ = value;
-        onChanged();
       } else {
         metadataBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1051,11 +1060,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;
     }
     /**
@@ -1072,16 +1081,18 @@ public Builder setMetadata(com.google.protobuf.Any.Builder builderForValue) {
      */
     public Builder mergeMetadata(com.google.protobuf.Any value) {
       if (metadataBuilder_ == null) {
-        if (metadata_ != null) {
-          metadata_ = com.google.protobuf.Any.newBuilder(metadata_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && metadata_ != null
+            && metadata_ != com.google.protobuf.Any.getDefaultInstance()) {
+          getMetadataBuilder().mergeFrom(value);
         } else {
           metadata_ = value;
         }
-        onChanged();
       } else {
         metadataBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1097,14 +1108,13 @@ public Builder mergeMetadata(com.google.protobuf.Any value) {
      * <code>.google.protobuf.Any metadata = 2;</code>
      */
     public Builder clearMetadata() {
-      if (metadataBuilder_ == null) {
-        metadata_ = null;
-        onChanged();
-      } else {
-        metadata_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      metadata_ = null;
+      if (metadataBuilder_ != null) {
+        metadataBuilder_.dispose();
         metadataBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1120,7 +1130,7 @@ public Builder clearMetadata() {
      * <code>.google.protobuf.Any metadata = 2;</code>
      */
     public com.google.protobuf.Any.Builder getMetadataBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getMetadataFieldBuilder().getBuilder();
     }
@@ -1206,6 +1216,7 @@ public boolean getDone() {
     public Builder setDone(boolean value) {
 
       done_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1223,7 +1234,7 @@ public Builder setDone(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearDone() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       done_ = false;
       onChanged();
       return this;
@@ -1426,7 +1437,6 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
       }
       resultCase_ = 4;
       onChanged();
-      ;
       return errorBuilder_;
     }
 
@@ -1694,7 +1704,6 @@ 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 d6511558c0..8e6dd32dd9 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/OperationInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/OperationInfo.java
@@ -77,7 +77,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RESPONSE_TYPE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object responseType_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object responseType_ = "";
   /**
    *
    *
@@ -136,7 +138,9 @@ public com.google.protobuf.ByteString getResponseTypeBytes() {
   }
 
   public static final int METADATA_TYPE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object metadataType_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object metadataType_ = "";
   /**
    *
    *
@@ -404,10 +408,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       responseType_ = "";
-
       metadataType_ = "";
-
       return this;
     }
 
@@ -434,12 +437,23 @@ 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);
-      result.responseType_ = responseType_;
-      result.metadataType_ = metadataType_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -487,10 +501,12 @@ 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());
@@ -522,13 +538,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:
@@ -548,6 +564,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object responseType_ = "";
     /**
      *
@@ -624,8 +642,8 @@ public Builder setResponseType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       responseType_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -646,8 +664,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;
     }
@@ -673,8 +691,8 @@ public Builder setResponseTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       responseType_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -752,8 +770,8 @@ public Builder setMetadataType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       metadataType_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -773,8 +791,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;
     }
@@ -799,8 +817,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/WaitOperationRequest.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/WaitOperationRequest.java
index 24e6006cbd..69570f9b3c 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/WaitOperationRequest.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/WaitOperationRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -165,7 +167,7 @@ public com.google.protobuf.Duration getTimeout() {
    */
   @java.lang.Override
   public com.google.protobuf.DurationOrBuilder getTimeoutOrBuilder() {
-    return getTimeout();
+    return timeout_ == null ? com.google.protobuf.Duration.getDefaultInstance() : timeout_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -379,12 +381,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
-      if (timeoutBuilder_ == null) {
-        timeout_ = null;
-      } else {
-        timeout_ = null;
+      timeout_ = null;
+      if (timeoutBuilder_ != null) {
+        timeoutBuilder_.dispose();
         timeoutBuilder_ = null;
       }
       return this;
@@ -414,16 +415,23 @@ public com.google.longrunning.WaitOperationRequest build() {
     public com.google.longrunning.WaitOperationRequest buildPartial() {
       com.google.longrunning.WaitOperationRequest result =
           new com.google.longrunning.WaitOperationRequest(this);
-      result.name_ = name_;
-      if (timeoutBuilder_ == null) {
-        result.timeout_ = timeout_;
-      } else {
-        result.timeout_ = timeoutBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.longrunning.WaitOperationRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.timeout_ = timeoutBuilder_ == null ? timeout_ : timeoutBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -471,6 +479,7 @@ 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()) {
@@ -505,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:
@@ -531,6 +540,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -592,8 +603,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -609,8 +620,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;
     }
@@ -631,8 +642,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -657,7 +668,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      * @return Whether the timeout field is set.
      */
     public boolean hasTimeout() {
-      return timeoutBuilder_ != null || timeout_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -696,11 +707,11 @@ public Builder setTimeout(com.google.protobuf.Duration value) {
           throw new NullPointerException();
         }
         timeout_ = value;
-        onChanged();
       } else {
         timeoutBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -717,11 +728,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;
     }
     /**
@@ -737,17 +748,18 @@ public Builder setTimeout(com.google.protobuf.Duration.Builder builderForValue)
      */
     public Builder mergeTimeout(com.google.protobuf.Duration value) {
       if (timeoutBuilder_ == null) {
-        if (timeout_ != null) {
-          timeout_ =
-              com.google.protobuf.Duration.newBuilder(timeout_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && timeout_ != null
+            && timeout_ != com.google.protobuf.Duration.getDefaultInstance()) {
+          getTimeoutBuilder().mergeFrom(value);
         } else {
           timeout_ = value;
         }
-        onChanged();
       } else {
         timeoutBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -762,14 +774,13 @@ public Builder mergeTimeout(com.google.protobuf.Duration value) {
      * <code>.google.protobuf.Duration timeout = 2;</code>
      */
     public Builder clearTimeout() {
-      if (timeoutBuilder_ == null) {
-        timeout_ = null;
-        onChanged();
-      } else {
-        timeout_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      timeout_ = null;
+      if (timeoutBuilder_ != null) {
+        timeoutBuilder_.dispose();
         timeoutBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -784,7 +795,7 @@ public Builder clearTimeout() {
      * <code>.google.protobuf.Duration timeout = 2;</code>
      */
     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/rpc/BadRequest.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/BadRequest.java
index fb2a0c008d..417e4ab37f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/BadRequest.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/BadRequest.java
@@ -227,7 +227,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int FIELD_FIELD_NUMBER = 1;
-    private volatile java.lang.Object field_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object field_ = "";
     /**
      *
      *
@@ -332,7 +334,9 @@ public com.google.protobuf.ByteString getFieldBytes() {
     }
 
     public static final int DESCRIPTION_FIELD_NUMBER = 2;
-    private volatile java.lang.Object description_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object description_ = "";
     /**
      *
      *
@@ -588,10 +592,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         field_ = "";
-
         description_ = "";
-
         return this;
       }
 
@@ -619,12 +622,23 @@ 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);
-        result.field_ = field_;
-        result.description_ = description_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         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_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -674,10 +688,12 @@ 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();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -709,13 +725,13 @@ public Builder mergeFrom(
               case 10:
                 {
                   field_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
                 {
                   description_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 18
               default:
@@ -735,6 +751,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object field_ = "";
       /**
        *
@@ -880,8 +898,8 @@ public Builder setField(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         field_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -925,8 +943,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;
       }
@@ -975,8 +993,8 @@ public Builder setFieldBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         field_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1042,8 +1060,8 @@ public Builder setDescription(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         description_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1059,8 +1077,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;
       }
@@ -1081,8 +1099,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         description_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1152,6 +1170,8 @@ public com.google.rpc.BadRequest.FieldViolation getDefaultInstanceForType() {
   }
 
   public static final int FIELD_VIOLATIONS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.rpc.BadRequest.FieldViolation> fieldViolations_;
   /**
    *
@@ -1416,6 +1436,7 @@ 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 {
@@ -1448,7 +1469,15 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.rpc.BadRequest result) {
       if (fieldViolationsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           fieldViolations_ = java.util.Collections.unmodifiableList(fieldViolations_);
@@ -1458,8 +1487,10 @@ public com.google.rpc.BadRequest buildPartial() {
       } else {
         result.fieldViolations_ = fieldViolationsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.rpc.BadRequest result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
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 cf5e887fba..278956d960 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/DebugInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/DebugInfo.java
@@ -66,6 +66,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int STACK_ENTRIES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList stackEntries_;
   /**
    *
@@ -127,7 +129,9 @@ public com.google.protobuf.ByteString getStackEntriesBytes(int index) {
   }
 
   public static final int DETAIL_FIELD_NUMBER = 2;
-  private volatile java.lang.Object detail_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object detail_ = "";
   /**
    *
    *
@@ -384,10 +388,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       stackEntries_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000001);
       detail_ = "";
-
       return this;
     }
 
@@ -413,15 +417,27 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.rpc.DebugInfo result) {
       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_ & 0x00000002) != 0)) {
+        result.detail_ = detail_;
+      }
     }
 
     @java.lang.Override
@@ -481,6 +497,7 @@ public Builder mergeFrom(com.google.rpc.DebugInfo other) {
       }
       if (!other.getDetail().isEmpty()) {
         detail_ = other.detail_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -519,7 +536,7 @@ public Builder mergeFrom(
             case 18:
               {
                 detail_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -770,8 +787,8 @@ public Builder setDetail(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       detail_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -787,8 +804,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;
     }
@@ -809,8 +826,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/ErrorInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ErrorInfo.java
index b0cc214936..b5c4a71be2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ErrorInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ErrorInfo.java
@@ -95,7 +95,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   }
 
   public static final int REASON_FIELD_NUMBER = 1;
-  private volatile java.lang.Object reason_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object reason_ = "";
   /**
    *
    *
@@ -152,7 +154,9 @@ public com.google.protobuf.ByteString getReasonBytes() {
   }
 
   public static final int DOMAIN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object domain_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object domain_ = "";
   /**
    *
    *
@@ -223,6 +227,7 @@ private static final class MetadataDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> metadata_;
 
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> internalGetMetadata() {
@@ -298,8 +303,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
    * <code>map&lt;string, string&gt; metadata = 3;</code>
    */
   @java.lang.Override
-  public java.lang.String getMetadataOrDefault(
-      java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getMetadataOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -590,10 +597,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       reason_ = "";
-
       domain_ = "";
-
       internalGetMutableMetadata().clear();
       return this;
     }
@@ -620,15 +626,27 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.reason_ = reason_;
-      result.domain_ = domain_;
-      result.metadata_ = internalGetMetadata();
-      result.metadata_.makeImmutable();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -676,13 +694,16 @@ 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;
@@ -712,13 +733,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:
@@ -730,6 +751,7 @@ public Builder mergeFrom(
                 internalGetMutableMetadata()
                     .getMutableMap()
                     .put(metadata__.getKey(), metadata__.getValue());
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -824,8 +846,8 @@ public Builder setReason(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       reason_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -845,8 +867,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;
     }
@@ -871,8 +893,8 @@ public Builder setReasonBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       reason_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -953,8 +975,8 @@ public Builder setDomain(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       domain_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -975,8 +997,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;
     }
@@ -1002,8 +1024,8 @@ public Builder setDomainBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       domain_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1019,8 +1041,6 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
         internalGetMutableMetadata() {
-      onChanged();
-      ;
       if (metadata_ == null) {
         metadata_ =
             com.google.protobuf.MapField.newMapField(MetadataDefaultEntryHolder.defaultEntry);
@@ -1028,6 +1048,8 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
       if (!metadata_.isMutable()) {
         metadata_ = metadata_.copy();
       }
+      bitField0_ |= 0x00000004;
+      onChanged();
       return metadata_;
     }
 
@@ -1097,8 +1119,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
      * <code>map&lt;string, string&gt; metadata = 3;</code>
      */
     @java.lang.Override
-    public java.lang.String getMetadataOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getMetadataOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1133,6 +1157,7 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
     }
 
     public Builder clearMetadata() {
+      bitField0_ = (bitField0_ & ~0x00000004);
       internalGetMutableMetadata().getMutableMap().clear();
       return this;
     }
@@ -1161,6 +1186,7 @@ public Builder removeMetadata(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMutableMetadata() {
+      bitField0_ |= 0x00000004;
       return internalGetMutableMetadata().getMutableMap();
     }
     /**
@@ -1185,8 +1211,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;
     }
     /**
@@ -1206,6 +1232,7 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllMetadata(java.util.Map<java.lang.String, java.lang.String> 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 8b413bb402..c563c2a587 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ErrorInfoOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ErrorInfoOrBuilder.java
@@ -157,7 +157,6 @@ public interface ErrorInfoOrBuilder
    *
    * <code>map&lt;string, string&gt; metadata = 3;</code>
    */
-
   /* nullable */
   java.lang.String getMetadataOrDefault(
       java.lang.String key,
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 d1568fa989..e9063f68b9 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/Help.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/Help.java
@@ -171,7 +171,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int DESCRIPTION_FIELD_NUMBER = 1;
-    private volatile java.lang.Object description_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object description_ = "";
     /**
      *
      *
@@ -220,7 +222,9 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
     }
 
     public static final int URL_FIELD_NUMBER = 2;
-    private volatile java.lang.Object url_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object url_ = "";
     /**
      *
      *
@@ -472,10 +476,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         description_ = "";
-
         url_ = "";
-
         return this;
       }
 
@@ -501,12 +504,23 @@ 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);
-        result.description_ = description_;
-        result.url_ = url_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         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();
@@ -556,10 +570,12 @@ 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());
@@ -591,13 +607,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:
@@ -617,6 +633,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object description_ = "";
       /**
        *
@@ -678,8 +696,8 @@ public Builder setDescription(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         description_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -695,8 +713,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;
       }
@@ -717,8 +735,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         description_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -784,8 +802,8 @@ public Builder setUrl(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         url_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -801,8 +819,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;
       }
@@ -823,8 +841,8 @@ public Builder setUrlBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         url_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -894,6 +912,8 @@ public com.google.rpc.Help.Link getDefaultInstanceForType() {
   }
 
   public static final int LINKS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.rpc.Help.Link> links_;
   /**
    *
@@ -1158,6 +1178,7 @@ 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 {
@@ -1190,7 +1211,15 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.rpc.Help result) {
       if (linksBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           links_ = java.util.Collections.unmodifiableList(links_);
@@ -1200,8 +1229,10 @@ public com.google.rpc.Help buildPartial() {
       } else {
         result.links_ = linksBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.rpc.Help result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
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 6770dc7c0f..b91c680d20 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/LocalizedMessage.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/LocalizedMessage.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int LOCALE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object locale_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object locale_ = "";
   /**
    *
    *
@@ -121,7 +123,9 @@ public com.google.protobuf.ByteString getLocaleBytes() {
   }
 
   public static final int MESSAGE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object message_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object message_ = "";
   /**
    *
    *
@@ -373,10 +377,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       locale_ = "";
-
       message_ = "";
-
       return this;
     }
 
@@ -403,12 +406,23 @@ 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);
-      result.locale_ = locale_;
-      result.message_ = message_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -456,10 +470,12 @@ 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());
@@ -491,13 +507,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:
@@ -517,6 +533,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object locale_ = "";
     /**
      *
@@ -584,8 +602,8 @@ public Builder setLocale(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       locale_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -603,8 +621,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;
     }
@@ -627,8 +645,8 @@ public Builder setLocaleBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       locale_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -694,8 +712,8 @@ public Builder setMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       message_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -711,8 +729,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;
     }
@@ -733,8 +751,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/PreconditionFailure.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/PreconditionFailure.java
index bb4d9a0cc1..06c6a00f15 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/PreconditionFailure.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/PreconditionFailure.java
@@ -214,7 +214,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int TYPE_FIELD_NUMBER = 1;
-    private volatile java.lang.Object type_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object type_ = "";
     /**
      *
      *
@@ -267,7 +269,9 @@ public com.google.protobuf.ByteString getTypeBytes() {
     }
 
     public static final int SUBJECT_FIELD_NUMBER = 2;
-    private volatile java.lang.Object subject_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object subject_ = "";
     /**
      *
      *
@@ -320,7 +324,9 @@ public com.google.protobuf.ByteString getSubjectBytes() {
     }
 
     public static final int DESCRIPTION_FIELD_NUMBER = 3;
-    private volatile java.lang.Object description_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object description_ = "";
     /**
      *
      *
@@ -589,12 +595,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         type_ = "";
-
         subject_ = "";
-
         description_ = "";
-
         return this;
       }
 
@@ -622,13 +626,26 @@ 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);
-        result.type_ = type_;
-        result.subject_ = subject_;
-        result.description_ = description_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         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();
@@ -678,14 +695,17 @@ 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());
@@ -717,19 +737,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:
@@ -749,6 +769,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object type_ = "";
       /**
        *
@@ -816,8 +838,8 @@ public Builder setType(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         type_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -835,8 +857,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;
       }
@@ -859,8 +881,8 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         type_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -932,8 +954,8 @@ public Builder setSubject(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         subject_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -951,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;
       }
@@ -975,8 +997,8 @@ public Builder setSubjectBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         subject_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1048,8 +1070,8 @@ public Builder setDescription(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         description_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1067,8 +1089,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;
       }
@@ -1091,8 +1113,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         description_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1162,6 +1184,8 @@ public com.google.rpc.PreconditionFailure.Violation getDefaultInstanceForType()
   }
 
   public static final int VIOLATIONS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.rpc.PreconditionFailure.Violation> violations_;
   /**
    *
@@ -1430,6 +1454,7 @@ 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 {
@@ -1463,7 +1488,15 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.rpc.PreconditionFailure result) {
       if (violationsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           violations_ = java.util.Collections.unmodifiableList(violations_);
@@ -1473,8 +1506,10 @@ public com.google.rpc.PreconditionFailure buildPartial() {
       } else {
         result.violations_ = violationsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.rpc.PreconditionFailure result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
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 d0527f31c7..5b9a09d8e5 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/QuotaFailure.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/QuotaFailure.java
@@ -194,7 +194,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int SUBJECT_FIELD_NUMBER = 1;
-    private volatile java.lang.Object subject_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object subject_ = "";
     /**
      *
      *
@@ -247,7 +249,9 @@ public com.google.protobuf.ByteString getSubjectBytes() {
     }
 
     public static final int DESCRIPTION_FIELD_NUMBER = 2;
-    private volatile java.lang.Object description_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object description_ = "";
     /**
      *
      *
@@ -513,10 +517,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         subject_ = "";
-
         description_ = "";
-
         return this;
       }
 
@@ -544,12 +547,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);
-        result.subject_ = subject_;
-        result.description_ = description_;
+        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_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -599,10 +613,12 @@ 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();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -634,13 +650,13 @@ public Builder mergeFrom(
               case 10:
                 {
                   subject_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
                 {
                   description_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 18
               default:
@@ -660,6 +676,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object subject_ = "";
       /**
        *
@@ -727,8 +745,8 @@ public Builder setSubject(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         subject_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -746,8 +764,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;
       }
@@ -770,8 +788,8 @@ public Builder setSubjectBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         subject_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -852,8 +870,8 @@ public Builder setDescription(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         description_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -874,8 +892,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;
       }
@@ -901,8 +919,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         description_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -972,6 +990,8 @@ public com.google.rpc.QuotaFailure.Violation getDefaultInstanceForType() {
   }
 
   public static final int VIOLATIONS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.rpc.QuotaFailure.Violation> violations_;
   /**
    *
@@ -1243,6 +1263,7 @@ 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 {
@@ -1275,7 +1296,15 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.rpc.QuotaFailure result) {
       if (violationsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           violations_ = java.util.Collections.unmodifiableList(violations_);
@@ -1285,8 +1314,10 @@ public com.google.rpc.QuotaFailure buildPartial() {
       } else {
         result.violations_ = violationsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.rpc.QuotaFailure result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
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 8bb7455ef9..74a95775da 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/RequestInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/RequestInfo.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int REQUEST_ID_FIELD_NUMBER = 1;
-  private volatile java.lang.Object requestId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object requestId_ = "";
   /**
    *
    *
@@ -119,7 +121,9 @@ public com.google.protobuf.ByteString getRequestIdBytes() {
   }
 
   public static final int SERVING_DATA_FIELD_NUMBER = 2;
-  private volatile java.lang.Object servingData_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object servingData_ = "";
   /**
    *
    *
@@ -372,10 +376,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       requestId_ = "";
-
       servingData_ = "";
-
       return this;
     }
 
@@ -401,12 +404,23 @@ 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);
-      result.requestId_ = requestId_;
-      result.servingData_ = servingData_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -454,10 +468,12 @@ 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());
@@ -489,13 +505,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:
@@ -515,6 +531,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object requestId_ = "";
     /**
      *
@@ -579,8 +597,8 @@ public Builder setRequestId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       requestId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -597,8 +615,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;
     }
@@ -620,8 +638,8 @@ public Builder setRequestIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       requestId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -690,8 +708,8 @@ public Builder setServingData(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       servingData_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -708,8 +726,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;
     }
@@ -731,8 +749,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/ResourceInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ResourceInfo.java
index ae45776f6c..ae4be5457a 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ResourceInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ResourceInfo.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RESOURCE_TYPE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object resourceType_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object resourceType_ = "";
   /**
    *
    *
@@ -122,7 +124,9 @@ public com.google.protobuf.ByteString getResourceTypeBytes() {
   }
 
   public static final int RESOURCE_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object resourceName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object resourceName_ = "";
   /**
    *
    *
@@ -177,7 +181,9 @@ public com.google.protobuf.ByteString getResourceNameBytes() {
   }
 
   public static final int OWNER_FIELD_NUMBER = 3;
-  private volatile java.lang.Object owner_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object owner_ = "";
   /**
    *
    *
@@ -230,7 +236,9 @@ public com.google.protobuf.ByteString getOwnerBytes() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 4;
-  private volatile java.lang.Object description_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object description_ = "";
   /**
    *
    *
@@ -502,14 +510,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       resourceType_ = "";
-
       resourceName_ = "";
-
       owner_ = "";
-
       description_ = "";
-
       return this;
     }
 
@@ -535,14 +540,29 @@ 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);
-      result.resourceType_ = resourceType_;
-      result.resourceName_ = resourceName_;
-      result.owner_ = owner_;
-      result.description_ = description_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -590,18 +610,22 @@ 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());
@@ -633,25 +657,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:
@@ -671,6 +695,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object resourceType_ = "";
     /**
      *
@@ -738,8 +764,8 @@ public Builder setResourceType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       resourceType_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -757,8 +783,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;
     }
@@ -781,8 +807,8 @@ public Builder setResourceTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       resourceType_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -857,8 +883,8 @@ public Builder setResourceName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       resourceName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -877,8 +903,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;
     }
@@ -902,8 +928,8 @@ public Builder setResourceNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       resourceName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -975,8 +1001,8 @@ public Builder setOwner(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       owner_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -994,8 +1020,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;
     }
@@ -1018,8 +1044,8 @@ public Builder setOwnerBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       owner_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1091,8 +1117,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       description_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1110,8 +1136,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;
     }
@@ -1134,8 +1160,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/RetryInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/RetryInfo.java
index d167726741..51e56791ad 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/RetryInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/RetryInfo.java
@@ -115,7 +115,7 @@ public com.google.protobuf.Duration getRetryDelay() {
    */
   @java.lang.Override
   public com.google.protobuf.DurationOrBuilder getRetryDelayOrBuilder() {
-    return getRetryDelay();
+    return retryDelay_ == null ? com.google.protobuf.Duration.getDefaultInstance() : retryDelay_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -326,10 +326,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (retryDelayBuilder_ == null) {
-        retryDelay_ = null;
-      } else {
-        retryDelay_ = null;
+      bitField0_ = 0;
+      retryDelay_ = null;
+      if (retryDelayBuilder_ != null) {
+        retryDelayBuilder_.dispose();
         retryDelayBuilder_ = null;
       }
       return this;
@@ -357,15 +357,20 @@ 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 (retryDelayBuilder_ == null) {
-        result.retryDelay_ = retryDelay_;
-      } else {
-        result.retryDelay_ = retryDelayBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.rpc.RetryInfo result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.retryDelay_ = retryDelayBuilder_ == null ? retryDelay_ : retryDelayBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -443,7 +448,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getRetryDelayFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -463,6 +468,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.protobuf.Duration retryDelay_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.protobuf.Duration,
@@ -481,7 +488,7 @@ public Builder mergeFrom(
      * @return Whether the retryDelay field is set.
      */
     public boolean hasRetryDelay() {
-      return retryDelayBuilder_ != null || retryDelay_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -518,11 +525,11 @@ public Builder setRetryDelay(com.google.protobuf.Duration value) {
           throw new NullPointerException();
         }
         retryDelay_ = value;
-        onChanged();
       } else {
         retryDelayBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -537,11 +544,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;
     }
     /**
@@ -555,17 +562,18 @@ public Builder setRetryDelay(com.google.protobuf.Duration.Builder builderForValu
      */
     public Builder mergeRetryDelay(com.google.protobuf.Duration value) {
       if (retryDelayBuilder_ == null) {
-        if (retryDelay_ != null) {
-          retryDelay_ =
-              com.google.protobuf.Duration.newBuilder(retryDelay_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && retryDelay_ != null
+            && retryDelay_ != com.google.protobuf.Duration.getDefaultInstance()) {
+          getRetryDelayBuilder().mergeFrom(value);
         } else {
           retryDelay_ = value;
         }
-        onChanged();
       } else {
         retryDelayBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -578,14 +586,13 @@ public Builder mergeRetryDelay(com.google.protobuf.Duration value) {
      * <code>.google.protobuf.Duration retry_delay = 1;</code>
      */
     public Builder clearRetryDelay() {
-      if (retryDelayBuilder_ == null) {
-        retryDelay_ = null;
-        onChanged();
-      } else {
-        retryDelay_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      retryDelay_ = null;
+      if (retryDelayBuilder_ != null) {
+        retryDelayBuilder_.dispose();
         retryDelayBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -598,7 +605,7 @@ public Builder clearRetryDelay() {
      * <code>.google.protobuf.Duration retry_delay = 1;</code>
      */
     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/Status.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/Status.java
index b390b57f09..44168247e2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/Status.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/Status.java
@@ -71,7 +71,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CODE_FIELD_NUMBER = 1;
-  private int code_;
+  private int code_ = 0;
   /**
    *
    *
@@ -90,7 +90,9 @@ public int getCode() {
   }
 
   public static final int MESSAGE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object message_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object message_ = "";
   /**
    *
    *
@@ -145,6 +147,8 @@ public com.google.protobuf.ByteString getMessageBytes() {
   }
 
   public static final int DETAILS_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.protobuf.Any> details_;
   /**
    *
@@ -434,17 +438,16 @@ 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_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000004);
       return this;
     }
 
@@ -470,20 +473,34 @@ 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);
-      int from_bitField0_ = bitField0_;
-      result.code_ = code_;
-      result.message_ = message_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.rpc.Status result) {
       if (detailsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000004) != 0)) {
           details_ = java.util.Collections.unmodifiableList(details_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.details_ = details_;
       } else {
         result.details_ = detailsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    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_;
+      }
     }
 
     @java.lang.Override
@@ -536,13 +553,14 @@ 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_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureDetailsIsMutable();
             details_.addAll(other.details_);
@@ -555,7 +573,7 @@ public Builder mergeFrom(com.google.rpc.Status other) {
             detailsBuilder_.dispose();
             detailsBuilder_ = null;
             details_ = other.details_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
             detailsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getDetailsFieldBuilder()
@@ -594,13 +612,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:
@@ -667,6 +685,7 @@ public int getCode() {
     public Builder setCode(int value) {
 
       code_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -683,7 +702,7 @@ public Builder setCode(int value) {
      * @return This builder for chaining.
      */
     public Builder clearCode() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       code_ = 0;
       onChanged();
       return this;
@@ -759,8 +778,8 @@ public Builder setMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       message_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -779,8 +798,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;
     }
@@ -804,8 +823,8 @@ public Builder setMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       message_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -813,9 +832,9 @@ public Builder setMessageBytes(com.google.protobuf.ByteString value) {
     private java.util.List<com.google.protobuf.Any> details_ = java.util.Collections.emptyList();
 
     private void ensureDetailsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         details_ = new java.util.ArrayList<com.google.protobuf.Any>(details_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000004;
       }
     }
 
@@ -1038,7 +1057,7 @@ public Builder addAllDetails(java.lang.Iterable<? extends com.google.protobuf.An
     public Builder clearDetails() {
       if (detailsBuilder_ == null) {
         details_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
       } else {
         detailsBuilder_.clear();
@@ -1164,7 +1183,7 @@ public java.util.List<com.google.protobuf.Any.Builder> getDetailsBuilderList() {
                 com.google.protobuf.Any,
                 com.google.protobuf.Any.Builder,
                 com.google.protobuf.AnyOrBuilder>(
-                details_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                details_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
         details_ = null;
       }
       return detailsBuilder_;
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 d2908189b9..1a0db34e7f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AttributeContext.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AttributeContext.java
@@ -164,7 +164,6 @@ public interface PeerOrBuilder
      *
      * <code>map&lt;string, string&gt; labels = 6;</code>
      */
-
     /* nullable */
     java.lang.String getLabelsOrDefault(
         java.lang.String key,
@@ -305,7 +304,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
     }
 
     public static final int IP_FIELD_NUMBER = 1;
-    private volatile java.lang.Object ip_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object ip_ = "";
     /**
      *
      *
@@ -354,7 +355,7 @@ public com.google.protobuf.ByteString getIpBytes() {
     }
 
     public static final int PORT_FIELD_NUMBER = 2;
-    private long port_;
+    private long port_ = 0L;
     /**
      *
      *
@@ -384,6 +385,7 @@ private static final class LabelsDefaultEntryHolder {
               "");
     }
 
+    @SuppressWarnings("serial")
     private com.google.protobuf.MapField<java.lang.String, java.lang.String> labels_;
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String> internalGetLabels() {
@@ -441,8 +443,10 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
      * <code>map&lt;string, string&gt; labels = 6;</code>
      */
     @java.lang.Override
-    public java.lang.String getLabelsOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getLabelsOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -471,7 +475,9 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
     }
 
     public static final int PRINCIPAL_FIELD_NUMBER = 7;
-    private volatile java.lang.Object principal_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object principal_ = "";
     /**
      *
      *
@@ -524,7 +530,9 @@ public com.google.protobuf.ByteString getPrincipalBytes() {
     }
 
     public static final int REGION_CODE_FIELD_NUMBER = 8;
-    private volatile java.lang.Object regionCode_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object regionCode_ = "";
     /**
      *
      *
@@ -842,15 +850,12 @@ 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;
       }
 
@@ -878,17 +883,33 @@ 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);
-        int from_bitField0_ = bitField0_;
-        result.ip_ = ip_;
-        result.port_ = port_;
-        result.labels_ = internalGetLabels();
-        result.labels_.makeImmutable();
-        result.principal_ = principal_;
-        result.regionCode_ = regionCode_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         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();
@@ -938,18 +959,22 @@ 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());
@@ -981,13 +1006,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:
@@ -999,18 +1024,19 @@ 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:
@@ -1093,8 +1119,8 @@ public Builder setIp(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         ip_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1110,8 +1136,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;
       }
@@ -1132,8 +1158,8 @@ public Builder setIpBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         ip_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1169,6 +1195,7 @@ public long getPort() {
       public Builder setPort(long value) {
 
         port_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1184,7 +1211,7 @@ public Builder setPort(long value) {
        * @return This builder for chaining.
        */
       public Builder clearPort() {
-
+        bitField0_ = (bitField0_ & ~0x00000002);
         port_ = 0L;
         onChanged();
         return this;
@@ -1201,14 +1228,14 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
 
       private com.google.protobuf.MapField<java.lang.String, java.lang.String>
           internalGetMutableLabels() {
-        onChanged();
-        ;
         if (labels_ == null) {
           labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
         }
         if (!labels_.isMutable()) {
           labels_ = labels_.copy();
         }
+        bitField0_ |= 0x00000004;
+        onChanged();
         return labels_;
       }
 
@@ -1260,8 +1287,10 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
        * <code>map&lt;string, string&gt; labels = 6;</code>
        */
       @java.lang.Override
-      public java.lang.String getLabelsOrDefault(
-          java.lang.String key, java.lang.String defaultValue) {
+      public /* nullable */ java.lang.String getLabelsOrDefault(
+          java.lang.String key,
+          /* nullable */
+          java.lang.String defaultValue) {
         if (key == null) {
           throw new NullPointerException("map key");
         }
@@ -1290,6 +1319,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
       }
 
       public Builder clearLabels() {
+        bitField0_ = (bitField0_ & ~0x00000004);
         internalGetMutableLabels().getMutableMap().clear();
         return this;
       }
@@ -1312,6 +1342,7 @@ public Builder removeLabels(java.lang.String key) {
       /** Use alternate mutation accessors instead. */
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, java.lang.String> getMutableLabels() {
+        bitField0_ |= 0x00000004;
         return internalGetMutableLabels().getMutableMap();
       }
       /**
@@ -1330,8 +1361,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;
       }
       /**
@@ -1345,6 +1376,7 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
        */
       public Builder putAllLabels(java.util.Map<java.lang.String, java.lang.String> values) {
         internalGetMutableLabels().getMutableMap().putAll(values);
+        bitField0_ |= 0x00000004;
         return this;
       }
 
@@ -1415,8 +1447,8 @@ public Builder setPrincipal(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         principal_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -1434,8 +1466,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;
       }
@@ -1458,8 +1490,8 @@ public Builder setPrincipalBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         principal_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -1531,8 +1563,8 @@ public Builder setRegionCode(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         regionCode_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1550,8 +1582,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;
       }
@@ -1574,8 +1606,8 @@ public Builder setRegionCodeBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         regionCode_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1816,7 +1848,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int SERVICE_FIELD_NUMBER = 1;
-    private volatile java.lang.Object service_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object service_ = "";
     /**
      *
      *
@@ -1869,7 +1903,9 @@ public com.google.protobuf.ByteString getServiceBytes() {
     }
 
     public static final int OPERATION_FIELD_NUMBER = 2;
-    private volatile java.lang.Object operation_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object operation_ = "";
     /**
      *
      *
@@ -1922,7 +1958,9 @@ public com.google.protobuf.ByteString getOperationBytes() {
     }
 
     public static final int PROTOCOL_FIELD_NUMBER = 3;
-    private volatile java.lang.Object protocol_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object protocol_ = "";
     /**
      *
      *
@@ -1973,7 +2011,9 @@ public com.google.protobuf.ByteString getProtocolBytes() {
     }
 
     public static final int VERSION_FIELD_NUMBER = 4;
-    private volatile java.lang.Object version_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object version_ = "";
     /**
      *
      *
@@ -2251,14 +2291,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         service_ = "";
-
         operation_ = "";
-
         protocol_ = "";
-
         version_ = "";
-
         return this;
       }
 
@@ -2286,14 +2323,29 @@ 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);
-        result.service_ = service_;
-        result.operation_ = operation_;
-        result.protocol_ = protocol_;
-        result.version_ = version_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         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();
@@ -2343,18 +2395,22 @@ 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());
@@ -2386,25 +2442,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:
@@ -2424,6 +2480,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object service_ = "";
       /**
        *
@@ -2491,8 +2549,8 @@ public Builder setService(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         service_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2510,8 +2568,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;
       }
@@ -2534,8 +2592,8 @@ public Builder setServiceBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         service_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2607,8 +2665,8 @@ public Builder setOperation(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         operation_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2626,8 +2684,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;
       }
@@ -2650,8 +2708,8 @@ public Builder setOperationBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         operation_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2720,8 +2778,8 @@ public Builder setProtocol(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         protocol_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -2738,8 +2796,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;
       }
@@ -2761,8 +2819,8 @@ public Builder setProtocolBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         protocol_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -2831,8 +2889,8 @@ public Builder setVersion(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         version_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -2849,8 +2907,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;
       }
@@ -2872,8 +2930,8 @@ public Builder setVersionBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         version_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -3303,7 +3361,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int PRINCIPAL_FIELD_NUMBER = 1;
-    private volatile java.lang.Object principal_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object principal_ = "";
     /**
      *
      *
@@ -3360,6 +3420,8 @@ public com.google.protobuf.ByteString getPrincipalBytes() {
     }
 
     public static final int AUDIENCES_FIELD_NUMBER = 2;
+
+    @SuppressWarnings("serial")
     private com.google.protobuf.LazyStringList audiences_;
     /**
      *
@@ -3465,7 +3527,9 @@ public com.google.protobuf.ByteString getAudiencesBytes(int index) {
     }
 
     public static final int PRESENTER_FIELD_NUMBER = 3;
-    private volatile java.lang.Object presenter_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object presenter_ = "";
     /**
      *
      *
@@ -3598,10 +3662,12 @@ public com.google.protobuf.Struct getClaims() {
      */
     @java.lang.Override
     public com.google.protobuf.StructOrBuilder getClaimsOrBuilder() {
-      return getClaims();
+      return claims_ == null ? com.google.protobuf.Struct.getDefaultInstance() : claims_;
     }
 
     public static final int ACCESS_LEVELS_FIELD_NUMBER = 5;
+
+    @SuppressWarnings("serial")
     private com.google.protobuf.LazyStringList accessLevels_;
     /**
      *
@@ -3938,20 +4004,18 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         principal_ = "";
-
         audiences_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         presenter_ = "";
-
-        if (claimsBuilder_ == null) {
-          claims_ = null;
-        } else {
-          claims_ = null;
+        claims_ = null;
+        if (claimsBuilder_ != null) {
+          claimsBuilder_.dispose();
           claimsBuilder_ = null;
         }
         accessLevels_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
@@ -3979,26 +4043,38 @@ 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);
-        int from_bitField0_ = bitField0_;
-        result.principal_ = principal_;
-        if (((bitField0_ & 0x00000001) != 0)) {
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(com.google.rpc.context.AttributeContext.Auth result) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           audiences_ = audiences_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.audiences_ = audiences_;
-        result.presenter_ = presenter_;
-        if (claimsBuilder_ == null) {
-          result.claims_ = claims_;
-        } else {
-          result.claims_ = claimsBuilder_.build();
-        }
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000010) != 0)) {
           accessLevels_ = accessLevels_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000010);
         }
         result.accessLevels_ = accessLevels_;
-        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_;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.presenter_ = presenter_;
+        }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.claims_ = claimsBuilder_ == null ? claims_ : claimsBuilder_.build();
+        }
       }
 
       @java.lang.Override
@@ -4050,12 +4126,13 @@ 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_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureAudiencesIsMutable();
             audiences_.addAll(other.audiences_);
@@ -4064,6 +4141,7 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext.Auth other) {
         }
         if (!other.getPresenter().isEmpty()) {
           presenter_ = other.presenter_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
         if (other.hasClaims()) {
@@ -4072,7 +4150,7 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext.Auth other) {
         if (!other.accessLevels_.isEmpty()) {
           if (accessLevels_.isEmpty()) {
             accessLevels_ = other.accessLevels_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
             ensureAccessLevelsIsMutable();
             accessLevels_.addAll(other.accessLevels_);
@@ -4108,7 +4186,7 @@ public Builder mergeFrom(
               case 10:
                 {
                   principal_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
@@ -4121,13 +4199,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:
@@ -4229,8 +4307,8 @@ public Builder setPrincipal(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         principal_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4250,8 +4328,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;
       }
@@ -4276,8 +4354,8 @@ public Builder setPrincipalBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         principal_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4286,9 +4364,9 @@ public Builder setPrincipalBytes(com.google.protobuf.ByteString value) {
           com.google.protobuf.LazyStringArrayList.EMPTY;
 
       private void ensureAudiencesIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
           audiences_ = new com.google.protobuf.LazyStringArrayList(audiences_);
-          bitField0_ |= 0x00000001;
+          bitField0_ |= 0x00000002;
         }
       }
       /**
@@ -4511,7 +4589,7 @@ public Builder addAllAudiences(java.lang.Iterable<java.lang.String> values) {
        */
       public Builder clearAudiences() {
         audiences_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -4619,8 +4697,8 @@ public Builder setPresenter(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         presenter_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -4639,8 +4717,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;
       }
@@ -4664,8 +4742,8 @@ public Builder setPresenterBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         presenter_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -4700,7 +4778,7 @@ public Builder setPresenterBytes(com.google.protobuf.ByteString value) {
        * @return Whether the claims field is set.
        */
       public boolean hasClaims() {
-        return claimsBuilder_ != null || claims_ != null;
+        return ((bitField0_ & 0x00000008) != 0);
       }
       /**
        *
@@ -4759,11 +4837,11 @@ public Builder setClaims(com.google.protobuf.Struct value) {
             throw new NullPointerException();
           }
           claims_ = value;
-          onChanged();
         } else {
           claimsBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000008;
+        onChanged();
         return this;
       }
       /**
@@ -4790,11 +4868,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;
       }
       /**
@@ -4820,17 +4898,18 @@ public Builder setClaims(com.google.protobuf.Struct.Builder builderForValue) {
        */
       public Builder mergeClaims(com.google.protobuf.Struct value) {
         if (claimsBuilder_ == null) {
-          if (claims_ != null) {
-            claims_ =
-                com.google.protobuf.Struct.newBuilder(claims_).mergeFrom(value).buildPartial();
+          if (((bitField0_ & 0x00000008) != 0)
+              && claims_ != null
+              && claims_ != com.google.protobuf.Struct.getDefaultInstance()) {
+            getClaimsBuilder().mergeFrom(value);
           } else {
             claims_ = value;
           }
-          onChanged();
         } else {
           claimsBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000008;
+        onChanged();
         return this;
       }
       /**
@@ -4855,14 +4934,13 @@ public Builder mergeClaims(com.google.protobuf.Struct value) {
        * <code>.google.protobuf.Struct claims = 4;</code>
        */
       public Builder clearClaims() {
-        if (claimsBuilder_ == null) {
-          claims_ = null;
-          onChanged();
-        } else {
-          claims_ = null;
+        bitField0_ = (bitField0_ & ~0x00000008);
+        claims_ = null;
+        if (claimsBuilder_ != null) {
+          claimsBuilder_.dispose();
           claimsBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -4887,7 +4965,7 @@ public Builder clearClaims() {
        * <code>.google.protobuf.Struct claims = 4;</code>
        */
       public com.google.protobuf.Struct.Builder getClaimsBuilder() {
-
+        bitField0_ |= 0x00000008;
         onChanged();
         return getClaimsFieldBuilder().getBuilder();
       }
@@ -4961,9 +5039,9 @@ public com.google.protobuf.StructOrBuilder getClaimsOrBuilder() {
           com.google.protobuf.LazyStringArrayList.EMPTY;
 
       private void ensureAccessLevelsIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!((bitField0_ & 0x00000010) != 0)) {
           accessLevels_ = new com.google.protobuf.LazyStringArrayList(accessLevels_);
-          bitField0_ |= 0x00000002;
+          bitField0_ |= 0x00000010;
         }
       }
       /**
@@ -5138,7 +5216,7 @@ public Builder addAllAccessLevels(java.lang.Iterable<java.lang.String> values) {
        */
       public Builder clearAccessLevels() {
         accessLevels_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
       }
@@ -5343,7 +5421,6 @@ public interface RequestOrBuilder
      *
      * <code>map&lt;string, string&gt; headers = 3;</code>
      */
-
     /* nullable */
     java.lang.String getHeadersOrDefault(
         java.lang.String key,
@@ -5681,7 +5758,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
     }
 
     public static final int ID_FIELD_NUMBER = 1;
-    private volatile java.lang.Object id_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object id_ = "";
     /**
      *
      *
@@ -5734,7 +5813,9 @@ public com.google.protobuf.ByteString getIdBytes() {
     }
 
     public static final int METHOD_FIELD_NUMBER = 2;
-    private volatile java.lang.Object method_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object method_ = "";
     /**
      *
      *
@@ -5795,6 +5876,7 @@ private static final class HeadersDefaultEntryHolder {
               "");
     }
 
+    @SuppressWarnings("serial")
     private com.google.protobuf.MapField<java.lang.String, java.lang.String> headers_;
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String> internalGetHeaders() {
@@ -5858,8 +5940,10 @@ public java.util.Map<java.lang.String, java.lang.String> getHeadersMap() {
      * <code>map&lt;string, string&gt; headers = 3;</code>
      */
     @java.lang.Override
-    public java.lang.String getHeadersOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getHeadersOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -5890,7 +5974,9 @@ public java.lang.String getHeadersOrThrow(java.lang.String key) {
     }
 
     public static final int PATH_FIELD_NUMBER = 4;
-    private volatile java.lang.Object path_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object path_ = "";
     /**
      *
      *
@@ -5939,7 +6025,9 @@ public com.google.protobuf.ByteString getPathBytes() {
     }
 
     public static final int HOST_FIELD_NUMBER = 5;
-    private volatile java.lang.Object host_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object host_ = "";
     /**
      *
      *
@@ -5988,7 +6076,9 @@ public com.google.protobuf.ByteString getHostBytes() {
     }
 
     public static final int SCHEME_FIELD_NUMBER = 6;
-    private volatile java.lang.Object scheme_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object scheme_ = "";
     /**
      *
      *
@@ -6037,7 +6127,9 @@ public com.google.protobuf.ByteString getSchemeBytes() {
     }
 
     public static final int QUERY_FIELD_NUMBER = 7;
-    private volatile java.lang.Object query_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object query_ = "";
     /**
      *
      *
@@ -6133,11 +6225,11 @@ public com.google.protobuf.Timestamp getTime() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getTimeOrBuilder() {
-      return getTime();
+      return time_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : time_;
     }
 
     public static final int SIZE_FIELD_NUMBER = 10;
-    private long size_;
+    private long size_ = 0L;
     /**
      *
      *
@@ -6155,7 +6247,9 @@ public long getSize() {
     }
 
     public static final int PROTOCOL_FIELD_NUMBER = 11;
-    private volatile java.lang.Object protocol_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object protocol_ = "";
     /**
      *
      *
@@ -6210,7 +6304,9 @@ public com.google.protobuf.ByteString getProtocolBytes() {
     }
 
     public static final int REASON_FIELD_NUMBER = 12;
-    private volatile java.lang.Object reason_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object reason_ = "";
     /**
      *
      *
@@ -6308,7 +6404,9 @@ public com.google.rpc.context.AttributeContext.Auth getAuth() {
      */
     @java.lang.Override
     public com.google.rpc.context.AttributeContext.AuthOrBuilder getAuthOrBuilder() {
-      return getAuth();
+      return auth_ == null
+          ? com.google.rpc.context.AttributeContext.Auth.getDefaultInstance()
+          : auth_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -6649,35 +6747,25 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         id_ = "";
-
         method_ = "";
-
         internalGetMutableHeaders().clear();
         path_ = "";
-
         host_ = "";
-
         scheme_ = "";
-
         query_ = "";
-
-        if (timeBuilder_ == null) {
-          time_ = null;
-        } else {
-          time_ = null;
+        time_ = null;
+        if (timeBuilder_ != null) {
+          timeBuilder_.dispose();
           timeBuilder_ = null;
         }
         size_ = 0L;
-
         protocol_ = "";
-
         reason_ = "";
-
-        if (authBuilder_ == null) {
-          auth_ = null;
-        } else {
-          auth_ = null;
+        auth_ = null;
+        if (authBuilder_ != null) {
+          authBuilder_.dispose();
           authBuilder_ = null;
         }
         return this;
@@ -6707,32 +6795,54 @@ 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);
-        int from_bitField0_ = bitField0_;
-        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();
-        }
-        result.size_ = size_;
-        result.protocol_ = protocol_;
-        result.reason_ = reason_;
-        if (authBuilder_ == null) {
-          result.auth_ = auth_;
-        } else {
-          result.auth_ = authBuilder_.build();
+        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_;
+        }
+        if (((from_bitField0_ & 0x00000080) != 0)) {
+          result.time_ = timeBuilder_ == null ? time_ : timeBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000100) != 0)) {
+          result.size_ = size_;
+        }
+        if (((from_bitField0_ & 0x00000200) != 0)) {
+          result.protocol_ = protocol_;
+        }
+        if (((from_bitField0_ & 0x00000400) != 0)) {
+          result.reason_ = reason_;
+        }
+        if (((from_bitField0_ & 0x00000800) != 0)) {
+          result.auth_ = authBuilder_ == null ? auth_ : authBuilder_.build();
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -6783,27 +6893,34 @@ 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()) {
@@ -6814,10 +6931,12 @@ 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()) {
@@ -6852,13 +6971,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:
@@ -6870,60 +6989,61 @@ 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:
@@ -7012,8 +7132,8 @@ public Builder setId(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         id_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -7031,8 +7151,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;
       }
@@ -7055,8 +7175,8 @@ public Builder setIdBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         id_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -7122,8 +7242,8 @@ public Builder setMethod(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         method_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -7139,8 +7259,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;
       }
@@ -7161,8 +7281,8 @@ public Builder setMethodBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         method_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -7179,8 +7299,6 @@ public Builder setMethodBytes(com.google.protobuf.ByteString value) {
 
       private com.google.protobuf.MapField<java.lang.String, java.lang.String>
           internalGetMutableHeaders() {
-        onChanged();
-        ;
         if (headers_ == null) {
           headers_ =
               com.google.protobuf.MapField.newMapField(HeadersDefaultEntryHolder.defaultEntry);
@@ -7188,6 +7306,8 @@ public Builder setMethodBytes(com.google.protobuf.ByteString value) {
         if (!headers_.isMutable()) {
           headers_ = headers_.copy();
         }
+        bitField0_ |= 0x00000004;
+        onChanged();
         return headers_;
       }
 
@@ -7245,8 +7365,10 @@ public java.util.Map<java.lang.String, java.lang.String> getHeadersMap() {
        * <code>map&lt;string, string&gt; headers = 3;</code>
        */
       @java.lang.Override
-      public java.lang.String getHeadersOrDefault(
-          java.lang.String key, java.lang.String defaultValue) {
+      public /* nullable */ java.lang.String getHeadersOrDefault(
+          java.lang.String key,
+          /* nullable */
+          java.lang.String defaultValue) {
         if (key == null) {
           throw new NullPointerException("map key");
         }
@@ -7277,6 +7399,7 @@ public java.lang.String getHeadersOrThrow(java.lang.String key) {
       }
 
       public Builder clearHeaders() {
+        bitField0_ = (bitField0_ & ~0x00000004);
         internalGetMutableHeaders().getMutableMap().clear();
         return this;
       }
@@ -7301,6 +7424,7 @@ public Builder removeHeaders(java.lang.String key) {
       /** Use alternate mutation accessors instead. */
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, java.lang.String> getMutableHeaders() {
+        bitField0_ |= 0x00000004;
         return internalGetMutableHeaders().getMutableMap();
       }
       /**
@@ -7321,8 +7445,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;
       }
       /**
@@ -7338,6 +7462,7 @@ public Builder putHeaders(java.lang.String key, java.lang.String value) {
        */
       public Builder putAllHeaders(java.util.Map<java.lang.String, java.lang.String> values) {
         internalGetMutableHeaders().getMutableMap().putAll(values);
+        bitField0_ |= 0x00000004;
         return this;
       }
 
@@ -7402,8 +7527,8 @@ public Builder setPath(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         path_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -7419,8 +7544,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;
       }
@@ -7441,8 +7566,8 @@ public Builder setPathBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         path_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -7508,8 +7633,8 @@ public Builder setHost(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         host_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -7525,8 +7650,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;
       }
@@ -7547,8 +7672,8 @@ public Builder setHostBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         host_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -7614,8 +7739,8 @@ public Builder setScheme(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         scheme_ = value;
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -7631,8 +7756,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;
       }
@@ -7653,8 +7778,8 @@ public Builder setSchemeBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         scheme_ = value;
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -7723,8 +7848,8 @@ public Builder setQuery(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         query_ = value;
+        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -7741,8 +7866,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;
       }
@@ -7764,8 +7889,8 @@ public Builder setQueryBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         query_ = value;
+        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -7789,7 +7914,7 @@ public Builder setQueryBytes(com.google.protobuf.ByteString value) {
        * @return Whether the time field is set.
        */
       public boolean hasTime() {
-        return timeBuilder_ != null || time_ != null;
+        return ((bitField0_ & 0x00000080) != 0);
       }
       /**
        *
@@ -7826,11 +7951,11 @@ public Builder setTime(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           time_ = value;
-          onChanged();
         } else {
           timeBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000080;
+        onChanged();
         return this;
       }
       /**
@@ -7846,11 +7971,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;
       }
       /**
@@ -7865,16 +7990,18 @@ public Builder setTime(com.google.protobuf.Timestamp.Builder builderForValue) {
        */
       public Builder mergeTime(com.google.protobuf.Timestamp value) {
         if (timeBuilder_ == null) {
-          if (time_ != null) {
-            time_ = com.google.protobuf.Timestamp.newBuilder(time_).mergeFrom(value).buildPartial();
+          if (((bitField0_ & 0x00000080) != 0)
+              && time_ != null
+              && time_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+            getTimeBuilder().mergeFrom(value);
           } else {
             time_ = value;
           }
-          onChanged();
         } else {
           timeBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000080;
+        onChanged();
         return this;
       }
       /**
@@ -7888,14 +8015,13 @@ public Builder mergeTime(com.google.protobuf.Timestamp value) {
        * <code>.google.protobuf.Timestamp time = 9;</code>
        */
       public Builder clearTime() {
-        if (timeBuilder_ == null) {
-          time_ = null;
-          onChanged();
-        } else {
-          time_ = null;
+        bitField0_ = (bitField0_ & ~0x00000080);
+        time_ = null;
+        if (timeBuilder_ != null) {
+          timeBuilder_.dispose();
           timeBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -7909,7 +8035,7 @@ public Builder clearTime() {
        * <code>.google.protobuf.Timestamp time = 9;</code>
        */
       public com.google.protobuf.Timestamp.Builder getTimeBuilder() {
-
+        bitField0_ |= 0x00000080;
         onChanged();
         return getTimeFieldBuilder().getBuilder();
       }
@@ -7988,6 +8114,7 @@ public long getSize() {
       public Builder setSize(long value) {
 
         size_ = value;
+        bitField0_ |= 0x00000100;
         onChanged();
         return this;
       }
@@ -8003,7 +8130,7 @@ public Builder setSize(long value) {
        * @return This builder for chaining.
        */
       public Builder clearSize() {
-
+        bitField0_ = (bitField0_ & ~0x00000100);
         size_ = 0L;
         onChanged();
         return this;
@@ -8079,8 +8206,8 @@ public Builder setProtocol(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         protocol_ = value;
+        bitField0_ |= 0x00000200;
         onChanged();
         return this;
       }
@@ -8099,8 +8226,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;
       }
@@ -8124,8 +8251,8 @@ public Builder setProtocolBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         protocol_ = value;
+        bitField0_ |= 0x00000200;
         onChanged();
         return this;
       }
@@ -8194,8 +8321,8 @@ public Builder setReason(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         reason_ = value;
+        bitField0_ |= 0x00000400;
         onChanged();
         return this;
       }
@@ -8212,8 +8339,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;
       }
@@ -8235,8 +8362,8 @@ public Builder setReasonBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         reason_ = value;
+        bitField0_ |= 0x00000400;
         onChanged();
         return this;
       }
@@ -8260,7 +8387,7 @@ public Builder setReasonBytes(com.google.protobuf.ByteString value) {
        * @return Whether the auth field is set.
        */
       public boolean hasAuth() {
-        return authBuilder_ != null || auth_ != null;
+        return ((bitField0_ & 0x00000800) != 0);
       }
       /**
        *
@@ -8299,11 +8426,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;
       }
       /**
@@ -8319,11 +8446,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;
       }
       /**
@@ -8338,19 +8465,18 @@ 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 (auth_ != null) {
-            auth_ =
-                com.google.rpc.context.AttributeContext.Auth.newBuilder(auth_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000800) != 0)
+              && auth_ != null
+              && auth_ != com.google.rpc.context.AttributeContext.Auth.getDefaultInstance()) {
+            getAuthBuilder().mergeFrom(value);
           } else {
             auth_ = value;
           }
-          onChanged();
         } else {
           authBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000800;
+        onChanged();
         return this;
       }
       /**
@@ -8364,14 +8490,13 @@ public Builder mergeAuth(com.google.rpc.context.AttributeContext.Auth value) {
        * <code>.google.rpc.context.AttributeContext.Auth auth = 13;</code>
        */
       public Builder clearAuth() {
-        if (authBuilder_ == null) {
-          auth_ = null;
-          onChanged();
-        } else {
-          auth_ = null;
+        bitField0_ = (bitField0_ & ~0x00000800);
+        auth_ = null;
+        if (authBuilder_ != null) {
+          authBuilder_.dispose();
           authBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -8385,7 +8510,7 @@ public Builder clearAuth() {
        * <code>.google.rpc.context.AttributeContext.Auth auth = 13;</code>
        */
       public com.google.rpc.context.AttributeContext.Auth.Builder getAuthBuilder() {
-
+        bitField0_ |= 0x00000800;
         onChanged();
         return getAuthFieldBuilder().getBuilder();
       }
@@ -8580,7 +8705,6 @@ public interface ResponseOrBuilder
      *
      * <code>map&lt;string, string&gt; headers = 3;</code>
      */
-
     /* nullable */
     java.lang.String getHeadersOrDefault(
         java.lang.String key,
@@ -8741,7 +8865,7 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
     }
 
     public static final int CODE_FIELD_NUMBER = 1;
-    private long code_;
+    private long code_ = 0L;
     /**
      *
      *
@@ -8759,7 +8883,7 @@ public long getCode() {
     }
 
     public static final int SIZE_FIELD_NUMBER = 2;
-    private long size_;
+    private long size_ = 0L;
     /**
      *
      *
@@ -8789,6 +8913,7 @@ private static final class HeadersDefaultEntryHolder {
               "");
     }
 
+    @SuppressWarnings("serial")
     private com.google.protobuf.MapField<java.lang.String, java.lang.String> headers_;
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String> internalGetHeaders() {
@@ -8852,8 +8977,10 @@ public java.util.Map<java.lang.String, java.lang.String> getHeadersMap() {
      * <code>map&lt;string, string&gt; headers = 3;</code>
      */
     @java.lang.Override
-    public java.lang.String getHeadersOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getHeadersOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -8929,7 +9056,7 @@ public com.google.protobuf.Timestamp getTime() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getTimeOrBuilder() {
-      return getTime();
+      return time_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : time_;
     }
 
     public static final int BACKEND_LATENCY_FIELD_NUMBER = 5;
@@ -8986,7 +9113,9 @@ public com.google.protobuf.Duration getBackendLatency() {
      */
     @java.lang.Override
     public com.google.protobuf.DurationOrBuilder getBackendLatencyOrBuilder() {
-      return getBackendLatency();
+      return backendLatency_ == null
+          ? com.google.protobuf.Duration.getDefaultInstance()
+          : backendLatency_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -9263,21 +9392,18 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         code_ = 0L;
-
         size_ = 0L;
-
         internalGetMutableHeaders().clear();
-        if (timeBuilder_ == null) {
-          time_ = null;
-        } else {
-          time_ = null;
+        time_ = null;
+        if (timeBuilder_ != null) {
+          timeBuilder_.dispose();
           timeBuilder_ = null;
         }
-        if (backendLatencyBuilder_ == null) {
-          backendLatency_ = null;
-        } else {
-          backendLatency_ = null;
+        backendLatency_ = null;
+        if (backendLatencyBuilder_ != null) {
+          backendLatencyBuilder_.dispose();
           backendLatencyBuilder_ = null;
         }
         return this;
@@ -9307,25 +9433,34 @@ 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);
-        int from_bitField0_ = bitField0_;
-        result.code_ = code_;
-        result.size_ = size_;
-        result.headers_ = internalGetHeaders();
-        result.headers_.makeImmutable();
-        if (timeBuilder_ == null) {
-          result.time_ = time_;
-        } else {
-          result.time_ = timeBuilder_.build();
-        }
-        if (backendLatencyBuilder_ == null) {
-          result.backendLatency_ = backendLatency_;
-        } else {
-          result.backendLatency_ = backendLatencyBuilder_.build();
+        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();
+        }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.time_ = timeBuilder_ == null ? time_ : timeBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.backendLatency_ =
+              backendLatencyBuilder_ == null ? backendLatency_ : backendLatencyBuilder_.build();
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -9381,6 +9516,7 @@ 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());
         }
@@ -9416,13 +9552,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:
@@ -9434,19 +9570,20 @@ 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:
@@ -9499,6 +9636,7 @@ public long getCode() {
       public Builder setCode(long value) {
 
         code_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -9514,7 +9652,7 @@ public Builder setCode(long value) {
        * @return This builder for chaining.
        */
       public Builder clearCode() {
-
+        bitField0_ = (bitField0_ & ~0x00000001);
         code_ = 0L;
         onChanged();
         return this;
@@ -9551,6 +9689,7 @@ public long getSize() {
       public Builder setSize(long value) {
 
         size_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -9566,7 +9705,7 @@ public Builder setSize(long value) {
        * @return This builder for chaining.
        */
       public Builder clearSize() {
-
+        bitField0_ = (bitField0_ & ~0x00000002);
         size_ = 0L;
         onChanged();
         return this;
@@ -9584,8 +9723,6 @@ public Builder clearSize() {
 
       private com.google.protobuf.MapField<java.lang.String, java.lang.String>
           internalGetMutableHeaders() {
-        onChanged();
-        ;
         if (headers_ == null) {
           headers_ =
               com.google.protobuf.MapField.newMapField(HeadersDefaultEntryHolder.defaultEntry);
@@ -9593,6 +9730,8 @@ public Builder clearSize() {
         if (!headers_.isMutable()) {
           headers_ = headers_.copy();
         }
+        bitField0_ |= 0x00000004;
+        onChanged();
         return headers_;
       }
 
@@ -9650,8 +9789,10 @@ public java.util.Map<java.lang.String, java.lang.String> getHeadersMap() {
        * <code>map&lt;string, string&gt; headers = 3;</code>
        */
       @java.lang.Override
-      public java.lang.String getHeadersOrDefault(
-          java.lang.String key, java.lang.String defaultValue) {
+      public /* nullable */ java.lang.String getHeadersOrDefault(
+          java.lang.String key,
+          /* nullable */
+          java.lang.String defaultValue) {
         if (key == null) {
           throw new NullPointerException("map key");
         }
@@ -9682,6 +9823,7 @@ public java.lang.String getHeadersOrThrow(java.lang.String key) {
       }
 
       public Builder clearHeaders() {
+        bitField0_ = (bitField0_ & ~0x00000004);
         internalGetMutableHeaders().getMutableMap().clear();
         return this;
       }
@@ -9706,6 +9848,7 @@ public Builder removeHeaders(java.lang.String key) {
       /** Use alternate mutation accessors instead. */
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, java.lang.String> getMutableHeaders() {
+        bitField0_ |= 0x00000004;
         return internalGetMutableHeaders().getMutableMap();
       }
       /**
@@ -9726,8 +9869,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;
       }
       /**
@@ -9743,6 +9886,7 @@ public Builder putHeaders(java.lang.String key, java.lang.String value) {
        */
       public Builder putAllHeaders(java.util.Map<java.lang.String, java.lang.String> values) {
         internalGetMutableHeaders().getMutableMap().putAll(values);
+        bitField0_ |= 0x00000004;
         return this;
       }
 
@@ -9765,7 +9909,7 @@ public Builder putAllHeaders(java.util.Map<java.lang.String, java.lang.String> v
        * @return Whether the time field is set.
        */
       public boolean hasTime() {
-        return timeBuilder_ != null || time_ != null;
+        return ((bitField0_ & 0x00000008) != 0);
       }
       /**
        *
@@ -9802,11 +9946,11 @@ public Builder setTime(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           time_ = value;
-          onChanged();
         } else {
           timeBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000008;
+        onChanged();
         return this;
       }
       /**
@@ -9822,11 +9966,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;
       }
       /**
@@ -9841,16 +9985,18 @@ public Builder setTime(com.google.protobuf.Timestamp.Builder builderForValue) {
        */
       public Builder mergeTime(com.google.protobuf.Timestamp value) {
         if (timeBuilder_ == null) {
-          if (time_ != null) {
-            time_ = com.google.protobuf.Timestamp.newBuilder(time_).mergeFrom(value).buildPartial();
+          if (((bitField0_ & 0x00000008) != 0)
+              && time_ != null
+              && time_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+            getTimeBuilder().mergeFrom(value);
           } else {
             time_ = value;
           }
-          onChanged();
         } else {
           timeBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000008;
+        onChanged();
         return this;
       }
       /**
@@ -9864,14 +10010,13 @@ public Builder mergeTime(com.google.protobuf.Timestamp value) {
        * <code>.google.protobuf.Timestamp time = 4;</code>
        */
       public Builder clearTime() {
-        if (timeBuilder_ == null) {
-          time_ = null;
-          onChanged();
-        } else {
-          time_ = null;
+        bitField0_ = (bitField0_ & ~0x00000008);
+        time_ = null;
+        if (timeBuilder_ != null) {
+          timeBuilder_.dispose();
           timeBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -9885,7 +10030,7 @@ public Builder clearTime() {
        * <code>.google.protobuf.Timestamp time = 4;</code>
        */
       public com.google.protobuf.Timestamp.Builder getTimeBuilder() {
-
+        bitField0_ |= 0x00000008;
         onChanged();
         return getTimeFieldBuilder().getBuilder();
       }
@@ -9954,7 +10099,7 @@ public com.google.protobuf.TimestampOrBuilder getTimeOrBuilder() {
        * @return Whether the backendLatency field is set.
        */
       public boolean hasBackendLatency() {
-        return backendLatencyBuilder_ != null || backendLatency_ != null;
+        return ((bitField0_ & 0x00000010) != 0);
       }
       /**
        *
@@ -9997,11 +10142,11 @@ public Builder setBackendLatency(com.google.protobuf.Duration value) {
             throw new NullPointerException();
           }
           backendLatency_ = value;
-          onChanged();
         } else {
           backendLatencyBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /**
@@ -10019,11 +10164,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;
       }
       /**
@@ -10040,19 +10185,18 @@ public Builder setBackendLatency(com.google.protobuf.Duration.Builder builderFor
        */
       public Builder mergeBackendLatency(com.google.protobuf.Duration value) {
         if (backendLatencyBuilder_ == null) {
-          if (backendLatency_ != null) {
-            backendLatency_ =
-                com.google.protobuf.Duration.newBuilder(backendLatency_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000010) != 0)
+              && backendLatency_ != null
+              && backendLatency_ != com.google.protobuf.Duration.getDefaultInstance()) {
+            getBackendLatencyBuilder().mergeFrom(value);
           } else {
             backendLatency_ = value;
           }
-          onChanged();
         } else {
           backendLatencyBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /**
@@ -10068,14 +10212,13 @@ public Builder mergeBackendLatency(com.google.protobuf.Duration value) {
        * <code>.google.protobuf.Duration backend_latency = 5;</code>
        */
       public Builder clearBackendLatency() {
-        if (backendLatencyBuilder_ == null) {
-          backendLatency_ = null;
-          onChanged();
-        } else {
-          backendLatency_ = null;
+        bitField0_ = (bitField0_ & ~0x00000010);
+        backendLatency_ = null;
+        if (backendLatencyBuilder_ != null) {
+          backendLatencyBuilder_.dispose();
           backendLatencyBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -10091,7 +10234,7 @@ public Builder clearBackendLatency() {
        * <code>.google.protobuf.Duration backend_latency = 5;</code>
        */
       public com.google.protobuf.Duration.Builder getBackendLatencyBuilder() {
-
+        bitField0_ |= 0x00000010;
         onChanged();
         return getBackendLatencyFieldBuilder().getBuilder();
       }
@@ -10363,7 +10506,6 @@ public interface ResourceOrBuilder
      *
      * <code>map&lt;string, string&gt; labels = 4;</code>
      */
-
     /* nullable */
     java.lang.String getLabelsOrDefault(
         java.lang.String key,
@@ -10468,7 +10610,6 @@ java.lang.String getLabelsOrDefault(
      *
      * <code>map&lt;string, string&gt; annotations = 6;</code>
      */
-
     /* nullable */
     java.lang.String getAnnotationsOrDefault(
         java.lang.String key,
@@ -10767,7 +10908,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
     }
 
     public static final int SERVICE_FIELD_NUMBER = 1;
-    private volatile java.lang.Object service_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object service_ = "";
     /**
      *
      *
@@ -10820,7 +10963,9 @@ public com.google.protobuf.ByteString getServiceBytes() {
     }
 
     public static final int NAME_FIELD_NUMBER = 2;
-    private volatile java.lang.Object name_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object name_ = "";
     /**
      *
      *
@@ -10887,7 +11032,9 @@ public com.google.protobuf.ByteString getNameBytes() {
     }
 
     public static final int TYPE_FIELD_NUMBER = 3;
-    private volatile java.lang.Object type_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object type_ = "";
     /**
      *
      *
@@ -10954,6 +11101,7 @@ private static final class LabelsDefaultEntryHolder {
               "");
     }
 
+    @SuppressWarnings("serial")
     private com.google.protobuf.MapField<java.lang.String, java.lang.String> labels_;
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String> internalGetLabels() {
@@ -11014,8 +11162,10 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
      * <code>map&lt;string, string&gt; labels = 4;</code>
      */
     @java.lang.Override
-    public java.lang.String getLabelsOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getLabelsOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -11045,7 +11195,9 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
     }
 
     public static final int UID_FIELD_NUMBER = 5;
-    private volatile java.lang.Object uid_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object uid_ = "";
     /**
      *
      *
@@ -11114,6 +11266,7 @@ private static final class AnnotationsDefaultEntryHolder {
               "");
     }
 
+    @SuppressWarnings("serial")
     private com.google.protobuf.MapField<java.lang.String, java.lang.String> annotations_;
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
@@ -11182,8 +11335,10 @@ public java.util.Map<java.lang.String, java.lang.String> getAnnotationsMap() {
      * <code>map&lt;string, string&gt; annotations = 6;</code>
      */
     @java.lang.Override
-    public java.lang.String getAnnotationsOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getAnnotationsOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -11215,7 +11370,9 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) {
     }
 
     public static final int DISPLAY_NAME_FIELD_NUMBER = 7;
-    private volatile java.lang.Object displayName_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object displayName_ = "";
     /**
      *
      *
@@ -11309,7 +11466,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-      return getCreateTime();
+      return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
     }
 
     public static final int UPDATE_TIME_FIELD_NUMBER = 9;
@@ -11361,7 +11518,7 @@ public com.google.protobuf.Timestamp getUpdateTime() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
-      return getUpdateTime();
+      return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
     }
 
     public static final int DELETE_TIME_FIELD_NUMBER = 10;
@@ -11410,11 +11567,13 @@ public com.google.protobuf.Timestamp getDeleteTime() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getDeleteTimeOrBuilder() {
-      return getDeleteTime();
+      return deleteTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : deleteTime_;
     }
 
     public static final int ETAG_FIELD_NUMBER = 11;
-    private volatile java.lang.Object etag_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object etag_ = "";
     /**
      *
      *
@@ -11467,7 +11626,9 @@ public com.google.protobuf.ByteString getEtagBytes() {
     }
 
     public static final int LOCATION_FIELD_NUMBER = 12;
-    private volatile java.lang.Object location_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object location_ = "";
     /**
      *
      *
@@ -11882,40 +12043,31 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         service_ = "";
-
         name_ = "";
-
         type_ = "";
-
         internalGetMutableLabels().clear();
         uid_ = "";
-
         internalGetMutableAnnotations().clear();
         displayName_ = "";
-
-        if (createTimeBuilder_ == null) {
-          createTime_ = null;
-        } else {
-          createTime_ = null;
+        createTime_ = null;
+        if (createTimeBuilder_ != null) {
+          createTimeBuilder_.dispose();
           createTimeBuilder_ = null;
         }
-        if (updateTimeBuilder_ == null) {
-          updateTime_ = null;
-        } else {
-          updateTime_ = null;
+        updateTime_ = null;
+        if (updateTimeBuilder_ != null) {
+          updateTimeBuilder_.dispose();
           updateTimeBuilder_ = null;
         }
-        if (deleteTimeBuilder_ == null) {
-          deleteTime_ = null;
-        } else {
-          deleteTime_ = null;
+        deleteTime_ = null;
+        if (deleteTimeBuilder_ != null) {
+          deleteTimeBuilder_.dispose();
           deleteTimeBuilder_ = null;
         }
         etag_ = "";
-
         location_ = "";
-
         return this;
       }
 
@@ -11943,35 +12095,56 @@ 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_;
-        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_ & 0x00000001) != 0)) {
+          result.service_ = service_;
         }
-        if (updateTimeBuilder_ == null) {
-          result.updateTime_ = updateTime_;
-        } else {
-          result.updateTime_ = updateTimeBuilder_.build();
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.name_ = name_;
         }
-        if (deleteTimeBuilder_ == null) {
-          result.deleteTime_ = deleteTime_;
-        } else {
-          result.deleteTime_ = deleteTimeBuilder_.build();
+        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_;
+        }
+        if (((from_bitField0_ & 0x00000080) != 0)) {
+          result.createTime_ =
+              createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000100) != 0)) {
+          result.updateTime_ =
+              updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000200) != 0)) {
+          result.deleteTime_ =
+              deleteTimeBuilder_ == null ? deleteTime_ : deleteTimeBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000400) != 0)) {
+          result.etag_ = etag_;
+        }
+        if (((from_bitField0_ & 0x00000800) != 0)) {
+          result.location_ = location_;
         }
-        result.etag_ = etag_;
-        result.location_ = location_;
-        onBuilt();
-        return result;
       }
 
       @java.lang.Override
@@ -12024,24 +12197,31 @@ 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()) {
@@ -12055,10 +12235,12 @@ 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());
@@ -12090,19 +12272,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:
@@ -12114,12 +12296,13 @@ 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:
@@ -12131,42 +12314,43 @@ 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:
@@ -12255,8 +12439,8 @@ public Builder setService(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         service_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -12274,8 +12458,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;
       }
@@ -12298,8 +12482,8 @@ public Builder setServiceBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         service_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -12392,8 +12576,8 @@ public Builder setName(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         name_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -12418,8 +12602,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;
       }
@@ -12449,8 +12633,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         name_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -12525,8 +12709,8 @@ public Builder setType(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         type_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -12545,8 +12729,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;
       }
@@ -12570,8 +12754,8 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         type_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -12587,14 +12771,14 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
 
       private com.google.protobuf.MapField<java.lang.String, java.lang.String>
           internalGetMutableLabels() {
-        onChanged();
-        ;
         if (labels_ == null) {
           labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
         }
         if (!labels_.isMutable()) {
           labels_ = labels_.copy();
         }
+        bitField0_ |= 0x00000008;
+        onChanged();
         return labels_;
       }
 
@@ -12649,8 +12833,10 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
        * <code>map&lt;string, string&gt; labels = 4;</code>
        */
       @java.lang.Override
-      public java.lang.String getLabelsOrDefault(
-          java.lang.String key, java.lang.String defaultValue) {
+      public /* nullable */ java.lang.String getLabelsOrDefault(
+          java.lang.String key,
+          /* nullable */
+          java.lang.String defaultValue) {
         if (key == null) {
           throw new NullPointerException("map key");
         }
@@ -12680,6 +12866,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
       }
 
       public Builder clearLabels() {
+        bitField0_ = (bitField0_ & ~0x00000008);
         internalGetMutableLabels().getMutableMap().clear();
         return this;
       }
@@ -12703,6 +12890,7 @@ public Builder removeLabels(java.lang.String key) {
       /** Use alternate mutation accessors instead. */
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, java.lang.String> getMutableLabels() {
+        bitField0_ |= 0x00000008;
         return internalGetMutableLabels().getMutableMap();
       }
       /**
@@ -12722,8 +12910,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;
       }
       /**
@@ -12738,6 +12926,7 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
        */
       public Builder putAllLabels(java.util.Map<java.lang.String, java.lang.String> values) {
         internalGetMutableLabels().getMutableMap().putAll(values);
+        bitField0_ |= 0x00000008;
         return this;
       }
 
@@ -12814,8 +13003,8 @@ public Builder setUid(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         uid_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -12835,8 +13024,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;
       }
@@ -12861,8 +13050,8 @@ public Builder setUidBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         uid_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -12880,8 +13069,6 @@ public Builder setUidBytes(com.google.protobuf.ByteString value) {
 
       private com.google.protobuf.MapField<java.lang.String, java.lang.String>
           internalGetMutableAnnotations() {
-        onChanged();
-        ;
         if (annotations_ == null) {
           annotations_ =
               com.google.protobuf.MapField.newMapField(AnnotationsDefaultEntryHolder.defaultEntry);
@@ -12889,6 +13076,8 @@ public Builder setUidBytes(com.google.protobuf.ByteString value) {
         if (!annotations_.isMutable()) {
           annotations_ = annotations_.copy();
         }
+        bitField0_ |= 0x00000020;
+        onChanged();
         return annotations_;
       }
 
@@ -12949,8 +13138,10 @@ public java.util.Map<java.lang.String, java.lang.String> getAnnotationsMap() {
        * <code>map&lt;string, string&gt; annotations = 6;</code>
        */
       @java.lang.Override
-      public java.lang.String getAnnotationsOrDefault(
-          java.lang.String key, java.lang.String defaultValue) {
+      public /* nullable */ java.lang.String getAnnotationsOrDefault(
+          java.lang.String key,
+          /* nullable */
+          java.lang.String defaultValue) {
         if (key == null) {
           throw new NullPointerException("map key");
         }
@@ -12982,6 +13173,7 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) {
       }
 
       public Builder clearAnnotations() {
+        bitField0_ = (bitField0_ & ~0x00000020);
         internalGetMutableAnnotations().getMutableMap().clear();
         return this;
       }
@@ -13007,6 +13199,7 @@ public Builder removeAnnotations(java.lang.String key) {
       /** Use alternate mutation accessors instead. */
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, java.lang.String> getMutableAnnotations() {
+        bitField0_ |= 0x00000020;
         return internalGetMutableAnnotations().getMutableMap();
       }
       /**
@@ -13028,8 +13221,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;
       }
       /**
@@ -13046,6 +13239,7 @@ public Builder putAnnotations(java.lang.String key, java.lang.String value) {
        */
       public Builder putAllAnnotations(java.util.Map<java.lang.String, java.lang.String> values) {
         internalGetMutableAnnotations().getMutableMap().putAll(values);
+        bitField0_ |= 0x00000020;
         return this;
       }
 
@@ -13110,8 +13304,8 @@ public Builder setDisplayName(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         displayName_ = value;
+        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -13127,8 +13321,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;
       }
@@ -13149,8 +13343,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         displayName_ = value;
+        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -13174,7 +13368,7 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
        * @return Whether the createTime field is set.
        */
       public boolean hasCreateTime() {
-        return createTimeBuilder_ != null || createTime_ != null;
+        return ((bitField0_ & 0x00000080) != 0);
       }
       /**
        *
@@ -13213,11 +13407,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           createTime_ = value;
-          onChanged();
         } else {
           createTimeBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000080;
+        onChanged();
         return this;
       }
       /**
@@ -13233,11 +13427,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;
       }
       /**
@@ -13252,19 +13446,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
        */
       public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
         if (createTimeBuilder_ == null) {
-          if (createTime_ != null) {
-            createTime_ =
-                com.google.protobuf.Timestamp.newBuilder(createTime_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000080) != 0)
+              && createTime_ != null
+              && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+            getCreateTimeBuilder().mergeFrom(value);
           } else {
             createTime_ = value;
           }
-          onChanged();
         } else {
           createTimeBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000080;
+        onChanged();
         return this;
       }
       /**
@@ -13278,14 +13471,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
        * <code>.google.protobuf.Timestamp create_time = 8;</code>
        */
       public Builder clearCreateTime() {
-        if (createTimeBuilder_ == null) {
-          createTime_ = null;
-          onChanged();
-        } else {
-          createTime_ = null;
+        bitField0_ = (bitField0_ & ~0x00000080);
+        createTime_ = null;
+        if (createTimeBuilder_ != null) {
+          createTimeBuilder_.dispose();
           createTimeBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -13299,7 +13491,7 @@ public Builder clearCreateTime() {
        * <code>.google.protobuf.Timestamp create_time = 8;</code>
        */
       public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+        bitField0_ |= 0x00000080;
         onChanged();
         return getCreateTimeFieldBuilder().getBuilder();
       }
@@ -13369,7 +13561,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
        * @return Whether the updateTime field is set.
        */
       public boolean hasUpdateTime() {
-        return updateTimeBuilder_ != null || updateTime_ != null;
+        return ((bitField0_ & 0x00000100) != 0);
       }
       /**
        *
@@ -13410,11 +13602,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           updateTime_ = value;
-          onChanged();
         } else {
           updateTimeBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000100;
+        onChanged();
         return this;
       }
       /**
@@ -13431,11 +13623,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;
       }
       /**
@@ -13451,19 +13643,18 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
        */
       public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
         if (updateTimeBuilder_ == null) {
-          if (updateTime_ != null) {
-            updateTime_ =
-                com.google.protobuf.Timestamp.newBuilder(updateTime_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000100) != 0)
+              && updateTime_ != null
+              && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+            getUpdateTimeBuilder().mergeFrom(value);
           } else {
             updateTime_ = value;
           }
-          onChanged();
         } else {
           updateTimeBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000100;
+        onChanged();
         return this;
       }
       /**
@@ -13478,14 +13669,13 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
        * <code>.google.protobuf.Timestamp update_time = 9;</code>
        */
       public Builder clearUpdateTime() {
-        if (updateTimeBuilder_ == null) {
-          updateTime_ = null;
-          onChanged();
-        } else {
-          updateTime_ = null;
+        bitField0_ = (bitField0_ & ~0x00000100);
+        updateTime_ = null;
+        if (updateTimeBuilder_ != null) {
+          updateTimeBuilder_.dispose();
           updateTimeBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -13500,7 +13690,7 @@ public Builder clearUpdateTime() {
        * <code>.google.protobuf.Timestamp update_time = 9;</code>
        */
       public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
-
+        bitField0_ |= 0x00000100;
         onChanged();
         return getUpdateTimeFieldBuilder().getBuilder();
       }
@@ -13571,7 +13761,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
        * @return Whether the deleteTime field is set.
        */
       public boolean hasDeleteTime() {
-        return deleteTimeBuilder_ != null || deleteTime_ != null;
+        return ((bitField0_ & 0x00000200) != 0);
       }
       /**
        *
@@ -13610,11 +13800,11 @@ public Builder setDeleteTime(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           deleteTime_ = value;
-          onChanged();
         } else {
           deleteTimeBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000200;
+        onChanged();
         return this;
       }
       /**
@@ -13630,11 +13820,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;
       }
       /**
@@ -13649,19 +13839,18 @@ public Builder setDeleteTime(com.google.protobuf.Timestamp.Builder builderForVal
        */
       public Builder mergeDeleteTime(com.google.protobuf.Timestamp value) {
         if (deleteTimeBuilder_ == null) {
-          if (deleteTime_ != null) {
-            deleteTime_ =
-                com.google.protobuf.Timestamp.newBuilder(deleteTime_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000200) != 0)
+              && deleteTime_ != null
+              && deleteTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+            getDeleteTimeBuilder().mergeFrom(value);
           } else {
             deleteTime_ = value;
           }
-          onChanged();
         } else {
           deleteTimeBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000200;
+        onChanged();
         return this;
       }
       /**
@@ -13675,14 +13864,13 @@ public Builder mergeDeleteTime(com.google.protobuf.Timestamp value) {
        * <code>.google.protobuf.Timestamp delete_time = 10;</code>
        */
       public Builder clearDeleteTime() {
-        if (deleteTimeBuilder_ == null) {
-          deleteTime_ = null;
-          onChanged();
-        } else {
-          deleteTime_ = null;
+        bitField0_ = (bitField0_ & ~0x00000200);
+        deleteTime_ = null;
+        if (deleteTimeBuilder_ != null) {
+          deleteTimeBuilder_.dispose();
           deleteTimeBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -13696,7 +13884,7 @@ public Builder clearDeleteTime() {
        * <code>.google.protobuf.Timestamp delete_time = 10;</code>
        */
       public com.google.protobuf.Timestamp.Builder getDeleteTimeBuilder() {
-
+        bitField0_ |= 0x00000200;
         onChanged();
         return getDeleteTimeFieldBuilder().getBuilder();
       }
@@ -13813,8 +14001,8 @@ public Builder setEtag(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         etag_ = value;
+        bitField0_ |= 0x00000400;
         onChanged();
         return this;
       }
@@ -13832,8 +14020,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;
       }
@@ -13856,8 +14044,8 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         etag_ = value;
+        bitField0_ |= 0x00000400;
         onChanged();
         return this;
       }
@@ -13941,8 +14129,8 @@ public Builder setLocation(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         location_ = value;
+        bitField0_ |= 0x00000800;
         onChanged();
         return this;
       }
@@ -13964,8 +14152,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;
       }
@@ -13992,8 +14180,8 @@ public Builder setLocationBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         location_ = value;
+        bitField0_ |= 0x00000800;
         onChanged();
         return this;
       }
@@ -14113,7 +14301,9 @@ public com.google.rpc.context.AttributeContext.Peer getOrigin() {
    */
   @java.lang.Override
   public com.google.rpc.context.AttributeContext.PeerOrBuilder getOriginOrBuilder() {
-    return getOrigin();
+    return origin_ == null
+        ? com.google.rpc.context.AttributeContext.Peer.getDefaultInstance()
+        : origin_;
   }
 
   public static final int SOURCE_FIELD_NUMBER = 1;
@@ -14167,7 +14357,9 @@ public com.google.rpc.context.AttributeContext.Peer getSource() {
    */
   @java.lang.Override
   public com.google.rpc.context.AttributeContext.PeerOrBuilder getSourceOrBuilder() {
-    return getSource();
+    return source_ == null
+        ? com.google.rpc.context.AttributeContext.Peer.getDefaultInstance()
+        : source_;
   }
 
   public static final int DESTINATION_FIELD_NUMBER = 2;
@@ -14221,7 +14413,9 @@ public com.google.rpc.context.AttributeContext.Peer getDestination() {
    */
   @java.lang.Override
   public com.google.rpc.context.AttributeContext.PeerOrBuilder getDestinationOrBuilder() {
-    return getDestination();
+    return destination_ == null
+        ? com.google.rpc.context.AttributeContext.Peer.getDefaultInstance()
+        : destination_;
   }
 
   public static final int REQUEST_FIELD_NUMBER = 3;
@@ -14269,7 +14463,9 @@ public com.google.rpc.context.AttributeContext.Request getRequest() {
    */
   @java.lang.Override
   public com.google.rpc.context.AttributeContext.RequestOrBuilder getRequestOrBuilder() {
-    return getRequest();
+    return request_ == null
+        ? com.google.rpc.context.AttributeContext.Request.getDefaultInstance()
+        : request_;
   }
 
   public static final int RESPONSE_FIELD_NUMBER = 4;
@@ -14317,7 +14513,9 @@ public com.google.rpc.context.AttributeContext.Response getResponse() {
    */
   @java.lang.Override
   public com.google.rpc.context.AttributeContext.ResponseOrBuilder getResponseOrBuilder() {
-    return getResponse();
+    return response_ == null
+        ? com.google.rpc.context.AttributeContext.Response.getDefaultInstance()
+        : response_;
   }
 
   public static final int RESOURCE_FIELD_NUMBER = 5;
@@ -14371,7 +14569,9 @@ public com.google.rpc.context.AttributeContext.Resource getResource() {
    */
   @java.lang.Override
   public com.google.rpc.context.AttributeContext.ResourceOrBuilder getResourceOrBuilder() {
-    return getResource();
+    return resource_ == null
+        ? com.google.rpc.context.AttributeContext.Resource.getDefaultInstance()
+        : resource_;
   }
 
   public static final int API_FIELD_NUMBER = 6;
@@ -14417,10 +14617,12 @@ public com.google.rpc.context.AttributeContext.Api getApi() {
    */
   @java.lang.Override
   public com.google.rpc.context.AttributeContext.ApiOrBuilder getApiOrBuilder() {
-    return getApi();
+    return api_ == null ? com.google.rpc.context.AttributeContext.Api.getDefaultInstance() : api_;
   }
 
   public static final int EXTENSIONS_FIELD_NUMBER = 8;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.protobuf.Any> extensions_;
   /**
    *
@@ -14796,46 +14998,40 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (originBuilder_ == null) {
-        origin_ = null;
-      } else {
-        origin_ = null;
+      bitField0_ = 0;
+      origin_ = null;
+      if (originBuilder_ != null) {
+        originBuilder_.dispose();
         originBuilder_ = null;
       }
-      if (sourceBuilder_ == null) {
-        source_ = null;
-      } else {
-        source_ = null;
+      source_ = null;
+      if (sourceBuilder_ != null) {
+        sourceBuilder_.dispose();
         sourceBuilder_ = null;
       }
-      if (destinationBuilder_ == null) {
-        destination_ = null;
-      } else {
-        destination_ = null;
+      destination_ = null;
+      if (destinationBuilder_ != null) {
+        destinationBuilder_.dispose();
         destinationBuilder_ = null;
       }
-      if (requestBuilder_ == null) {
-        request_ = null;
-      } else {
-        request_ = null;
+      request_ = null;
+      if (requestBuilder_ != null) {
+        requestBuilder_.dispose();
         requestBuilder_ = null;
       }
-      if (responseBuilder_ == null) {
-        response_ = null;
-      } else {
-        response_ = null;
+      response_ = null;
+      if (responseBuilder_ != null) {
+        responseBuilder_.dispose();
         responseBuilder_ = null;
       }
-      if (resourceBuilder_ == null) {
-        resource_ = null;
-      } else {
-        resource_ = null;
+      resource_ = null;
+      if (resourceBuilder_ != null) {
+        resourceBuilder_.dispose();
         resourceBuilder_ = null;
       }
-      if (apiBuilder_ == null) {
-        api_ = null;
-      } else {
-        api_ = null;
+      api_ = null;
+      if (apiBuilder_ != null) {
+        apiBuilder_.dispose();
         apiBuilder_ = null;
       }
       if (extensionsBuilder_ == null) {
@@ -14844,7 +15040,7 @@ public Builder clear() {
         extensions_ = null;
         extensionsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000080);
       return this;
     }
 
@@ -14872,53 +15068,50 @@ 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);
-      int from_bitField0_ = bitField0_;
-      if (originBuilder_ == null) {
-        result.origin_ = origin_;
-      } else {
-        result.origin_ = originBuilder_.build();
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (sourceBuilder_ == null) {
-        result.source_ = source_;
+      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_;
       } else {
-        result.source_ = sourceBuilder_.build();
+        result.extensions_ = extensionsBuilder_.build();
       }
-      if (destinationBuilder_ == null) {
-        result.destination_ = destination_;
-      } else {
-        result.destination_ = destinationBuilder_.build();
+    }
+
+    private void buildPartial0(com.google.rpc.context.AttributeContext result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.origin_ = originBuilder_ == null ? origin_ : originBuilder_.build();
       }
-      if (requestBuilder_ == null) {
-        result.request_ = request_;
-      } else {
-        result.request_ = requestBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.source_ = sourceBuilder_ == null ? source_ : sourceBuilder_.build();
       }
-      if (responseBuilder_ == null) {
-        result.response_ = response_;
-      } else {
-        result.response_ = responseBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.destination_ =
+            destinationBuilder_ == null ? destination_ : destinationBuilder_.build();
       }
-      if (resourceBuilder_ == null) {
-        result.resource_ = resource_;
-      } else {
-        result.resource_ = resourceBuilder_.build();
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.request_ = requestBuilder_ == null ? request_ : requestBuilder_.build();
       }
-      if (apiBuilder_ == null) {
-        result.api_ = api_;
-      } else {
-        result.api_ = apiBuilder_.build();
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.response_ = responseBuilder_ == null ? response_ : responseBuilder_.build();
       }
-      if (extensionsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
-          extensions_ = java.util.Collections.unmodifiableList(extensions_);
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.extensions_ = extensions_;
-      } else {
-        result.extensions_ = extensionsBuilder_.build();
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.resource_ = resourceBuilder_ == null ? resource_ : resourceBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.api_ = apiBuilder_ == null ? api_ : apiBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -14991,7 +15184,7 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext other) {
         if (!other.extensions_.isEmpty()) {
           if (extensions_.isEmpty()) {
             extensions_ = other.extensions_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000080);
           } else {
             ensureExtensionsIsMutable();
             extensions_.addAll(other.extensions_);
@@ -15004,7 +15197,7 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext other) {
             extensionsBuilder_.dispose();
             extensionsBuilder_ = null;
             extensions_ = other.extensions_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000080);
             extensionsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getExtensionsFieldBuilder()
@@ -15043,43 +15236,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:
@@ -15133,7 +15326,7 @@ public Builder mergeFrom(
      * @return Whether the origin field is set.
      */
     public boolean hasOrigin() {
-      return originBuilder_ != null || origin_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -15174,11 +15367,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;
     }
     /**
@@ -15195,11 +15388,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;
     }
     /**
@@ -15215,19 +15408,18 @@ 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 (origin_ != null) {
-          origin_ =
-              com.google.rpc.context.AttributeContext.Peer.newBuilder(origin_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && origin_ != null
+            && origin_ != com.google.rpc.context.AttributeContext.Peer.getDefaultInstance()) {
+          getOriginBuilder().mergeFrom(value);
         } else {
           origin_ = value;
         }
-        onChanged();
       } else {
         originBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -15242,14 +15434,13 @@ public Builder mergeOrigin(com.google.rpc.context.AttributeContext.Peer value) {
      * <code>.google.rpc.context.AttributeContext.Peer origin = 7;</code>
      */
     public Builder clearOrigin() {
-      if (originBuilder_ == null) {
-        origin_ = null;
-        onChanged();
-      } else {
-        origin_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      origin_ = null;
+      if (originBuilder_ != null) {
+        originBuilder_.dispose();
         originBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -15264,7 +15455,7 @@ public Builder clearOrigin() {
      * <code>.google.rpc.context.AttributeContext.Peer origin = 7;</code>
      */
     public com.google.rpc.context.AttributeContext.Peer.Builder getOriginBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getOriginFieldBuilder().getBuilder();
     }
@@ -15336,7 +15527,7 @@ public com.google.rpc.context.AttributeContext.PeerOrBuilder getOriginOrBuilder(
      * @return Whether the source field is set.
      */
     public boolean hasSource() {
-      return sourceBuilder_ != null || source_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -15377,11 +15568,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;
     }
     /**
@@ -15398,11 +15589,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;
     }
     /**
@@ -15418,19 +15609,18 @@ 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 (source_ != null) {
-          source_ =
-              com.google.rpc.context.AttributeContext.Peer.newBuilder(source_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && source_ != null
+            && source_ != com.google.rpc.context.AttributeContext.Peer.getDefaultInstance()) {
+          getSourceBuilder().mergeFrom(value);
         } else {
           source_ = value;
         }
-        onChanged();
       } else {
         sourceBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -15445,14 +15635,13 @@ public Builder mergeSource(com.google.rpc.context.AttributeContext.Peer value) {
      * <code>.google.rpc.context.AttributeContext.Peer source = 1;</code>
      */
     public Builder clearSource() {
-      if (sourceBuilder_ == null) {
-        source_ = null;
-        onChanged();
-      } else {
-        source_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      source_ = null;
+      if (sourceBuilder_ != null) {
+        sourceBuilder_.dispose();
         sourceBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -15467,7 +15656,7 @@ public Builder clearSource() {
      * <code>.google.rpc.context.AttributeContext.Peer source = 1;</code>
      */
     public com.google.rpc.context.AttributeContext.Peer.Builder getSourceBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getSourceFieldBuilder().getBuilder();
     }
@@ -15539,7 +15728,7 @@ public com.google.rpc.context.AttributeContext.PeerOrBuilder getSourceOrBuilder(
      * @return Whether the destination field is set.
      */
     public boolean hasDestination() {
-      return destinationBuilder_ != null || destination_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -15580,11 +15769,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;
     }
     /**
@@ -15602,11 +15791,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;
     }
     /**
@@ -15622,19 +15811,18 @@ public Builder setDestination(
      */
     public Builder mergeDestination(com.google.rpc.context.AttributeContext.Peer value) {
       if (destinationBuilder_ == null) {
-        if (destination_ != null) {
-          destination_ =
-              com.google.rpc.context.AttributeContext.Peer.newBuilder(destination_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && destination_ != null
+            && destination_ != com.google.rpc.context.AttributeContext.Peer.getDefaultInstance()) {
+          getDestinationBuilder().mergeFrom(value);
         } else {
           destination_ = value;
         }
-        onChanged();
       } else {
         destinationBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -15649,14 +15837,13 @@ public Builder mergeDestination(com.google.rpc.context.AttributeContext.Peer val
      * <code>.google.rpc.context.AttributeContext.Peer destination = 2;</code>
      */
     public Builder clearDestination() {
-      if (destinationBuilder_ == null) {
-        destination_ = null;
-        onChanged();
-      } else {
-        destination_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      destination_ = null;
+      if (destinationBuilder_ != null) {
+        destinationBuilder_.dispose();
         destinationBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -15671,7 +15858,7 @@ public Builder clearDestination() {
      * <code>.google.rpc.context.AttributeContext.Peer destination = 2;</code>
      */
     public com.google.rpc.context.AttributeContext.Peer.Builder getDestinationBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getDestinationFieldBuilder().getBuilder();
     }
@@ -15741,7 +15928,7 @@ public com.google.rpc.context.AttributeContext.PeerOrBuilder getDestinationOrBui
      * @return Whether the request field is set.
      */
     public boolean hasRequest() {
-      return requestBuilder_ != null || request_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -15778,11 +15965,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;
     }
     /**
@@ -15798,11 +15985,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;
     }
     /**
@@ -15816,19 +16003,18 @@ public Builder setRequest(
      */
     public Builder mergeRequest(com.google.rpc.context.AttributeContext.Request value) {
       if (requestBuilder_ == null) {
-        if (request_ != null) {
-          request_ =
-              com.google.rpc.context.AttributeContext.Request.newBuilder(request_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && request_ != null
+            && request_ != com.google.rpc.context.AttributeContext.Request.getDefaultInstance()) {
+          getRequestBuilder().mergeFrom(value);
         } else {
           request_ = value;
         }
-        onChanged();
       } else {
         requestBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -15841,14 +16027,13 @@ public Builder mergeRequest(com.google.rpc.context.AttributeContext.Request valu
      * <code>.google.rpc.context.AttributeContext.Request request = 3;</code>
      */
     public Builder clearRequest() {
-      if (requestBuilder_ == null) {
-        request_ = null;
-        onChanged();
-      } else {
-        request_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      request_ = null;
+      if (requestBuilder_ != null) {
+        requestBuilder_.dispose();
         requestBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -15861,7 +16046,7 @@ public Builder clearRequest() {
      * <code>.google.rpc.context.AttributeContext.Request request = 3;</code>
      */
     public com.google.rpc.context.AttributeContext.Request.Builder getRequestBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getRequestFieldBuilder().getBuilder();
     }
@@ -15927,7 +16112,7 @@ public com.google.rpc.context.AttributeContext.RequestOrBuilder getRequestOrBuil
      * @return Whether the response field is set.
      */
     public boolean hasResponse() {
-      return responseBuilder_ != null || response_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -15964,11 +16149,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;
     }
     /**
@@ -15984,11 +16169,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;
     }
     /**
@@ -16002,19 +16187,18 @@ public Builder setResponse(
      */
     public Builder mergeResponse(com.google.rpc.context.AttributeContext.Response value) {
       if (responseBuilder_ == null) {
-        if (response_ != null) {
-          response_ =
-              com.google.rpc.context.AttributeContext.Response.newBuilder(response_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && response_ != null
+            && response_ != com.google.rpc.context.AttributeContext.Response.getDefaultInstance()) {
+          getResponseBuilder().mergeFrom(value);
         } else {
           response_ = value;
         }
-        onChanged();
       } else {
         responseBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -16027,14 +16211,13 @@ public Builder mergeResponse(com.google.rpc.context.AttributeContext.Response va
      * <code>.google.rpc.context.AttributeContext.Response response = 4;</code>
      */
     public Builder clearResponse() {
-      if (responseBuilder_ == null) {
-        response_ = null;
-        onChanged();
-      } else {
-        response_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      response_ = null;
+      if (responseBuilder_ != null) {
+        responseBuilder_.dispose();
         responseBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -16047,7 +16230,7 @@ public Builder clearResponse() {
      * <code>.google.rpc.context.AttributeContext.Response response = 4;</code>
      */
     public com.google.rpc.context.AttributeContext.Response.Builder getResponseBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getResponseFieldBuilder().getBuilder();
     }
@@ -16115,7 +16298,7 @@ public com.google.rpc.context.AttributeContext.ResponseOrBuilder getResponseOrBu
      * @return Whether the resource field is set.
      */
     public boolean hasResource() {
-      return resourceBuilder_ != null || resource_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -16156,11 +16339,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;
     }
     /**
@@ -16178,11 +16361,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;
     }
     /**
@@ -16198,19 +16381,18 @@ public Builder setResource(
      */
     public Builder mergeResource(com.google.rpc.context.AttributeContext.Resource value) {
       if (resourceBuilder_ == null) {
-        if (resource_ != null) {
-          resource_ =
-              com.google.rpc.context.AttributeContext.Resource.newBuilder(resource_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && resource_ != null
+            && resource_ != com.google.rpc.context.AttributeContext.Resource.getDefaultInstance()) {
+          getResourceBuilder().mergeFrom(value);
         } else {
           resource_ = value;
         }
-        onChanged();
       } else {
         resourceBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -16225,14 +16407,13 @@ public Builder mergeResource(com.google.rpc.context.AttributeContext.Resource va
      * <code>.google.rpc.context.AttributeContext.Resource resource = 5;</code>
      */
     public Builder clearResource() {
-      if (resourceBuilder_ == null) {
-        resource_ = null;
-        onChanged();
-      } else {
-        resource_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      resource_ = null;
+      if (resourceBuilder_ != null) {
+        resourceBuilder_.dispose();
         resourceBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -16247,7 +16428,7 @@ public Builder clearResource() {
      * <code>.google.rpc.context.AttributeContext.Resource resource = 5;</code>
      */
     public com.google.rpc.context.AttributeContext.Resource.Builder getResourceBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getResourceFieldBuilder().getBuilder();
     }
@@ -16317,7 +16498,7 @@ public com.google.rpc.context.AttributeContext.ResourceOrBuilder getResourceOrBu
      * @return Whether the api field is set.
      */
     public boolean hasApi() {
-      return apiBuilder_ != null || api_ != null;
+      return ((bitField0_ & 0x00000040) != 0);
     }
     /**
      *
@@ -16354,11 +16535,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;
     }
     /**
@@ -16373,11 +16554,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;
     }
     /**
@@ -16391,19 +16572,18 @@ 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 (api_ != null) {
-          api_ =
-              com.google.rpc.context.AttributeContext.Api.newBuilder(api_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000040) != 0)
+            && api_ != null
+            && api_ != com.google.rpc.context.AttributeContext.Api.getDefaultInstance()) {
+          getApiBuilder().mergeFrom(value);
         } else {
           api_ = value;
         }
-        onChanged();
       } else {
         apiBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -16416,14 +16596,13 @@ public Builder mergeApi(com.google.rpc.context.AttributeContext.Api value) {
      * <code>.google.rpc.context.AttributeContext.Api api = 6;</code>
      */
     public Builder clearApi() {
-      if (apiBuilder_ == null) {
-        api_ = null;
-        onChanged();
-      } else {
-        api_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      api_ = null;
+      if (apiBuilder_ != null) {
+        apiBuilder_.dispose();
         apiBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -16436,7 +16615,7 @@ public Builder clearApi() {
      * <code>.google.rpc.context.AttributeContext.Api api = 6;</code>
      */
     public com.google.rpc.context.AttributeContext.Api.Builder getApiBuilder() {
-
+      bitField0_ |= 0x00000040;
       onChanged();
       return getApiFieldBuilder().getBuilder();
     }
@@ -16487,9 +16666,9 @@ public com.google.rpc.context.AttributeContext.ApiOrBuilder getApiOrBuilder() {
     private java.util.List<com.google.protobuf.Any> extensions_ = java.util.Collections.emptyList();
 
     private void ensureExtensionsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000080) != 0)) {
         extensions_ = new java.util.ArrayList<com.google.protobuf.Any>(extensions_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000080;
       }
     }
 
@@ -16701,7 +16880,7 @@ public Builder addAllExtensions(java.lang.Iterable<? extends com.google.protobuf
     public Builder clearExtensions() {
       if (extensionsBuilder_ == null) {
         extensions_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000080);
         onChanged();
       } else {
         extensionsBuilder_.clear();
@@ -16820,7 +16999,7 @@ public java.util.List<com.google.protobuf.Any.Builder> getExtensionsBuilderList(
                 com.google.protobuf.Any,
                 com.google.protobuf.Any.Builder,
                 com.google.protobuf.AnyOrBuilder>(
-                extensions_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                extensions_, ((bitField0_ & 0x00000080) != 0), getParentForChildren(), isClean());
         extensions_ = null;
       }
       return extensionsBuilder_;
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 d2ff65edbd..291b0ec150 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Color.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Color.java
@@ -169,7 +169,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RED_FIELD_NUMBER = 1;
-  private float red_;
+  private float red_ = 0F;
   /**
    *
    *
@@ -187,7 +187,7 @@ public float getRed() {
   }
 
   public static final int GREEN_FIELD_NUMBER = 2;
-  private float green_;
+  private float green_ = 0F;
   /**
    *
    *
@@ -205,7 +205,7 @@ public float getGreen() {
   }
 
   public static final int BLUE_FIELD_NUMBER = 3;
-  private float blue_;
+  private float blue_ = 0F;
   /**
    *
    *
@@ -289,7 +289,7 @@ public com.google.protobuf.FloatValue getAlpha() {
    */
   @java.lang.Override
   public com.google.protobuf.FloatValueOrBuilder getAlphaOrBuilder() {
-    return getAlpha();
+    return alpha_ == null ? com.google.protobuf.FloatValue.getDefaultInstance() : alpha_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -625,16 +625,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       red_ = 0F;
-
       green_ = 0F;
-
       blue_ = 0F;
-
-      if (alphaBuilder_ == null) {
-        alpha_ = null;
-      } else {
-        alpha_ = null;
+      alpha_ = null;
+      if (alphaBuilder_ != null) {
+        alphaBuilder_.dispose();
         alphaBuilder_ = null;
       }
       return this;
@@ -662,18 +659,29 @@ 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);
-      result.red_ = red_;
-      result.green_ = green_;
-      result.blue_ = blue_;
-      if (alphaBuilder_ == null) {
-        result.alpha_ = alpha_;
-      } else {
-        result.alpha_ = alphaBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       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_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.alpha_ = alphaBuilder_ == null ? alpha_ : alphaBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -760,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:
@@ -798,6 +806,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private float red_;
     /**
      *
@@ -829,6 +839,7 @@ public float getRed() {
     public Builder setRed(float value) {
 
       red_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -844,7 +855,7 @@ public Builder setRed(float value) {
      * @return This builder for chaining.
      */
     public Builder clearRed() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       red_ = 0F;
       onChanged();
       return this;
@@ -881,6 +892,7 @@ public float getGreen() {
     public Builder setGreen(float value) {
 
       green_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -896,7 +908,7 @@ public Builder setGreen(float value) {
      * @return This builder for chaining.
      */
     public Builder clearGreen() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       green_ = 0F;
       onChanged();
       return this;
@@ -933,6 +945,7 @@ public float getBlue() {
     public Builder setBlue(float value) {
 
       blue_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -948,7 +961,7 @@ public Builder setBlue(float value) {
      * @return This builder for chaining.
      */
     public Builder clearBlue() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       blue_ = 0F;
       onChanged();
       return this;
@@ -980,7 +993,7 @@ public Builder clearBlue() {
      * @return Whether the alpha field is set.
      */
     public boolean hasAlpha() {
-      return alphaBuilder_ != null || alpha_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1031,11 +1044,11 @@ public Builder setAlpha(com.google.protobuf.FloatValue value) {
           throw new NullPointerException();
         }
         alpha_ = value;
-        onChanged();
       } else {
         alphaBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1058,11 +1071,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;
     }
     /**
@@ -1084,17 +1097,18 @@ public Builder setAlpha(com.google.protobuf.FloatValue.Builder builderForValue)
      */
     public Builder mergeAlpha(com.google.protobuf.FloatValue value) {
       if (alphaBuilder_ == null) {
-        if (alpha_ != null) {
-          alpha_ =
-              com.google.protobuf.FloatValue.newBuilder(alpha_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && alpha_ != null
+            && alpha_ != com.google.protobuf.FloatValue.getDefaultInstance()) {
+          getAlphaBuilder().mergeFrom(value);
         } else {
           alpha_ = value;
         }
-        onChanged();
       } else {
         alphaBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1115,14 +1129,13 @@ public Builder mergeAlpha(com.google.protobuf.FloatValue value) {
      * <code>.google.protobuf.FloatValue alpha = 4;</code>
      */
     public Builder clearAlpha() {
-      if (alphaBuilder_ == null) {
-        alpha_ = null;
-        onChanged();
-      } else {
-        alpha_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      alpha_ = null;
+      if (alphaBuilder_ != null) {
+        alphaBuilder_.dispose();
         alphaBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1143,7 +1156,7 @@ public Builder clearAlpha() {
      * <code>.google.protobuf.FloatValue alpha = 4;</code>
      */
     public com.google.protobuf.FloatValue.Builder getAlphaBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getAlphaFieldBuilder().getBuilder();
     }
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 a951785a3d..bf46c6f021 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Date.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Date.java
@@ -73,7 +73,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int YEAR_FIELD_NUMBER = 1;
-  private int year_;
+  private int year_ = 0;
   /**
    *
    *
@@ -92,7 +92,7 @@ public int getYear() {
   }
 
   public static final int MONTH_FIELD_NUMBER = 2;
-  private int month_;
+  private int month_ = 0;
   /**
    *
    *
@@ -111,7 +111,7 @@ public int getMonth() {
   }
 
   public static final int DAY_FIELD_NUMBER = 3;
-  private int day_;
+  private int day_ = 0;
   /**
    *
    *
@@ -350,12 +350,10 @@ 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;
     }
 
@@ -381,13 +379,26 @@ 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);
-      result.year_ = year_;
-      result.month_ = month_;
-      result.day_ = day_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -471,19 +482,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:
@@ -503,6 +514,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private int year_;
     /**
      *
@@ -536,6 +549,7 @@ public int getYear() {
     public Builder setYear(int value) {
 
       year_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -552,7 +566,7 @@ public Builder setYear(int value) {
      * @return This builder for chaining.
      */
     public Builder clearYear() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       year_ = 0;
       onChanged();
       return this;
@@ -591,6 +605,7 @@ public int getMonth() {
     public Builder setMonth(int value) {
 
       month_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -607,7 +622,7 @@ public Builder setMonth(int value) {
      * @return This builder for chaining.
      */
     public Builder clearMonth() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       month_ = 0;
       onChanged();
       return this;
@@ -648,6 +663,7 @@ public int getDay() {
     public Builder setDay(int value) {
 
       day_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -665,7 +681,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/DateTime.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateTime.java
index af4b978fc2..295d91ad96 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateTime.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateTime.java
@@ -127,7 +127,7 @@ public TimeOffsetCase getTimeOffsetCase() {
   }
 
   public static final int YEAR_FIELD_NUMBER = 1;
-  private int year_;
+  private int year_ = 0;
   /**
    *
    *
@@ -146,7 +146,7 @@ public int getYear() {
   }
 
   public static final int MONTH_FIELD_NUMBER = 2;
-  private int month_;
+  private int month_ = 0;
   /**
    *
    *
@@ -164,7 +164,7 @@ public int getMonth() {
   }
 
   public static final int DAY_FIELD_NUMBER = 3;
-  private int day_;
+  private int day_ = 0;
   /**
    *
    *
@@ -183,7 +183,7 @@ public int getDay() {
   }
 
   public static final int HOURS_FIELD_NUMBER = 4;
-  private int hours_;
+  private int hours_ = 0;
   /**
    *
    *
@@ -203,7 +203,7 @@ public int getHours() {
   }
 
   public static final int MINUTES_FIELD_NUMBER = 5;
-  private int minutes_;
+  private int minutes_ = 0;
   /**
    *
    *
@@ -221,7 +221,7 @@ public int getMinutes() {
   }
 
   public static final int SECONDS_FIELD_NUMBER = 6;
-  private int seconds_;
+  private int seconds_ = 0;
   /**
    *
    *
@@ -240,7 +240,7 @@ public int getSeconds() {
   }
 
   public static final int NANOS_FIELD_NUMBER = 7;
-  private int nanos_;
+  private int nanos_ = 0;
   /**
    *
    *
@@ -668,20 +668,14 @@ 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();
       }
@@ -715,32 +709,50 @@ 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);
-      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 (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (timeOffsetCase_ == 9) {
-        if (timeZoneBuilder_ == null) {
-          result.timeOffset_ = timeOffset_;
-        } else {
-          result.timeOffset_ = timeZoneBuilder_.build();
-        }
-      }
-      result.timeOffsetCase_ = timeOffsetCase_;
+      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_;
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.nanos_ = nanos_;
+      }
+    }
+
+    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();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -852,43 +864,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:
@@ -934,6 +946,8 @@ public Builder clearTimeOffset() {
       return this;
     }
 
+    private int bitField0_;
+
     private int year_;
     /**
      *
@@ -967,6 +981,7 @@ public int getYear() {
     public Builder setYear(int value) {
 
       year_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -983,7 +998,7 @@ public Builder setYear(int value) {
      * @return This builder for chaining.
      */
     public Builder clearYear() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       year_ = 0;
       onChanged();
       return this;
@@ -1020,6 +1035,7 @@ public int getMonth() {
     public Builder setMonth(int value) {
 
       month_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1035,7 +1051,7 @@ public Builder setMonth(int value) {
      * @return This builder for chaining.
      */
     public Builder clearMonth() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       month_ = 0;
       onChanged();
       return this;
@@ -1074,6 +1090,7 @@ public int getDay() {
     public Builder setDay(int value) {
 
       day_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1090,7 +1107,7 @@ public Builder setDay(int value) {
      * @return This builder for chaining.
      */
     public Builder clearDay() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       day_ = 0;
       onChanged();
       return this;
@@ -1131,6 +1148,7 @@ public int getHours() {
     public Builder setHours(int value) {
 
       hours_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1148,7 +1166,7 @@ public Builder setHours(int value) {
      * @return This builder for chaining.
      */
     public Builder clearHours() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       hours_ = 0;
       onChanged();
       return this;
@@ -1185,6 +1203,7 @@ public int getMinutes() {
     public Builder setMinutes(int value) {
 
       minutes_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1200,7 +1219,7 @@ public Builder setMinutes(int value) {
      * @return This builder for chaining.
      */
     public Builder clearMinutes() {
-
+      bitField0_ = (bitField0_ & ~0x00000010);
       minutes_ = 0;
       onChanged();
       return this;
@@ -1239,6 +1258,7 @@ public int getSeconds() {
     public Builder setSeconds(int value) {
 
       seconds_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1255,7 +1275,7 @@ public Builder setSeconds(int value) {
      * @return This builder for chaining.
      */
     public Builder clearSeconds() {
-
+      bitField0_ = (bitField0_ & ~0x00000020);
       seconds_ = 0;
       onChanged();
       return this;
@@ -1294,6 +1314,7 @@ public int getNanos() {
     public Builder setNanos(int value) {
 
       nanos_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -1310,7 +1331,7 @@ public Builder setNanos(int value) {
      * @return This builder for chaining.
      */
     public Builder clearNanos() {
-
+      bitField0_ = (bitField0_ & ~0x00000040);
       nanos_ = 0;
       onChanged();
       return this;
@@ -1536,7 +1557,6 @@ public com.google.protobuf.DurationOrBuilder getUtcOffsetOrBuilder() {
       }
       timeOffsetCase_ = 8;
       onChanged();
-      ;
       return utcOffsetBuilder_;
     }
 
@@ -1741,7 +1761,6 @@ 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/Decimal.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Decimal.java
index ecbc56d259..7cd61f76c7 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Decimal.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Decimal.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int VALUE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object value_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object value_ = "";
   /**
    *
    *
@@ -401,8 +403,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       value_ = "";
-
       return this;
     }
 
@@ -428,11 +430,20 @@ 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);
-      result.value_ = value_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -480,6 +491,7 @@ 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());
@@ -511,7 +523,7 @@ public Builder mergeFrom(
             case 10:
               {
                 value_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -531,6 +543,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object value_ = "";
     /**
      *
@@ -721,8 +735,8 @@ public Builder setValue(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       value_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -781,8 +795,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;
     }
@@ -846,8 +860,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/Expr.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Expr.java
index e238c36c2a..24b8e6d689 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Expr.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Expr.java
@@ -89,7 +89,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int EXPRESSION_FIELD_NUMBER = 1;
-  private volatile java.lang.Object expression_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object expression_ = "";
   /**
    *
    *
@@ -140,7 +142,9 @@ public com.google.protobuf.ByteString getExpressionBytes() {
   }
 
   public static final int TITLE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object title_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object title_ = "";
   /**
    *
    *
@@ -193,7 +197,9 @@ public com.google.protobuf.ByteString getTitleBytes() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 3;
-  private volatile java.lang.Object description_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object description_ = "";
   /**
    *
    *
@@ -244,7 +250,9 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
   }
 
   public static final int LOCATION_FIELD_NUMBER = 4;
-  private volatile java.lang.Object location_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object location_ = "";
   /**
    *
    *
@@ -534,14 +542,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       expression_ = "";
-
       title_ = "";
-
       description_ = "";
-
       location_ = "";
-
       return this;
     }
 
@@ -567,14 +572,29 @@ 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);
-      result.expression_ = expression_;
-      result.title_ = title_;
-      result.description_ = description_;
-      result.location_ = location_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -622,18 +642,22 @@ 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());
@@ -665,25 +689,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:
@@ -703,6 +727,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object expression_ = "";
     /**
      *
@@ -767,8 +793,8 @@ public Builder setExpression(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       expression_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -785,8 +811,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;
     }
@@ -808,8 +834,8 @@ public Builder setExpressionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       expression_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -881,8 +907,8 @@ public Builder setTitle(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       title_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -900,8 +926,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;
     }
@@ -924,8 +950,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       title_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -994,8 +1020,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       description_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1012,8 +1038,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;
     }
@@ -1035,8 +1061,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       description_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1105,8 +1131,8 @@ public Builder setLocation(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       location_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1123,8 +1149,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;
     }
@@ -1146,8 +1172,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/Fraction.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Fraction.java
index f3a3a54890..b2cfd71e8d 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Fraction.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Fraction.java
@@ -63,7 +63,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NUMERATOR_FIELD_NUMBER = 1;
-  private long numerator_;
+  private long numerator_ = 0L;
   /**
    *
    *
@@ -81,7 +81,7 @@ public long getNumerator() {
   }
 
   public static final int DENOMINATOR_FIELD_NUMBER = 2;
-  private long denominator_;
+  private long denominator_ = 0L;
   /**
    *
    *
@@ -300,10 +300,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       numerator_ = 0L;
-
       denominator_ = 0L;
-
       return this;
     }
 
@@ -329,12 +328,23 @@ 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);
-      result.numerator_ = numerator_;
-      result.denominator_ = denominator_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -415,13 +425,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:
@@ -441,6 +451,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private long numerator_;
     /**
      *
@@ -472,6 +484,7 @@ public long getNumerator() {
     public Builder setNumerator(long value) {
 
       numerator_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -487,7 +500,7 @@ public Builder setNumerator(long value) {
      * @return This builder for chaining.
      */
     public Builder clearNumerator() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       numerator_ = 0L;
       onChanged();
       return this;
@@ -526,6 +539,7 @@ public long getDenominator() {
     public Builder setDenominator(long value) {
 
       denominator_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -542,7 +556,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/Interval.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Interval.java
index 6759226178..3424d0d429 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Interval.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Interval.java
@@ -115,7 +115,7 @@ public com.google.protobuf.Timestamp getStartTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
-    return getStartTime();
+    return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_;
   }
 
   public static final int END_TIME_FIELD_NUMBER = 2;
@@ -167,7 +167,7 @@ public com.google.protobuf.Timestamp getEndTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
-    return getEndTime();
+    return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -385,16 +385,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (startTimeBuilder_ == null) {
-        startTime_ = null;
-      } else {
-        startTime_ = null;
+      bitField0_ = 0;
+      startTime_ = null;
+      if (startTimeBuilder_ != null) {
+        startTimeBuilder_.dispose();
         startTimeBuilder_ = null;
       }
-      if (endTimeBuilder_ == null) {
-        endTime_ = null;
-      } else {
-        endTime_ = null;
+      endTime_ = null;
+      if (endTimeBuilder_ != null) {
+        endTimeBuilder_.dispose();
         endTimeBuilder_ = null;
       }
       return this;
@@ -422,20 +421,23 @@ 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 (startTimeBuilder_ == null) {
-        result.startTime_ = startTime_;
-      } else {
-        result.startTime_ = startTimeBuilder_.build();
-      }
-      if (endTimeBuilder_ == null) {
-        result.endTime_ = endTime_;
-      } else {
-        result.endTime_ = endTimeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.type.Interval result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.startTime_ = startTimeBuilder_ == null ? startTime_ : startTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.endTime_ = endTimeBuilder_ == null ? endTime_ : endTimeBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -516,13 +518,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:
@@ -542,6 +544,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.protobuf.Timestamp startTime_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.protobuf.Timestamp,
@@ -562,7 +566,7 @@ public Builder mergeFrom(
      * @return Whether the startTime field is set.
      */
     public boolean hasStartTime() {
-      return startTimeBuilder_ != null || startTime_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -601,11 +605,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         startTime_ = value;
-        onChanged();
       } else {
         startTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -622,11 +626,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;
     }
     /**
@@ -642,17 +646,18 @@ public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValu
      */
     public Builder mergeStartTime(com.google.protobuf.Timestamp value) {
       if (startTimeBuilder_ == null) {
-        if (startTime_ != null) {
-          startTime_ =
-              com.google.protobuf.Timestamp.newBuilder(startTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && startTime_ != null
+            && startTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getStartTimeBuilder().mergeFrom(value);
         } else {
           startTime_ = value;
         }
-        onChanged();
       } else {
         startTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -667,14 +672,13 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) {
      * <code>.google.protobuf.Timestamp start_time = 1;</code>
      */
     public Builder clearStartTime() {
-      if (startTimeBuilder_ == null) {
-        startTime_ = null;
-        onChanged();
-      } else {
-        startTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      startTime_ = null;
+      if (startTimeBuilder_ != null) {
+        startTimeBuilder_.dispose();
         startTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -689,7 +693,7 @@ public Builder clearStartTime() {
      * <code>.google.protobuf.Timestamp start_time = 1;</code>
      */
     public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getStartTimeFieldBuilder().getBuilder();
     }
@@ -759,7 +763,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
      * @return Whether the endTime field is set.
      */
     public boolean hasEndTime() {
-      return endTimeBuilder_ != null || endTime_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -798,11 +802,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         endTime_ = value;
-        onChanged();
       } else {
         endTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -819,11 +823,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;
     }
     /**
@@ -839,17 +843,18 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue)
      */
     public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
       if (endTimeBuilder_ == null) {
-        if (endTime_ != null) {
-          endTime_ =
-              com.google.protobuf.Timestamp.newBuilder(endTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && endTime_ != null
+            && endTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getEndTimeBuilder().mergeFrom(value);
         } else {
           endTime_ = value;
         }
-        onChanged();
       } else {
         endTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -864,14 +869,13 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
      * <code>.google.protobuf.Timestamp end_time = 2;</code>
      */
     public Builder clearEndTime() {
-      if (endTimeBuilder_ == null) {
-        endTime_ = null;
-        onChanged();
-      } else {
-        endTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      endTime_ = null;
+      if (endTimeBuilder_ != null) {
+        endTimeBuilder_.dispose();
         endTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -886,7 +890,7 @@ public Builder clearEndTime() {
      * <code>.google.protobuf.Timestamp end_time = 2;</code>
      */
     public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getEndTimeFieldBuilder().getBuilder();
     }
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 d26cf25c67..2af3af9f69 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LatLng.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LatLng.java
@@ -67,7 +67,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int LATITUDE_FIELD_NUMBER = 1;
-  private double latitude_;
+  private double latitude_ = 0D;
   /**
    *
    *
@@ -85,7 +85,7 @@ public double getLatitude() {
   }
 
   public static final int LONGITUDE_FIELD_NUMBER = 2;
-  private double longitude_;
+  private double longitude_ = 0D;
   /**
    *
    *
@@ -315,10 +315,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       latitude_ = 0D;
-
       longitude_ = 0D;
-
       return this;
     }
 
@@ -344,12 +343,23 @@ 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);
-      result.latitude_ = latitude_;
-      result.longitude_ = longitude_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -430,13 +440,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:
@@ -456,6 +466,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private double latitude_;
     /**
      *
@@ -487,6 +499,7 @@ public double getLatitude() {
     public Builder setLatitude(double value) {
 
       latitude_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -502,7 +515,7 @@ public Builder setLatitude(double value) {
      * @return This builder for chaining.
      */
     public Builder clearLatitude() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       latitude_ = 0D;
       onChanged();
       return this;
@@ -539,6 +552,7 @@ public double getLongitude() {
     public Builder setLongitude(double value) {
 
       longitude_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -554,7 +568,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/LocalizedText.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LocalizedText.java
index 9cc41509dc..d9175895a3 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LocalizedText.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LocalizedText.java
@@ -67,7 +67,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int TEXT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object text_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object text_ = "";
   /**
    *
    *
@@ -116,7 +118,9 @@ public com.google.protobuf.ByteString getTextBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -371,10 +375,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       text_ = "";
-
       languageCode_ = "";
-
       return this;
     }
 
@@ -401,12 +404,23 @@ 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);
-      result.text_ = text_;
-      result.languageCode_ = languageCode_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -454,10 +468,12 @@ 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());
@@ -489,13 +505,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:
@@ -515,6 +531,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object text_ = "";
     /**
      *
@@ -576,8 +594,8 @@ public Builder setText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       text_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -593,8 +611,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;
     }
@@ -615,8 +633,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       text_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -688,8 +706,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -707,8 +725,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;
     }
@@ -731,8 +749,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/Money.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Money.java
index b8d63fdab2..bf2afe6d29 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Money.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Money.java
@@ -65,7 +65,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CURRENCY_CODE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object currencyCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object currencyCode_ = "";
   /**
    *
    *
@@ -114,7 +116,7 @@ public com.google.protobuf.ByteString getCurrencyCodeBytes() {
   }
 
   public static final int UNITS_FIELD_NUMBER = 2;
-  private long units_;
+  private long units_ = 0L;
   /**
    *
    *
@@ -133,7 +135,7 @@ public long getUnits() {
   }
 
   public static final int NANOS_FIELD_NUMBER = 3;
-  private int nanos_;
+  private int nanos_ = 0;
   /**
    *
    *
@@ -365,12 +367,10 @@ 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;
     }
 
@@ -396,13 +396,26 @@ 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);
-      result.currencyCode_ = currencyCode_;
-      result.units_ = units_;
-      result.nanos_ = nanos_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -450,6 +463,7 @@ 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) {
@@ -487,19 +501,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:
@@ -519,6 +533,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object currencyCode_ = "";
     /**
      *
@@ -580,8 +596,8 @@ public Builder setCurrencyCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       currencyCode_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -597,8 +613,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;
     }
@@ -619,8 +635,8 @@ public Builder setCurrencyCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       currencyCode_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -658,6 +674,7 @@ public long getUnits() {
     public Builder setUnits(long value) {
 
       units_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -674,7 +691,7 @@ public Builder setUnits(long value) {
      * @return This builder for chaining.
      */
     public Builder clearUnits() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       units_ = 0L;
       onChanged();
       return this;
@@ -721,6 +738,7 @@ public int getNanos() {
     public Builder setNanos(int value) {
 
       nanos_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -741,7 +759,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/PhoneNumber.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PhoneNumber.java
index 0c98c60dba..b4d9d9b595 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PhoneNumber.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PhoneNumber.java
@@ -204,7 +204,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int REGION_CODE_FIELD_NUMBER = 1;
-    private volatile java.lang.Object regionCode_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object regionCode_ = "";
     /**
      *
      *
@@ -259,7 +261,9 @@ public com.google.protobuf.ByteString getRegionCodeBytes() {
     }
 
     public static final int NUMBER_FIELD_NUMBER = 2;
-    private volatile java.lang.Object number_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object number_ = "";
     /**
      *
      *
@@ -523,10 +527,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         regionCode_ = "";
-
         number_ = "";
-
         return this;
       }
 
@@ -554,12 +557,23 @@ 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);
-        result.regionCode_ = regionCode_;
-        result.number_ = number_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         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();
@@ -609,10 +623,12 @@ 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());
@@ -644,13 +660,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:
@@ -670,6 +686,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object regionCode_ = "";
       /**
        *
@@ -740,8 +758,8 @@ public Builder setRegionCode(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         regionCode_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -760,8 +778,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;
       }
@@ -785,8 +803,8 @@ public Builder setRegionCodeBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         regionCode_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -855,8 +873,8 @@ public Builder setNumber(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         number_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -873,8 +891,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;
       }
@@ -896,8 +914,8 @@ public Builder setNumberBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         number_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1177,7 +1195,9 @@ public com.google.type.PhoneNumber.ShortCodeOrBuilder getShortCodeOrBuilder() {
   }
 
   public static final int EXTENSION_FIELD_NUMBER = 3;
-  private volatile java.lang.Object extension_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object extension_ = "";
   /**
    *
    *
@@ -1487,11 +1507,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;
@@ -1519,22 +1539,29 @@ 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 (kindCase_ == 1) {
-        result.kind_ = kind_;
-      }
-      if (kindCase_ == 2) {
-        if (shortCodeBuilder_ == null) {
-          result.kind_ = kind_;
-        } else {
-          result.kind_ = shortCodeBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.extension_ = extension_;
-      result.kindCase_ = kindCase_;
+      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_;
+      }
+    }
+
+    private void buildPartialOneofs(com.google.type.PhoneNumber result) {
+      result.kindCase_ = kindCase_;
+      result.kind_ = this.kind_;
+      if (kindCase_ == 2 && shortCodeBuilder_ != null) {
+        result.kind_ = shortCodeBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -1582,6 +1609,7 @@ 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()) {
@@ -1644,7 +1672,7 @@ public Builder mergeFrom(
             case 26:
               {
                 extension_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -1678,6 +1706,8 @@ public Builder clearKind() {
       return this;
     }
 
+    private int bitField0_;
+
     /**
      *
      *
@@ -2104,7 +2134,6 @@ public com.google.type.PhoneNumber.ShortCodeOrBuilder getShortCodeOrBuilder() {
       }
       kindCase_ = 2;
       onChanged();
-      ;
       return shortCodeBuilder_;
     }
 
@@ -2190,8 +2219,8 @@ public Builder setExtension(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       extension_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2214,8 +2243,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;
     }
@@ -2243,8 +2272,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/PostalAddress.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PostalAddress.java
index 2741f8d5c8..bd83a5b3ba 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PostalAddress.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PostalAddress.java
@@ -88,7 +88,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int REVISION_FIELD_NUMBER = 1;
-  private int revision_;
+  private int revision_ = 0;
   /**
    *
    *
@@ -108,7 +108,9 @@ public int getRevision() {
   }
 
   public static final int REGION_CODE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object regionCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object regionCode_ = "";
   /**
    *
    *
@@ -165,7 +167,9 @@ public com.google.protobuf.ByteString getRegionCodeBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -232,7 +236,9 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
   }
 
   public static final int POSTAL_CODE_FIELD_NUMBER = 4;
-  private volatile java.lang.Object postalCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object postalCode_ = "";
   /**
    *
    *
@@ -287,7 +293,9 @@ public com.google.protobuf.ByteString getPostalCodeBytes() {
   }
 
   public static final int SORTING_CODE_FIELD_NUMBER = 5;
-  private volatile java.lang.Object sortingCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object sortingCode_ = "";
   /**
    *
    *
@@ -344,7 +352,9 @@ public com.google.protobuf.ByteString getSortingCodeBytes() {
   }
 
   public static final int ADMINISTRATIVE_AREA_FIELD_NUMBER = 6;
-  private volatile java.lang.Object administrativeArea_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object administrativeArea_ = "";
   /**
    *
    *
@@ -405,7 +415,9 @@ public com.google.protobuf.ByteString getAdministrativeAreaBytes() {
   }
 
   public static final int LOCALITY_FIELD_NUMBER = 7;
-  private volatile java.lang.Object locality_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object locality_ = "";
   /**
    *
    *
@@ -460,7 +472,9 @@ public com.google.protobuf.ByteString getLocalityBytes() {
   }
 
   public static final int SUBLOCALITY_FIELD_NUMBER = 8;
-  private volatile java.lang.Object sublocality_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object sublocality_ = "";
   /**
    *
    *
@@ -511,6 +525,8 @@ public com.google.protobuf.ByteString getSublocalityBytes() {
   }
 
   public static final int ADDRESS_LINES_FIELD_NUMBER = 9;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList addressLines_;
   /**
    *
@@ -644,6 +660,8 @@ public com.google.protobuf.ByteString getAddressLinesBytes(int index) {
   }
 
   public static final int RECIPIENTS_FIELD_NUMBER = 10;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList recipients_;
   /**
    *
@@ -713,7 +731,9 @@ public com.google.protobuf.ByteString getRecipientsBytes(int index) {
   }
 
   public static final int ORGANIZATION_FIELD_NUMBER = 11;
-  private volatile java.lang.Object organization_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object organization_ = "";
   /**
    *
    *
@@ -1072,28 +1092,20 @@ 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.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000100);
       recipients_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000200);
       organization_ = "";
-
       return this;
     }
 
@@ -1120,28 +1132,56 @@ 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);
-      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)) {
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.type.PostalAddress result) {
+      if (((bitField0_ & 0x00000100) != 0)) {
         addressLines_ = addressLines_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000100);
       }
       result.addressLines_ = addressLines_;
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (((bitField0_ & 0x00000200) != 0)) {
         recipients_ = recipients_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000200);
       }
       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_ & 0x00000400) != 0)) {
+        result.organization_ = organization_;
+      }
     }
 
     @java.lang.Override
@@ -1194,36 +1234,43 @@ 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_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000100);
         } else {
           ensureAddressLinesIsMutable();
           addressLines_.addAll(other.addressLines_);
@@ -1233,7 +1280,7 @@ public Builder mergeFrom(com.google.type.PostalAddress other) {
       if (!other.recipients_.isEmpty()) {
         if (recipients_.isEmpty()) {
           recipients_ = other.recipients_;
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000200);
         } else {
           ensureRecipientsIsMutable();
           recipients_.addAll(other.recipients_);
@@ -1242,6 +1289,7 @@ public Builder mergeFrom(com.google.type.PostalAddress other) {
       }
       if (!other.getOrganization().isEmpty()) {
         organization_ = other.organization_;
+        bitField0_ |= 0x00000400;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -1273,49 +1321,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:
@@ -1335,7 +1383,7 @@ public Builder mergeFrom(
             case 90:
               {
                 organization_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000400;
                 break;
               } // case 90
             default:
@@ -1392,6 +1440,7 @@ public int getRevision() {
     public Builder setRevision(int value) {
 
       revision_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1409,7 +1458,7 @@ public Builder setRevision(int value) {
      * @return This builder for chaining.
      */
     public Builder clearRevision() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       revision_ = 0;
       onChanged();
       return this;
@@ -1488,8 +1537,8 @@ public Builder setRegionCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       regionCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1509,8 +1558,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;
     }
@@ -1535,8 +1584,8 @@ public Builder setRegionCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       regionCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1629,8 +1678,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1655,8 +1704,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;
     }
@@ -1686,8 +1735,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1762,8 +1811,8 @@ public Builder setPostalCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       postalCode_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1782,8 +1831,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;
     }
@@ -1807,8 +1856,8 @@ public Builder setPostalCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       postalCode_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1886,8 +1935,8 @@ public Builder setSortingCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       sortingCode_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1907,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;
     }
@@ -1933,8 +1982,8 @@ public Builder setSortingCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       sortingCode_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2018,8 +2067,8 @@ public Builder setAdministrativeArea(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       administrativeArea_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2041,8 +2090,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;
     }
@@ -2069,8 +2118,8 @@ public Builder setAdministrativeAreaBytes(com.google.protobuf.ByteString value)
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       administrativeArea_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2145,8 +2194,8 @@ public Builder setLocality(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       locality_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2165,8 +2214,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;
     }
@@ -2190,8 +2239,8 @@ public Builder setLocalityBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       locality_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2260,8 +2309,8 @@ public Builder setSublocality(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       sublocality_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2278,8 +2327,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;
     }
@@ -2301,8 +2350,8 @@ public Builder setSublocalityBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       sublocality_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2311,9 +2360,9 @@ public Builder setSublocalityBytes(com.google.protobuf.ByteString value) {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureAddressLinesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000100) != 0)) {
         addressLines_ = new com.google.protobuf.LazyStringArrayList(addressLines_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000100;
       }
     }
     /**
@@ -2592,7 +2641,7 @@ public Builder addAllAddressLines(java.lang.Iterable<java.lang.String> values) {
      */
     public Builder clearAddressLines() {
       addressLines_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000100);
       onChanged();
       return this;
     }
@@ -2641,9 +2690,9 @@ public Builder addAddressLinesBytes(com.google.protobuf.ByteString value) {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureRecipientsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000200) != 0)) {
         recipients_ = new com.google.protobuf.LazyStringArrayList(recipients_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000200;
       }
     }
     /**
@@ -2794,7 +2843,7 @@ public Builder addAllRecipients(java.lang.Iterable<java.lang.String> values) {
      */
     public Builder clearRecipients() {
       recipients_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000200);
       onChanged();
       return this;
     }
@@ -2884,8 +2933,8 @@ public Builder setOrganization(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       organization_ = value;
+      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -2901,8 +2950,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;
     }
@@ -2923,8 +2972,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/Quaternion.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Quaternion.java
index 37e3bf81b6..95157b0a23 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Quaternion.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Quaternion.java
@@ -105,7 +105,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int X_FIELD_NUMBER = 1;
-  private double x_;
+  private double x_ = 0D;
   /**
    *
    *
@@ -123,7 +123,7 @@ public double getX() {
   }
 
   public static final int Y_FIELD_NUMBER = 2;
-  private double y_;
+  private double y_ = 0D;
   /**
    *
    *
@@ -141,7 +141,7 @@ public double getY() {
   }
 
   public static final int Z_FIELD_NUMBER = 3;
-  private double z_;
+  private double z_ = 0D;
   /**
    *
    *
@@ -159,7 +159,7 @@ public double getZ() {
   }
 
   public static final int W_FIELD_NUMBER = 4;
-  private double w_;
+  private double w_ = 0D;
   /**
    *
    *
@@ -450,14 +450,11 @@ 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;
     }
 
@@ -483,14 +480,29 @@ 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);
-      result.x_ = x_;
-      result.y_ = y_;
-      result.z_ = z_;
-      result.w_ = w_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -577,25 +589,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:
@@ -615,6 +627,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private double x_;
     /**
      *
@@ -646,6 +660,7 @@ public double getX() {
     public Builder setX(double value) {
 
       x_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -661,7 +676,7 @@ public Builder setX(double value) {
      * @return This builder for chaining.
      */
     public Builder clearX() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       x_ = 0D;
       onChanged();
       return this;
@@ -698,6 +713,7 @@ public double getY() {
     public Builder setY(double value) {
 
       y_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -713,7 +729,7 @@ public Builder setY(double value) {
      * @return This builder for chaining.
      */
     public Builder clearY() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       y_ = 0D;
       onChanged();
       return this;
@@ -750,6 +766,7 @@ public double getZ() {
     public Builder setZ(double value) {
 
       z_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -765,7 +782,7 @@ public Builder setZ(double value) {
      * @return This builder for chaining.
      */
     public Builder clearZ() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       z_ = 0D;
       onChanged();
       return this;
@@ -802,6 +819,7 @@ public double getW() {
     public Builder setW(double value) {
 
       w_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -817,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/TimeOfDay.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeOfDay.java
index 7e834b442b..0a0e46f926 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeOfDay.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeOfDay.java
@@ -66,7 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int HOURS_FIELD_NUMBER = 1;
-  private int hours_;
+  private int hours_ = 0;
   /**
    *
    *
@@ -85,7 +85,7 @@ public int getHours() {
   }
 
   public static final int MINUTES_FIELD_NUMBER = 2;
-  private int minutes_;
+  private int minutes_ = 0;
   /**
    *
    *
@@ -103,7 +103,7 @@ public int getMinutes() {
   }
 
   public static final int SECONDS_FIELD_NUMBER = 3;
-  private int seconds_;
+  private int seconds_ = 0;
   /**
    *
    *
@@ -122,7 +122,7 @@ public int getSeconds() {
   }
 
   public static final int NANOS_FIELD_NUMBER = 4;
-  private int nanos_;
+  private int nanos_ = 0;
   /**
    *
    *
@@ -361,14 +361,11 @@ 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;
     }
 
@@ -394,14 +391,29 @@ 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);
-      result.hours_ = hours_;
-      result.minutes_ = minutes_;
-      result.seconds_ = seconds_;
-      result.nanos_ = nanos_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -488,25 +500,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:
@@ -526,6 +538,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private int hours_;
     /**
      *
@@ -559,6 +573,7 @@ public int getHours() {
     public Builder setHours(int value) {
 
       hours_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -575,7 +590,7 @@ public Builder setHours(int value) {
      * @return This builder for chaining.
      */
     public Builder clearHours() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       hours_ = 0;
       onChanged();
       return this;
@@ -612,6 +627,7 @@ public int getMinutes() {
     public Builder setMinutes(int value) {
 
       minutes_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -627,7 +643,7 @@ public Builder setMinutes(int value) {
      * @return This builder for chaining.
      */
     public Builder clearMinutes() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       minutes_ = 0;
       onChanged();
       return this;
@@ -666,6 +682,7 @@ public int getSeconds() {
     public Builder setSeconds(int value) {
 
       seconds_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -682,7 +699,7 @@ public Builder setSeconds(int value) {
      * @return This builder for chaining.
      */
     public Builder clearSeconds() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       seconds_ = 0;
       onChanged();
       return this;
@@ -719,6 +736,7 @@ public int getNanos() {
     public Builder setNanos(int value) {
 
       nanos_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -734,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/TimeZone.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeZone.java
index c7e01c9c87..372d9e7039 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeZone.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeZone.java
@@ -67,7 +67,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ID_FIELD_NUMBER = 1;
-  private volatile java.lang.Object id_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object id_ = "";
   /**
    *
    *
@@ -116,7 +118,9 @@ public com.google.protobuf.ByteString getIdBytes() {
   }
 
   public static final int VERSION_FIELD_NUMBER = 2;
-  private volatile java.lang.Object version_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object version_ = "";
   /**
    *
    *
@@ -366,10 +370,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       id_ = "";
-
       version_ = "";
-
       return this;
     }
 
@@ -395,12 +398,23 @@ 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);
-      result.id_ = id_;
-      result.version_ = version_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       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();
@@ -448,10 +462,12 @@ 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());
@@ -483,13 +499,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:
@@ -509,6 +525,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object id_ = "";
     /**
      *
@@ -570,8 +588,8 @@ public Builder setId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       id_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -587,8 +605,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;
     }
@@ -609,8 +627,8 @@ public Builder setIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       id_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -676,8 +694,8 @@ public Builder setVersion(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       version_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -693,8 +711,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;
     }
@@ -715,8 +733,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/renovate.json b/java-common-protos/renovate.json
new file mode 100644
index 0000000000..642980d5c3
--- /dev/null
+++ b/java-common-protos/renovate.json
@@ -0,0 +1,75 @@
+{
+  "extends": [
+    ":separateMajorReleases",
+    ":combinePatchMinorReleases",
+    ":ignoreUnstable",
+    ":prImmediately",
+    ":updateNotScheduled",
+    ":automergeDisabled",
+    ":ignoreModulesAndTests",
+    ":maintainLockFilesDisabled",
+    ":autodetectPinVersions"
+  ],
+  "ignorePaths": [".kokoro/requirements.txt"],
+  "packageRules": [
+    {
+      "packagePatterns": [
+        "^com.google.guava:"
+      ],
+      "versionScheme": "docker"
+    },
+    {
+      "packagePatterns": [
+        "*"
+      ],
+      "semanticCommitType": "deps",
+      "semanticCommitScope": null
+    },
+    {
+      "packagePatterns": [
+        "^org.apache.maven",
+        "^org.jacoco:",
+        "^org.codehaus.mojo:",
+        "^org.sonatype.plugins:",
+        "^com.coveo:",
+        "^com.google.cloud:google-cloud-shared-config"
+      ],
+      "semanticCommitType": "build",
+      "semanticCommitScope": "deps"
+    },
+    {
+      "packagePatterns": [
+        "^com.google.api.grpc:proto-google-common-protos",
+        "^com.google.cloud:libraries-bom",
+        "^com.google.cloud.samples:shared-configuration"
+      ],
+      "semanticCommitType": "chore",
+      "semanticCommitScope": "deps"
+    },
+    {
+      "packagePatterns": [
+        "^junit:junit",
+        "^com.google.truth:truth",
+        "^org.mockito:mockito-core",
+        "^org.objenesis:objenesis",
+        "^com.google.cloud:google-cloud-conformance-tests"
+      ],
+      "semanticCommitType": "test",
+      "semanticCommitScope": "deps"
+    },
+    {
+      "packagePatterns": [
+        "^com.google.cloud:google-cloud-"
+      ],
+      "ignoreUnstable": false
+    },
+    {
+      "packagePatterns": [
+        "^com.fasterxml.jackson.core"
+      ],
+      "groupName": "jackson dependencies"
+    }
+  ],
+  "semanticCommits": true,
+  "dependencyDashboard": true
+}