diff --git a/.github/readme/synth.py b/.github/readme/synth.py
deleted file mode 100644
index 7b48cc28..00000000
--- a/.github/readme/synth.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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.
-
-"""This script is used to synthesize generated the README for this library."""
-
-from synthtool.languages import java
-
-java.custom_templates(["java_library/README.md"])
diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml
index f247d5c7..a0ba1f7d 100644
--- a/.github/trusted-contribution.yml
+++ b/.github/trusted-contribution.yml
@@ -1,2 +1,3 @@
 trustedContributors:
-- renovate-bot
\ No newline at end of file
+- renovate-bot
+- gcf-owl-bot[bot]
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d510359d..3becb5c0 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,6 +12,9 @@ jobs:
         java: [8, 11]
     steps:
     - uses: actions/checkout@v2
+    - uses: stCarolas/setup-maven@v4
+      with:
+        maven-version: 3.8.1
     - uses: actions/setup-java@v1
       with:
         java-version: ${{matrix.java}}
@@ -23,6 +26,9 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
+    - uses: stCarolas/setup-maven@v4
+      with:
+        maven-version: 3.8.1
     - uses: actions/setup-java@v1
       with:
         java-version: 8
@@ -37,6 +43,9 @@ jobs:
         java: [8, 11]
     steps:
     - uses: actions/checkout@v2
+    - uses: stCarolas/setup-maven@v4
+      with:
+        maven-version: 3.8.1
     - uses: actions/setup-java@v1
       with:
         java-version: ${{matrix.java}}
@@ -46,6 +55,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+    - uses: stCarolas/setup-maven@v4
+      with:
+        maven-version: 3.8.1
     - uses: actions/setup-java@v1
       with:
         java-version: 8
@@ -57,6 +69,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+    - uses: stCarolas/setup-maven@v4
+      with:
+        maven-version: 3.8.1
     - uses: actions/setup-java@v1
       with:
         java-version: 8
diff --git a/.kokoro/continuous/readme.cfg b/.kokoro/continuous/readme.cfg
deleted file mode 100644
index 72564490..00000000
--- a/.kokoro/continuous/readme.cfg
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.
-
-# Format: //devtools/kokoro/config/proto/build.proto
-
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/python-multi"
-}
-
-env_vars: {
-  key: "TRAMPOLINE_BUILD_FILE"
-  value: "github/java-common-protos/.kokoro/readme.sh"
-}
-
-# Build logs will be here
-action {
-  define_artifacts {
-    regex: "**/*sponge_log.xml"
-    regex: "**/*sponge_log.log"
-  }
-}
-
-# The github token is stored here.
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "yoshi-automation-github-key"
-      # TODO(theacodes): remove this after secrets have globally propagated
-      backend_type: FASTCONFIGPUSH
-    }
-  }
-}
-
-# Common env vars for all repositories and builds.
-env_vars: {
-    key: "GITHUB_USER"
-    value: "yoshi-automation"
-}
-env_vars: {
-    key: "GITHUB_EMAIL"
-    value: "yoshi-automation@google.com"
-}
diff --git a/.kokoro/release/common.sh b/.kokoro/release/common.sh
index 6e3f6599..7f78ee41 100755
--- a/.kokoro/release/common.sh
+++ b/.kokoro/release/common.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 Google Inc.
+# 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.
diff --git a/.kokoro/release/drop.sh b/.kokoro/release/drop.sh
index 5c4551ef..742ec1a8 100755
--- a/.kokoro/release/drop.sh
+++ b/.kokoro/release/drop.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 Google Inc.
+# 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.
diff --git a/.kokoro/release/promote.sh b/.kokoro/release/promote.sh
index 1fa95fa5..3cac3d8a 100755
--- a/.kokoro/release/promote.sh
+++ b/.kokoro/release/promote.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 Google Inc.
+# 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.
diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh
index 6dc2511d..27430fba 100755
--- a/.kokoro/release/publish_javadoc.sh
+++ b/.kokoro/release/publish_javadoc.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2019 Google Inc.
+# 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.
diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh
index 44fb968e..20d27393 100755
--- a/.kokoro/release/publish_javadoc11.sh
+++ b/.kokoro/release/publish_javadoc11.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021 Google Inc.
+# 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.
diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh
index 8a103384..77dc4e8f 100755
--- a/.kokoro/release/stage.sh
+++ b/.kokoro/release/stage.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 Google Inc.
+# 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.
diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh
index 9da0f839..8b69b793 100644
--- a/.kokoro/trampoline.sh
+++ b/.kokoro/trampoline.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 Google Inc.
+# 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.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7792f22..f33a98ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+### [2.5.1](https://www.github.com/googleapis/java-common-protos/compare/v2.5.0...v2.5.1) (2021-09-24)
+
+
+### Dependencies
+
+* update dependency com.google.protobuf:protobuf-bom to v3.18.0 ([#224](https://www.github.com/googleapis/java-common-protos/issues/224)) ([7b41003](https://www.github.com/googleapis/java-common-protos/commit/7b4100372c2f614c929f27f1659d9d1b6bd7d716))
+* update dependency com.google.protobuf:protobuf-java to v3.18.0 ([#225](https://www.github.com/googleapis/java-common-protos/issues/225)) ([9205c62](https://www.github.com/googleapis/java-common-protos/commit/9205c625308f82c4a2bf512b20b81bb5484a5ae9))
+* update dependency io.grpc:grpc-protobuf to v1.41.0 ([#228](https://www.github.com/googleapis/java-common-protos/issues/228)) ([484e5c1](https://www.github.com/googleapis/java-common-protos/commit/484e5c111a7030693fb6462ac3e4b8928ddca3f3))
+* update dependency io.grpc:grpc-stub to v1.41.0 ([#229](https://www.github.com/googleapis/java-common-protos/issues/229)) ([82de6a1](https://www.github.com/googleapis/java-common-protos/commit/82de6a18804e4c88b6f10422b2781a869aa61078))
+
 ## [2.5.0](https://www.github.com/googleapis/java-common-protos/compare/v2.4.1...v2.5.0) (2021-08-30)
 
 
diff --git a/grpc-google-common-protos/build.gradle b/grpc-google-common-protos/build.gradle
index cda8ea41..df02278e 100644
--- a/grpc-google-common-protos/build.gradle
+++ b/grpc-google-common-protos/build.gradle
@@ -18,8 +18,8 @@ repositories {
 }
 
 dependencies {
-  compile 'io.grpc:grpc-stub:1.40.1'
-  compile 'io.grpc:grpc-protobuf:1.40.1'
+  compile 'io.grpc:grpc-stub:1.41.0'
+  compile 'io.grpc:grpc-protobuf:1.41.0'
   compile project(':proto-google-common-protos')
 }
 
diff --git a/grpc-google-common-protos/pom.xml b/grpc-google-common-protos/pom.xml
index d4b06cd2..c046b94d 100644
--- a/grpc-google-common-protos/pom.xml
+++ b/grpc-google-common-protos/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-common-protos</artifactId>
-  <version>2.5.0</version><!-- {x-version-update:proto-google-common-protos:current} -->
+  <version>2.5.1</version><!-- {x-version-update:proto-google-common-protos:current} -->
   <name>grpc-google-common-protos</name>
   <description>GRPC library for grpc-google-common-protos</description>
   <parent>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>google-common-protos-parent</artifactId>
-    <version>2.5.0</version><!-- {x-version-update:proto-google-common-protos:current} -->
+    <version>2.5.1</version><!-- {x-version-update:proto-google-common-protos:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/pom.xml b/pom.xml
index b3259f04..8c7ea57f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.api.grpc</groupId>
   <artifactId>google-common-protos-parent</artifactId>
   <packaging>pom</packaging>
-  <version>2.5.0</version><!-- {x-version-update:proto-google-common-protos:current} -->
+  <version>2.5.1</version><!-- {x-version-update:proto-google-common-protos:current} -->
   <name>Google Common Protos Parent</name>
   <url>https://github.com/googleapis/java-iam</url>
   <description>
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.3</version>
   </parent>
 
   <developers>
@@ -63,7 +63,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <github.global.server>github</github.global.server>
     <site.installationModule>google-iam-parent</site.installationModule>
-    <protobuf.version>3.17.3</protobuf.version>
+    <protobuf.version>3.18.0</protobuf.version>
     <junit.version>4.13.2</junit.version>
     <grpc.version>1.38.1</grpc.version>
     <guava.version>30.1-android</guava.version>
@@ -88,7 +88,7 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-common-protos</artifactId>
-        <version>2.5.0</version><!-- {x-version-update:proto-google-common-protos:current} -->
+        <version>2.5.1</version><!-- {x-version-update:proto-google-common-protos:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
@@ -147,7 +147,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.3.1</version>
         <reportSets>
           <reportSet>
             <id>html</id>
diff --git a/proto-google-common-protos/build.gradle b/proto-google-common-protos/build.gradle
index ef6eb1a1..19c2d6bb 100644
--- a/proto-google-common-protos/build.gradle
+++ b/proto-google-common-protos/build.gradle
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-  compile 'com.google.protobuf:protobuf-java:3.17.3'
+  compile 'com.google.protobuf:protobuf-java:3.18.0'
 }
 
 sourceSets {
diff --git a/proto-google-common-protos/pom.xml b/proto-google-common-protos/pom.xml
index 89add025..e0973cf1 100644
--- a/proto-google-common-protos/pom.xml
+++ b/proto-google-common-protos/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>proto-google-common-protos</artifactId>
-  <version>2.5.0</version><!-- {x-version-update:proto-google-common-protos:current} -->
+  <version>2.5.1</version><!-- {x-version-update:proto-google-common-protos:current} -->
   <name>proto-google-common-protos</name>
   <description>PROTO library for proto-google-common-protos</description>
   <parent>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>google-common-protos-parent</artifactId>
-    <version>2.5.0</version><!-- {x-version-update:proto-google-common-protos:current} -->
+    <version>2.5.1</version><!-- {x-version-update:proto-google-common-protos:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/renovate.json b/renovate.json
index 26fd2846..5eac2d55 100644
--- a/renovate.json
+++ b/renovate.json
@@ -50,7 +50,8 @@
         "^junit:junit",
         "^com.google.truth:truth",
         "^org.mockito:mockito-core",
-        "^org.objenesis:objenesis"
+        "^org.objenesis:objenesis",
+        "^com.google.cloud:google-cloud-conformance-tests"
       ],
       "semanticCommitType": "test",
       "semanticCommitScope": "deps"
@@ -69,8 +70,5 @@
     }
   ],
   "semanticCommits": true,
-  "dependencyDashboard": true,
-  "dependencyDashboardLabels": [
-    "type: process"
-  ]
+  "dependencyDashboard": true
 }
diff --git a/synth.metadata b/synth.metadata
index 1593b446..65bb035e 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,22 +4,22 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-common-protos.git",
-        "sha": "66db02e9b97c724179a2110671a51bc2ce92b3df"
+        "sha": "015cfd8b552926963aee30de019d1638133dce31"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "ed739492993c4a99629b6430affdd6c0fb59d435",
-        "internalRef": "391764852"
+        "sha": "aa15f328736501d01fac1d599655c392b5b12a3c",
+        "internalRef": "394033461"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "31728d872f50e439ded2f67fa8d67955b26a4e35"
+        "sha": "0752ff727a19a467dffed335d5e59303689cf0d1"
       }
     }
   ],
@@ -31,8 +31,8 @@
     ".github/PULL_REQUEST_TEMPLATE.md",
     ".github/blunderbuss.yml",
     ".github/generated-files-bot.yml",
-    ".github/readme/synth.py",
     ".github/release-please.yml",
+    ".github/release-trigger.yml",
     ".github/snippet-bot.yml",
     ".github/sync-repo-settings.yaml",
     ".github/trusted-contribution.yml",
@@ -46,7 +46,6 @@
     ".kokoro/common.sh",
     ".kokoro/continuous/common.cfg",
     ".kokoro/continuous/java8.cfg",
-    ".kokoro/continuous/readme.cfg",
     ".kokoro/dependencies.sh",
     ".kokoro/nightly/common.cfg",
     ".kokoro/nightly/integration.cfg",
@@ -141,6 +140,8 @@
     "proto-google-common-protos/src/main/java/com/google/api/Endpoint.java",
     "proto-google-common-protos/src/main/java/com/google/api/EndpointOrBuilder.java",
     "proto-google-common-protos/src/main/java/com/google/api/EndpointProto.java",
+    "proto-google-common-protos/src/main/java/com/google/api/ErrorReason.java",
+    "proto-google-common-protos/src/main/java/com/google/api/ErrorReasonProto.java",
     "proto-google-common-protos/src/main/java/com/google/api/FieldBehavior.java",
     "proto-google-common-protos/src/main/java/com/google/api/FieldBehaviorProto.java",
     "proto-google-common-protos/src/main/java/com/google/api/Http.java",
@@ -222,6 +223,8 @@
     "proto-google-common-protos/src/main/java/com/google/api/VisibilityProto.java",
     "proto-google-common-protos/src/main/java/com/google/api/VisibilityRule.java",
     "proto-google-common-protos/src/main/java/com/google/api/VisibilityRuleOrBuilder.java",
+    "proto-google-common-protos/src/main/java/com/google/cloud/ExtendedOperationsProto.java",
+    "proto-google-common-protos/src/main/java/com/google/cloud/OperationResponseMapping.java",
     "proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLog.java",
     "proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLogOrBuilder.java",
     "proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLogProto.java",
@@ -229,6 +232,9 @@
     "proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthenticationInfoOrBuilder.java",
     "proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthorizationInfo.java",
     "proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthorizationInfoOrBuilder.java",
+    "proto-google-common-protos/src/main/java/com/google/cloud/audit/BigQueryAuditMetadata.java",
+    "proto-google-common-protos/src/main/java/com/google/cloud/audit/BigQueryAuditMetadataOrBuilder.java",
+    "proto-google-common-protos/src/main/java/com/google/cloud/audit/BigQueryAuditMetadataProto.java",
     "proto-google-common-protos/src/main/java/com/google/cloud/audit/RequestMetadata.java",
     "proto-google-common-protos/src/main/java/com/google/cloud/audit/RequestMetadataOrBuilder.java",
     "proto-google-common-protos/src/main/java/com/google/cloud/audit/ResourceLocation.java",
@@ -317,6 +323,9 @@
     "proto-google-common-protos/src/main/java/com/google/type/LatLng.java",
     "proto-google-common-protos/src/main/java/com/google/type/LatLngOrBuilder.java",
     "proto-google-common-protos/src/main/java/com/google/type/LatLngProto.java",
+    "proto-google-common-protos/src/main/java/com/google/type/LocalizedText.java",
+    "proto-google-common-protos/src/main/java/com/google/type/LocalizedTextOrBuilder.java",
+    "proto-google-common-protos/src/main/java/com/google/type/LocalizedTextProto.java",
     "proto-google-common-protos/src/main/java/com/google/type/Money.java",
     "proto-google-common-protos/src/main/java/com/google/type/MoneyOrBuilder.java",
     "proto-google-common-protos/src/main/java/com/google/type/MoneyProto.java",
@@ -368,6 +377,8 @@
     "proto-google-common-protos/src/main/proto/google/api/visibility.proto",
     "proto-google-common-protos/src/main/proto/google/cloud/audit/audit_log.proto",
     "proto-google-common-protos/src/main/proto/google/cloud/audit/bigquery_audit_metadata.proto",
+    "proto-google-common-protos/src/main/proto/google/cloud/common_resources.proto",
+    "proto-google-common-protos/src/main/proto/google/cloud/extended_operations.proto",
     "proto-google-common-protos/src/main/proto/google/geo/type/viewport.proto",
     "proto-google-common-protos/src/main/proto/google/logging/type/http_request.proto",
     "proto-google-common-protos/src/main/proto/google/logging/type/log_severity.proto",
diff --git a/versions.txt b/versions.txt
index b10f89ef..351c75d7 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
 # Format:
 # module:released-version:current-version
 
-proto-google-common-protos:2.5.0:2.5.0
+proto-google-common-protos:2.5.1:2.5.1