diff --git a/.github/release-please.yml b/.github/release-please.yml
index 701b57ed2..8275c4f37 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -14,3 +14,7 @@ branches:
     bumpMinorPreMajor: true
     handleGHRelease: true
     branch: 2.0.x
+  - releaseType: java-backport
+    bumpMinorPreMajor: true
+    handleGHRelease: true
+    branch: 2.1.x
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index bf50572e9..0689f05cb 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -38,6 +38,15 @@ branchProtectionRules:
     requiredApprovingReviewCount: 1
     requiresCodeOwnerReviews: true
     requiresStrictStatusChecks: true
+  - pattern: 2.1.x
+    isAdminEnforced: true
+    requiredStatusCheckContexts:
+      - units
+      - format
+      - cla/google
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: true
 permissionRules:
   - team: Googlers
     permission: pull
diff --git a/.github/workflows/downstream.yaml b/.github/workflows/downstream.yaml
index 4258bbf56..a61ff8d7a 100644
--- a/.github/workflows/downstream.yaml
+++ b/.github/workflows/downstream.yaml
@@ -134,9 +134,11 @@ jobs:
         - workflows
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v3
       with:
+        distribution: zulu
         java-version: ${{matrix.java}}
     - run: java -version
+    - run: sudo apt-get update -y
     - run: sudo apt-get install libxml2-utils
     - run: .kokoro/downstream-client-library-check.sh api-common ${{matrix.repo}}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37bb24994..b218098dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [2.2.0](https://github.com/googleapis/api-common-java/compare/v2.1.5...v2.2.0) (2022-04-18)
+
+
+### Features
+
+* next release from main branch is 2.2.0 ([#355](https://github.com/googleapis/api-common-java/issues/355)) ([75f57bc](https://github.com/googleapis/api-common-java/commit/75f57bca521495a91fd7e55447c60e2b8955ef06))
+
+
+### Dependencies
+
+* update dependency com.google.errorprone:error_prone_annotations to v2.12.1 ([#350](https://github.com/googleapis/api-common-java/issues/350)) ([2e6de4f](https://github.com/googleapis/api-common-java/commit/2e6de4f0ce7bbbbbcb066e9986a8d7bd04ab043c))
+* update dependency com.google.errorprone:error_prone_annotations to v2.13.0 ([#353](https://github.com/googleapis/api-common-java/issues/353)) ([2954859](https://github.com/googleapis/api-common-java/commit/2954859afe658b07ac76773e056b1b48fe81182b))
+* update dependency com.google.errorprone:error_prone_annotations to v2.13.1 ([#354](https://github.com/googleapis/api-common-java/issues/354)) ([ca94cf9](https://github.com/googleapis/api-common-java/commit/ca94cf901e15765d24a5abaaa9707a74f134cfec))
+
 ### [2.1.5](https://github.com/googleapis/api-common-java/compare/v2.1.4...v2.1.5) (2022-03-23)
 
 
diff --git a/build.gradle b/build.gradle
index 8e17ccf7f..516905927 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'io.github.gradle-nexus.publish-plugin'
 group = "com.google.api"
 archivesBaseName = "api-common"
 
-project.version = "2.1.5" // {x-version-update:api-common:current}
+project.version = "2.2.0" // {x-version-update:api-common:current}
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -46,7 +46,7 @@ ext {
       auto_value_annotations: 'com.google.auto.value:auto-value-annotations:1.9',
       guava: 'com.google.guava:guava:31.1-jre',
       jsr305: 'com.google.code.findbugs:jsr305:3.0.2',
-      error_prone_annotations: 'com.google.errorprone:error_prone_annotations:2.11.0',
+      error_prone_annotations: 'com.google.errorprone:error_prone_annotations:2.13.1',
 
       // Testing
       junit: 'junit:junit:4.13.2',
diff --git a/versions.txt b/versions.txt
index 42df431ff..f37ce54bb 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
 # Format:
 # module:released-version:current-version
 
-api-common:2.1.5:2.1.5
+api-common:2.2.0:2.2.0