diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 02560da9..dc53bbb5 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:8c50e7bab0ae5ad41ee29420b558542637104500f6256b8fe74282b0cf6144db
+  digest: sha256:d4b2141d65566523dfd523f63c6e6899ab1281463bce182a9f600e74b0511875
diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
index 1a23ea42..2176b054 100644
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -1,5 +1,5 @@
 # Configuration for the Blunderbuss GitHub app. For more info see
-# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss
+# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss
 assign_prs_by:
 - labels:
   - samples
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 32e0ea5a..6f09d695 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -2,7 +2,7 @@ rebaseMergeAllowed: false
 squashMergeAllowed: true
 mergeCommitAllowed: false
 branchProtectionRules:
-  - pattern: master
+  - pattern: main
     isAdminEnforced: true
     requiredApprovingReviewCount: 1
     requiresCodeOwnerReviews: true
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 3becb5c0..2425d723 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
 name: ci
 jobs:
@@ -9,14 +9,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11]
+        java: [8, 11, 17]
     steps:
     - uses: actions/checkout@v2
     - uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.8.1
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v2
       with:
+        distribution: zulu
         java-version: ${{matrix.java}}
     - run: java -version
     - run: .kokoro/build.sh
@@ -29,8 +30,9 @@ jobs:
     - uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.8.1
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v2
       with:
+        distribution: zulu
         java-version: 8
     - run: java -version
     - run: .kokoro/build.bat
@@ -40,14 +42,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11]
+        java: [8, 11, 17]
     steps:
     - uses: actions/checkout@v2
     - uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.8.1
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v2
       with:
+        distribution: zulu
         java-version: ${{matrix.java}}
     - run: java -version
     - run: .kokoro/dependencies.sh
@@ -58,8 +61,9 @@ jobs:
     - uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.8.1
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v2
       with:
+        distribution: zulu
         java-version: 8
     - run: java -version
     - run: .kokoro/build.sh
@@ -72,8 +76,9 @@ jobs:
     - uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.8.1
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v2
       with:
+        distribution: zulu
         java-version: 8
     - run: java -version
     - run: .kokoro/build.sh
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index b3a87174..e439f6d4 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -69,6 +69,11 @@ integration)
       verify
     RETURN_CODE=$?
     ;;
+graalvm)
+    # Run Unit and Integration Tests with Native Image
+    mvn test -Pnative -Penable-integration-tests
+    RETURN_CODE=$?
+    ;;
 samples)
     SAMPLES_DIR=samples
     # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise.
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 9030ba8f..9a5105d7 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -28,7 +28,28 @@ source ${scriptDir}/common.sh
 java -version
 echo $JOB_TYPE
 
-export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
+function determineMavenOpts() {
+  local javaVersion=$(
+    # filter down to the version line, then pull out the version between quotes,
+    # then trim the version number down to its minimal number (removing any
+    # update or suffix number).
+    java -version 2>&1 | grep "version" \
+      | sed -E 's/^.*"(.*?)".*$/\1/g' \
+      | sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
+  )
+
+  case $javaVersion in
+    "17")
+      # MaxPermSize is no longer supported as of jdk 17
+      echo -n "-Xmx1024m"
+      ;;
+    *)
+      echo -n "-Xmx1024m -XX:MaxPermSize=128m"
+      ;;
+  esac
+}
+
+export MAVEN_OPTS=$(determineMavenOpts)
 
 # this should run maven enforcer
 retry_with_backoff 3 10 \
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
new file mode 100644
index 00000000..4c7225ec
--- /dev/null
+++ b/.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/.repo-metadata.json b/.repo-metadata.json
index 36567644..9469efb6 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -2,7 +2,7 @@
     "name": "redis",
     "name_pretty": "Cloud Redis",
     "product_documentation": "https://cloud.google.com/memorystore/docs/redis/",
-    "client_documentation": "https://googleapis.dev/java/google-cloud-redis/latest/",
+    "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-redis/latest/history",
     "issue_tracker": "https://issuetracker.google.com/savedsearches/5169231",
     "release_level": "ga",
     "language": "java",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38bc34aa..9e5b23a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [2.0.6](https://www.github.com/googleapis/java-redis/compare/v2.0.5...v2.0.6) (2021-10-20)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.4.0 ([#533](https://www.github.com/googleapis/java-redis/issues/533)) ([7e5884d](https://www.github.com/googleapis/java-redis/commit/7e5884df25f888e89e0fb90f11299deaba0654c0))
+
 ### [2.0.5](https://www.github.com/googleapis/java-redis/compare/v2.0.4...v2.0.5) (2021-09-27)
 
 
diff --git a/README.md b/README.md
index 8bbb4717..bbfa025c 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>23.0.0</version>
+      <version>23.1.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-redis</artifactId>
-  <version>2.0.4</version>
+  <version>2.0.5</version>
 </dependency>
 
 ```
@@ -49,20 +49,20 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:23.0.0')
+implementation platform('com.google.cloud:libraries-bom:23.1.0')
 
 implementation 'com.google.cloud:google-cloud-redis'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-redis:2.0.4'
+implementation 'com.google.cloud:google-cloud-redis:2.0.5'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-redis" % "2.0.4"
+libraryDependencies += "com.google.cloud" % "google-cloud-redis" % "2.0.5"
 ```
 
 ## Authentication
@@ -189,7 +189,7 @@ Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5]
 Java is a registered trademark of Oracle and/or its affiliates.
 
 [product-docs]: https://cloud.google.com/memorystore/docs/redis/
-[javadocs]: https://googleapis.dev/java/google-cloud-redis/latest/
+[javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-redis/latest/history
 [kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-redis/java7.svg
 [kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-redis/java7.html
 [kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-redis/java8.svg
@@ -210,10 +210,10 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [developer-console]: https://console.developers.google.com/
 [create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects
 [cloud-sdk]: https://cloud.google.com/sdk/
-[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/master/troubleshooting/readme.md#troubleshooting
-[contributing]: https://github.com/googleapis/java-redis/blob/master/CONTRIBUTING.md
-[code-of-conduct]: https://github.com/googleapis/java-redis/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct
-[license]: https://github.com/googleapis/java-redis/blob/master/LICENSE
+[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/main/troubleshooting/readme.md#troubleshooting
+[contributing]: https://github.com/googleapis/java-redis/blob/main/CONTRIBUTING.md
+[code-of-conduct]: https://github.com/googleapis/java-redis/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct
+[license]: https://github.com/googleapis/java-redis/blob/main/LICENSE
 [enable-billing]: https://cloud.google.com/apis/docs/getting-started#enabling_billing
 [enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=redis.googleapis.com
 [libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM
diff --git a/google-cloud-redis-bom/pom.xml b/google-cloud-redis-bom/pom.xml
index 36f53663..57783431 100644
--- a/google-cloud-redis-bom/pom.xml
+++ b/google-cloud-redis-bom/pom.xml
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-redis-bom</artifactId>
-  <version>2.0.5</version><!-- {x-version-update:google-cloud-redis:current} -->
+  <version>2.0.6</version><!-- {x-version-update:google-cloud-redis:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.0.3</version>
+    <version>1.1.0</version>
   </parent>
 
   <name>Google Cloud Redis BOM</name>
@@ -52,27 +52,27 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-redis</artifactId>
-        <version>2.0.5</version><!-- {x-version-update:google-cloud-redis:current} -->
+        <version>2.0.6</version><!-- {x-version-update:google-cloud-redis:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-redis-v1beta1</artifactId>
-        <version>0.88.5</version><!-- {x-version-update:grpc-google-cloud-redis-v1beta1:current} -->
+        <version>0.88.6</version><!-- {x-version-update:grpc-google-cloud-redis-v1beta1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-redis-v1</artifactId>
-        <version>2.0.5</version><!-- {x-version-update:grpc-google-cloud-redis-v1:current} -->
+        <version>2.0.6</version><!-- {x-version-update:grpc-google-cloud-redis-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-redis-v1</artifactId>
-        <version>2.0.5</version><!-- {x-version-update:proto-google-cloud-redis-v1:current} -->
+        <version>2.0.6</version><!-- {x-version-update:proto-google-cloud-redis-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-redis-v1beta1</artifactId>
-        <version>0.88.5</version><!-- {x-version-update:proto-google-cloud-redis-v1beta1:current} -->
+        <version>0.88.6</version><!-- {x-version-update:proto-google-cloud-redis-v1beta1:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/google-cloud-redis/pom.xml b/google-cloud-redis/pom.xml
index 538026cd..4fff07d8 100644
--- a/google-cloud-redis/pom.xml
+++ b/google-cloud-redis/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-redis</artifactId>
-  <version>2.0.5</version><!-- {x-version-update:google-cloud-redis:current} -->
+  <version>2.0.6</version><!-- {x-version-update:google-cloud-redis:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Redis</name>
   <url>https://github.com/googleapis/java-redis</url>
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-redis-parent</artifactId>
-    <version>2.0.5</version><!-- {x-version-update:google-cloud-redis:current} -->
+    <version>2.0.6</version><!-- {x-version-update:google-cloud-redis:current} -->
   </parent>
   <properties>
     <site.installationModule>google-cloud-redis</site.installationModule>
diff --git a/google-cloud-redis/src/main/java/com/google/cloud/redis/v1/stub/CloudRedisStubSettings.java b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1/stub/CloudRedisStubSettings.java
index e01a57d4..7e5a717d 100644
--- a/google-cloud-redis/src/main/java/com/google/cloud/redis/v1/stub/CloudRedisStubSettings.java
+++ b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1/stub/CloudRedisStubSettings.java
@@ -305,7 +305,9 @@ public static List<String> getDefaultServiceScopes() {
 
   /** Returns a builder for the default credentials for this service. */
   public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
-    return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES);
+    return GoogleCredentialsProvider.newBuilder()
+        .setScopesToApply(DEFAULT_SERVICE_SCOPES)
+        .setUseJwtAccessWithScope(true);
   }
 
   /** Returns a builder for the default ChannelProvider for this service. */
diff --git a/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java
index c6e6faa4..b92734fa 100644
--- a/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java
+++ b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java
@@ -306,7 +306,9 @@ public static List<String> getDefaultServiceScopes() {
 
   /** Returns a builder for the default credentials for this service. */
   public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
-    return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES);
+    return GoogleCredentialsProvider.newBuilder()
+        .setScopesToApply(DEFAULT_SERVICE_SCOPES)
+        .setUseJwtAccessWithScope(true);
   }
 
   /** Returns a builder for the default ChannelProvider for this service. */
diff --git a/grpc-google-cloud-redis-v1/pom.xml b/grpc-google-cloud-redis-v1/pom.xml
index 01034c20..8b894c40 100644
--- a/grpc-google-cloud-redis-v1/pom.xml
+++ b/grpc-google-cloud-redis-v1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-redis-v1</artifactId>
-  <version>2.0.5</version><!-- {x-version-update:grpc-google-cloud-redis-v1:current} -->
+  <version>2.0.6</version><!-- {x-version-update:grpc-google-cloud-redis-v1:current} -->
   <name>grpc-google-cloud-redis-v1</name>
   <description>GRPC library for grpc-google-cloud-redis-v1</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-redis-parent</artifactId>
-    <version>2.0.5</version><!-- {x-version-update:google-cloud-redis:current} -->
+    <version>2.0.6</version><!-- {x-version-update:google-cloud-redis:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/grpc-google-cloud-redis-v1beta1/pom.xml b/grpc-google-cloud-redis-v1beta1/pom.xml
index d27064fe..c6b8a169 100644
--- a/grpc-google-cloud-redis-v1beta1/pom.xml
+++ b/grpc-google-cloud-redis-v1beta1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-redis-v1beta1</artifactId>
-  <version>0.88.5</version><!-- {x-version-update:grpc-google-cloud-redis-v1beta1:current} -->
+  <version>0.88.6</version><!-- {x-version-update:grpc-google-cloud-redis-v1beta1:current} -->
   <name>grpc-google-cloud-redis-v1beta1</name>
   <description>GRPC library for grpc-google-cloud-redis-v1beta1</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-redis-parent</artifactId>
-    <version>2.0.5</version><!-- {x-version-update:google-cloud-redis:current} -->
+    <version>2.0.6</version><!-- {x-version-update:google-cloud-redis:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 3919a9b2..bca44e7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-redis-parent</artifactId>
   <packaging>pom</packaging>
-  <version>2.0.5</version><!-- {x-version-update:google-cloud-redis:current} -->
+  <version>2.0.6</version><!-- {x-version-update:google-cloud-redis:current} -->
   <name>Google Cloud Redis Parent</name>
   <url>https://github.com/googleapis/java-redis</url>
   <description>
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.0.3</version>
+    <version>1.1.0</version>
   </parent>
 
   <developers>
@@ -61,33 +61,33 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-redis-v1</artifactId>
-        <version>2.0.5</version><!-- {x-version-update:proto-google-cloud-redis-v1:current} -->
+        <version>2.0.6</version><!-- {x-version-update:proto-google-cloud-redis-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-redis-v1beta1</artifactId>
-        <version>0.88.5</version><!-- {x-version-update:proto-google-cloud-redis-v1beta1:current} -->
+        <version>0.88.6</version><!-- {x-version-update:proto-google-cloud-redis-v1beta1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-redis-v1beta1</artifactId>
-        <version>0.88.5</version><!-- {x-version-update:grpc-google-cloud-redis-v1beta1:current} -->
+        <version>0.88.6</version><!-- {x-version-update:grpc-google-cloud-redis-v1beta1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-redis-v1</artifactId>
-        <version>2.0.5</version><!-- {x-version-update:grpc-google-cloud-redis-v1:current} -->
+        <version>2.0.6</version><!-- {x-version-update:grpc-google-cloud-redis-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-redis</artifactId>
-        <version>2.0.5</version><!-- {x-version-update:google-cloud-redis:current} -->
+        <version>2.0.6</version><!-- {x-version-update:google-cloud-redis:current} -->
       </dependency>
 
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shared-dependencies</artifactId>
-        <version>2.3.0</version>
+        <version>2.4.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/proto-google-cloud-redis-v1/pom.xml b/proto-google-cloud-redis-v1/pom.xml
index 8022c46c..e3c1f41b 100644
--- a/proto-google-cloud-redis-v1/pom.xml
+++ b/proto-google-cloud-redis-v1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>proto-google-cloud-redis-v1</artifactId>
-  <version>2.0.5</version><!-- {x-version-update:proto-google-cloud-redis-v1:current} -->
+  <version>2.0.6</version><!-- {x-version-update:proto-google-cloud-redis-v1:current} -->
   <name>proto-google-cloud-redis-v1</name>
   <description>PROTO library for proto-google-cloud-redis-v1</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-redis-parent</artifactId>
-    <version>2.0.5</version><!-- {x-version-update:google-cloud-redis:current} -->
+    <version>2.0.6</version><!-- {x-version-update:google-cloud-redis:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/CreateInstanceRequest.java b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/CreateInstanceRequest.java
index 4c002d6c..b907dc80 100644
--- a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/CreateInstanceRequest.java
+++ b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/CreateInstanceRequest.java
@@ -315,10 +315,10 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getParentBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
     }
-    if (!getInstanceIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(instanceId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, instanceId_);
     }
     if (instance_ != null) {
@@ -333,10 +333,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getParentBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
     }
-    if (!getInstanceIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(instanceId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, instanceId_);
     }
     if (instance_ != null) {
diff --git a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/DeleteInstanceRequest.java b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/DeleteInstanceRequest.java
index 9380ddaf..ce1097f7 100644
--- a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/DeleteInstanceRequest.java
+++ b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/DeleteInstanceRequest.java
@@ -182,7 +182,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
     unknownFields.writeTo(output);
@@ -194,7 +194,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
     size += unknownFields.getSerializedSize();
diff --git a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/ExportInstanceRequest.java b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/ExportInstanceRequest.java
index 52085e2e..2d62e0bb 100644
--- a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/ExportInstanceRequest.java
+++ b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/ExportInstanceRequest.java
@@ -248,7 +248,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
     if (outputConfig_ != null) {
@@ -263,7 +263,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
     if (outputConfig_ != null) {
diff --git a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/FailoverInstanceRequest.java b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/FailoverInstanceRequest.java
index 3bd9e5d9..ba2cafff 100644
--- a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/FailoverInstanceRequest.java
+++ b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/FailoverInstanceRequest.java
@@ -406,7 +406,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
     if (dataProtectionMode_
@@ -424,7 +424,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
     if (dataProtectionMode_
diff --git a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/GcsDestination.java b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/GcsDestination.java
index 445b8088..bc208a87 100644
--- a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/GcsDestination.java
+++ b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/GcsDestination.java
@@ -176,7 +176,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getUriBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(uri_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, uri_);
     }
     unknownFields.writeTo(output);
@@ -188,7 +188,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getUriBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(uri_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, uri_);
     }
     size += unknownFields.getSerializedSize();
diff --git a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/GcsSource.java b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/GcsSource.java
index 0b197c68..89862fb2 100644
--- a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/GcsSource.java
+++ b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/GcsSource.java
@@ -174,7 +174,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getUriBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(uri_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, uri_);
     }
     unknownFields.writeTo(output);
@@ -186,7 +186,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getUriBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(uri_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, uri_);
     }
     size += unknownFields.getSerializedSize();
diff --git a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/GetInstanceRequest.java b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/GetInstanceRequest.java
index 8a226be0..e81eaa90 100644
--- a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/GetInstanceRequest.java
+++ b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/GetInstanceRequest.java
@@ -182,7 +182,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
     unknownFields.writeTo(output);
@@ -194,7 +194,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
     size += unknownFields.getSerializedSize();
diff --git a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/ImportInstanceRequest.java b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/ImportInstanceRequest.java
index bf343ac8..6d6efef3 100644
--- a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/ImportInstanceRequest.java
+++ b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/ImportInstanceRequest.java
@@ -248,7 +248,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
     if (inputConfig_ != null) {
@@ -263,7 +263,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
     if (inputConfig_ != null) {
diff --git a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/Instance.java b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/Instance.java
index 447ee934..0a3adc3b 100644
--- a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/Instance.java
+++ b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/Instance.java
@@ -1974,33 +1974,33 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    if (!getDisplayNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, displayName_);
     }
     com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
         output, internalGetLabels(), LabelsDefaultEntryHolder.defaultEntry, 3);
-    if (!getLocationIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(locationId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, locationId_);
     }
-    if (!getAlternativeLocationIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(alternativeLocationId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 5, alternativeLocationId_);
     }
-    if (!getRedisVersionBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(redisVersion_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 7, redisVersion_);
     }
-    if (!getReservedIpRangeBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(reservedIpRange_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, reservedIpRange_);
     }
-    if (!getHostBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(host_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 10, host_);
     }
     if (port_ != 0) {
       output.writeInt32(11, port_);
     }
-    if (!getCurrentLocationIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(currentLocationId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 12, currentLocationId_);
     }
     if (createTime_ != null) {
@@ -2009,7 +2009,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (state_ != com.google.cloud.redis.v1.Instance.State.STATE_UNSPECIFIED.getNumber()) {
       output.writeEnum(14, state_);
     }
-    if (!getStatusMessageBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(statusMessage_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 15, statusMessage_);
     }
     com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
@@ -2020,10 +2020,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (memorySizeGb_ != 0) {
       output.writeInt32(18, memorySizeGb_);
     }
-    if (!getAuthorizedNetworkBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(authorizedNetwork_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 20, authorizedNetwork_);
     }
-    if (!getPersistenceIamIdentityBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(persistenceIamIdentity_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 21, persistenceIamIdentity_);
     }
     if (connectMode_
@@ -2039,10 +2039,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    if (!getDisplayNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, displayName_);
     }
     for (java.util.Map.Entry<java.lang.String, java.lang.String> entry :
@@ -2055,25 +2055,25 @@ public int getSerializedSize() {
               .build();
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, labels__);
     }
-    if (!getLocationIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(locationId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, locationId_);
     }
-    if (!getAlternativeLocationIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(alternativeLocationId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, alternativeLocationId_);
     }
-    if (!getRedisVersionBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(redisVersion_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, redisVersion_);
     }
-    if (!getReservedIpRangeBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(reservedIpRange_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, reservedIpRange_);
     }
-    if (!getHostBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(host_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, host_);
     }
     if (port_ != 0) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(11, port_);
     }
-    if (!getCurrentLocationIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(currentLocationId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, currentLocationId_);
     }
     if (createTime_ != null) {
@@ -2082,7 +2082,7 @@ public int getSerializedSize() {
     if (state_ != com.google.cloud.redis.v1.Instance.State.STATE_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(14, state_);
     }
-    if (!getStatusMessageBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(statusMessage_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, statusMessage_);
     }
     for (java.util.Map.Entry<java.lang.String, java.lang.String> entry :
@@ -2101,10 +2101,10 @@ public int getSerializedSize() {
     if (memorySizeGb_ != 0) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(18, memorySizeGb_);
     }
-    if (!getAuthorizedNetworkBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(authorizedNetwork_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(20, authorizedNetwork_);
     }
-    if (!getPersistenceIamIdentityBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(persistenceIamIdentity_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(21, persistenceIamIdentity_);
     }
     if (connectMode_
diff --git a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/ListInstancesRequest.java b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/ListInstancesRequest.java
index fdc457c5..be3d9f4a 100644
--- a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/ListInstancesRequest.java
+++ b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/ListInstancesRequest.java
@@ -269,13 +269,13 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getParentBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
     }
     if (pageSize_ != 0) {
       output.writeInt32(2, pageSize_);
     }
-    if (!getPageTokenBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_);
     }
     unknownFields.writeTo(output);
@@ -287,13 +287,13 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getParentBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
     }
     if (pageSize_ != 0) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(2, pageSize_);
     }
-    if (!getPageTokenBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_);
     }
     size += unknownFields.getSerializedSize();
diff --git a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/ListInstancesResponse.java b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/ListInstancesResponse.java
index 199f4e3b..37b7d45a 100644
--- a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/ListInstancesResponse.java
+++ b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/ListInstancesResponse.java
@@ -379,7 +379,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < instances_.size(); i++) {
       output.writeMessage(1, instances_.get(i));
     }
-    if (!getNextPageTokenBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
     for (int i = 0; i < unreachable_.size(); i++) {
@@ -397,7 +397,7 @@ public int getSerializedSize() {
     for (int i = 0; i < instances_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, instances_.get(i));
     }
-    if (!getNextPageTokenBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
     {
diff --git a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/OperationMetadata.java b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/OperationMetadata.java
index 7b2f833a..629a44d2 100644
--- a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/OperationMetadata.java
+++ b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/OperationMetadata.java
@@ -496,19 +496,19 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (endTime_ != null) {
       output.writeMessage(2, getEndTime());
     }
-    if (!getTargetBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(target_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, target_);
     }
-    if (!getVerbBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(verb_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, verb_);
     }
-    if (!getStatusDetailBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(statusDetail_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 5, statusDetail_);
     }
     if (cancelRequested_ != false) {
       output.writeBool(6, cancelRequested_);
     }
-    if (!getApiVersionBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(apiVersion_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 7, apiVersion_);
     }
     unknownFields.writeTo(output);
@@ -526,19 +526,19 @@ public int getSerializedSize() {
     if (endTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getEndTime());
     }
-    if (!getTargetBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(target_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, target_);
     }
-    if (!getVerbBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(verb_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, verb_);
     }
-    if (!getStatusDetailBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(statusDetail_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, statusDetail_);
     }
     if (cancelRequested_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(6, cancelRequested_);
     }
-    if (!getApiVersionBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(apiVersion_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, apiVersion_);
     }
     size += unknownFields.getSerializedSize();
diff --git a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/UpgradeInstanceRequest.java b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/UpgradeInstanceRequest.java
index 280bd811..ece569eb 100644
--- a/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/UpgradeInstanceRequest.java
+++ b/proto-google-cloud-redis-v1/src/main/java/com/google/cloud/redis/v1/UpgradeInstanceRequest.java
@@ -239,10 +239,10 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    if (!getRedisVersionBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(redisVersion_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, redisVersion_);
     }
     unknownFields.writeTo(output);
@@ -254,10 +254,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    if (!getRedisVersionBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(redisVersion_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, redisVersion_);
     }
     size += unknownFields.getSerializedSize();
diff --git a/proto-google-cloud-redis-v1beta1/pom.xml b/proto-google-cloud-redis-v1beta1/pom.xml
index 4a659307..c3796f08 100644
--- a/proto-google-cloud-redis-v1beta1/pom.xml
+++ b/proto-google-cloud-redis-v1beta1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>proto-google-cloud-redis-v1beta1</artifactId>
-  <version>0.88.5</version><!-- {x-version-update:proto-google-cloud-redis-v1beta1:current} -->
+  <version>0.88.6</version><!-- {x-version-update:proto-google-cloud-redis-v1beta1:current} -->
   <name>proto-google-cloud-redis-v1beta1</name>
   <description>PROTO library for proto-google-cloud-redis-v1beta1</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-redis-parent</artifactId>
-    <version>2.0.5</version><!-- {x-version-update:google-cloud-redis:current} -->
+    <version>2.0.6</version><!-- {x-version-update:google-cloud-redis:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CreateInstanceRequest.java b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CreateInstanceRequest.java
index 127cbac4..99bb26a5 100644
--- a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CreateInstanceRequest.java
+++ b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CreateInstanceRequest.java
@@ -321,10 +321,10 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getParentBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
     }
-    if (!getInstanceIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(instanceId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, instanceId_);
     }
     if (instance_ != null) {
@@ -339,10 +339,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getParentBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
     }
-    if (!getInstanceIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(instanceId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, instanceId_);
     }
     if (instance_ != null) {
diff --git a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/DeleteInstanceRequest.java b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/DeleteInstanceRequest.java
index aea2c7e8..ef258792 100644
--- a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/DeleteInstanceRequest.java
+++ b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/DeleteInstanceRequest.java
@@ -182,7 +182,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
     unknownFields.writeTo(output);
@@ -194,7 +194,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
     size += unknownFields.getSerializedSize();
diff --git a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ExportInstanceRequest.java b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ExportInstanceRequest.java
index 5e3c375f..1f8f0905 100644
--- a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ExportInstanceRequest.java
+++ b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ExportInstanceRequest.java
@@ -248,7 +248,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
     if (outputConfig_ != null) {
@@ -263,7 +263,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
     if (outputConfig_ != null) {
diff --git a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/FailoverInstanceRequest.java b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/FailoverInstanceRequest.java
index f0be960b..d400c68c 100644
--- a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/FailoverInstanceRequest.java
+++ b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/FailoverInstanceRequest.java
@@ -406,7 +406,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
     if (dataProtectionMode_
@@ -424,7 +424,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
     if (dataProtectionMode_
diff --git a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GcsDestination.java b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GcsDestination.java
index 8a253652..9869ce83 100644
--- a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GcsDestination.java
+++ b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GcsDestination.java
@@ -176,7 +176,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getUriBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(uri_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, uri_);
     }
     unknownFields.writeTo(output);
@@ -188,7 +188,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getUriBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(uri_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, uri_);
     }
     size += unknownFields.getSerializedSize();
diff --git a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GcsSource.java b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GcsSource.java
index a3a3fbf2..3dba06cc 100644
--- a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GcsSource.java
+++ b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GcsSource.java
@@ -174,7 +174,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getUriBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(uri_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, uri_);
     }
     unknownFields.writeTo(output);
@@ -186,7 +186,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getUriBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(uri_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, uri_);
     }
     size += unknownFields.getSerializedSize();
diff --git a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GetInstanceRequest.java b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GetInstanceRequest.java
index f7c71e9f..138f47e8 100644
--- a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GetInstanceRequest.java
+++ b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GetInstanceRequest.java
@@ -182,7 +182,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
     unknownFields.writeTo(output);
@@ -194,7 +194,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
     size += unknownFields.getSerializedSize();
diff --git a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ImportInstanceRequest.java b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ImportInstanceRequest.java
index f6ac6591..7af73774 100644
--- a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ImportInstanceRequest.java
+++ b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ImportInstanceRequest.java
@@ -248,7 +248,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
     if (inputConfig_ != null) {
@@ -263,7 +263,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
     if (inputConfig_ != null) {
diff --git a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/Instance.java b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/Instance.java
index 3b36a00c..de273196 100644
--- a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/Instance.java
+++ b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/Instance.java
@@ -1978,33 +1978,33 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    if (!getDisplayNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, displayName_);
     }
     com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
         output, internalGetLabels(), LabelsDefaultEntryHolder.defaultEntry, 3);
-    if (!getLocationIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(locationId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, locationId_);
     }
-    if (!getAlternativeLocationIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(alternativeLocationId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 5, alternativeLocationId_);
     }
-    if (!getRedisVersionBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(redisVersion_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 7, redisVersion_);
     }
-    if (!getReservedIpRangeBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(reservedIpRange_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, reservedIpRange_);
     }
-    if (!getHostBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(host_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 10, host_);
     }
     if (port_ != 0) {
       output.writeInt32(11, port_);
     }
-    if (!getCurrentLocationIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(currentLocationId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 12, currentLocationId_);
     }
     if (createTime_ != null) {
@@ -2013,7 +2013,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (state_ != com.google.cloud.redis.v1beta1.Instance.State.STATE_UNSPECIFIED.getNumber()) {
       output.writeEnum(14, state_);
     }
-    if (!getStatusMessageBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(statusMessage_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 15, statusMessage_);
     }
     com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
@@ -2024,10 +2024,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (memorySizeGb_ != 0) {
       output.writeInt32(18, memorySizeGb_);
     }
-    if (!getAuthorizedNetworkBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(authorizedNetwork_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 20, authorizedNetwork_);
     }
-    if (!getPersistenceIamIdentityBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(persistenceIamIdentity_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 21, persistenceIamIdentity_);
     }
     if (connectMode_
@@ -2044,10 +2044,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    if (!getDisplayNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, displayName_);
     }
     for (java.util.Map.Entry<java.lang.String, java.lang.String> entry :
@@ -2060,25 +2060,25 @@ public int getSerializedSize() {
               .build();
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, labels__);
     }
-    if (!getLocationIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(locationId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, locationId_);
     }
-    if (!getAlternativeLocationIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(alternativeLocationId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, alternativeLocationId_);
     }
-    if (!getRedisVersionBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(redisVersion_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, redisVersion_);
     }
-    if (!getReservedIpRangeBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(reservedIpRange_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, reservedIpRange_);
     }
-    if (!getHostBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(host_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, host_);
     }
     if (port_ != 0) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(11, port_);
     }
-    if (!getCurrentLocationIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(currentLocationId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, currentLocationId_);
     }
     if (createTime_ != null) {
@@ -2087,7 +2087,7 @@ public int getSerializedSize() {
     if (state_ != com.google.cloud.redis.v1beta1.Instance.State.STATE_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(14, state_);
     }
-    if (!getStatusMessageBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(statusMessage_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, statusMessage_);
     }
     for (java.util.Map.Entry<java.lang.String, java.lang.String> entry :
@@ -2106,10 +2106,10 @@ public int getSerializedSize() {
     if (memorySizeGb_ != 0) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(18, memorySizeGb_);
     }
-    if (!getAuthorizedNetworkBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(authorizedNetwork_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(20, authorizedNetwork_);
     }
-    if (!getPersistenceIamIdentityBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(persistenceIamIdentity_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(21, persistenceIamIdentity_);
     }
     if (connectMode_
diff --git a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesRequest.java b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesRequest.java
index ae50eb90..2f5303df 100644
--- a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesRequest.java
+++ b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesRequest.java
@@ -269,13 +269,13 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getParentBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
     }
     if (pageSize_ != 0) {
       output.writeInt32(2, pageSize_);
     }
-    if (!getPageTokenBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_);
     }
     unknownFields.writeTo(output);
@@ -287,13 +287,13 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getParentBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
     }
     if (pageSize_ != 0) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(2, pageSize_);
     }
-    if (!getPageTokenBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_);
     }
     size += unknownFields.getSerializedSize();
diff --git a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesResponse.java b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesResponse.java
index 93834808..a813682b 100644
--- a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesResponse.java
+++ b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesResponse.java
@@ -379,7 +379,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < instances_.size(); i++) {
       output.writeMessage(1, instances_.get(i));
     }
-    if (!getNextPageTokenBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
     for (int i = 0; i < unreachable_.size(); i++) {
@@ -397,7 +397,7 @@ public int getSerializedSize() {
     for (int i = 0; i < instances_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, instances_.get(i));
     }
-    if (!getNextPageTokenBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
     {
diff --git a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/UpgradeInstanceRequest.java b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/UpgradeInstanceRequest.java
index 38fbcada..9a817be4 100644
--- a/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/UpgradeInstanceRequest.java
+++ b/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/UpgradeInstanceRequest.java
@@ -239,10 +239,10 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    if (!getRedisVersionBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(redisVersion_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, redisVersion_);
     }
     unknownFields.writeTo(output);
@@ -254,10 +254,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    if (!getRedisVersionBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(redisVersion_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, redisVersion_);
     }
     size += unknownFields.getSerializedSize();
diff --git a/renovate.json b/renovate.json
index 6eb7ffef..05309ecb 100644
--- a/renovate.json
+++ b/renovate.json
@@ -70,8 +70,5 @@
     }
   ],
   "semanticCommits": true,
-  "dependencyDashboard": true,
-  "dependencyDashboardLabels": [
-    "type: process"
-  ]
+  "dependencyDashboard": true
 }
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 6533ccab..ff8db95d 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-redis</artifactId>
-      <version>2.0.4</version>
+      <version>2.0.5</version>
     </dependency>
     <!-- [END redis_install_without_bom] -->
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index e5c9ff7e..62577946 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-redis</artifactId>
-      <version>2.0.4</version>
+      <version>2.0.5</version>
     </dependency>
 
     <dependency>
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index d2f2f58f..29bc85dc 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>libraries-bom</artifactId>
-        <version>23.0.0</version>
+        <version>23.1.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/versions.txt b/versions.txt
index ac54cc41..a1e7948c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-redis:2.0.5:2.0.5
-grpc-google-cloud-redis-v1beta1:0.88.5:0.88.5
-grpc-google-cloud-redis-v1:2.0.5:2.0.5
-proto-google-cloud-redis-v1:2.0.5:2.0.5
-proto-google-cloud-redis-v1beta1:0.88.5:0.88.5
+google-cloud-redis:2.0.6:2.0.6
+grpc-google-cloud-redis-v1beta1:0.88.6:0.88.6
+grpc-google-cloud-redis-v1:2.0.6:2.0.6
+proto-google-cloud-redis-v1:2.0.6:2.0.6
+proto-google-cloud-redis-v1beta1:0.88.6:0.88.6