From 7eec867b1068e09fb967d92f4adf41157c1e8daa Mon Sep 17 00:00:00 2001
From: Mridula <66699525+mpeddada1@users.noreply.github.com>
Date: Wed, 20 Sep 2023 19:30:22 +0000
Subject: [PATCH] build(deps): bump grpc version to 1.58.0 and protobuf to
 3.24.0 (#1989)

* build(deps): bump grpc version to 1.58.0 and protobuf to 3.24.0


---------

Co-authored-by: Diego Marquez <diegomarquezp@google.com>
---
 .github/workflows/ci.yaml                     |  2 +-
 .kokoro/presubmit/downstream-compatibility.sh | 11 ++-
 api-common-java/pom.xml                       |  2 +-
 gapic-generator-java-pom-parent/pom.xml       |  7 +-
 gapic-generator-java/pom.xml                  |  2 +-
 gax-java/dependencies.properties              |  6 +-
 gax-java/gax-grpc/pom.xml                     |  4 +
 .../third-party-dependencies/pom.xml          |  2 +-
 .../upper-bound-check/pom.xml                 |  6 --
 .../reflect-config.json                       | 90 +++++++++++++++++++
 .../showcase/v1beta1/ComplianceGrpc.java      |  6 +-
 .../com/google/showcase/v1beta1/EchoGrpc.java |  6 +-
 .../google/showcase/v1beta1/IdentityGrpc.java |  6 +-
 .../showcase/v1beta1/MessagingGrpc.java       |  6 +-
 .../showcase/v1beta1/SequenceServiceGrpc.java |  6 +-
 .../google/showcase/v1beta1/TestingGrpc.java  |  6 +-
 .../google/showcase/v1beta1/BlockRequest.java | 26 ++++--
 .../com/google/showcase/v1beta1/Blurb.java    | 40 ++++++---
 .../showcase/v1beta1/ComplianceData.java      | 69 +++++++-------
 .../showcase/v1beta1/ComplianceDataChild.java | 61 +++++++------
 .../showcase/v1beta1/CreateBlurbRequest.java  | 26 ++++--
 .../showcase/v1beta1/CreateRoomRequest.java   | 26 ++++--
 .../v1beta1/CreateSequenceRequest.java        | 26 ++++--
 .../v1beta1/CreateSessionRequest.java         | 26 ++++--
 .../CreateStreamingSequenceRequest.java       | 26 ++++--
 .../showcase/v1beta1/CreateUserRequest.java   | 26 ++++--
 .../google/showcase/v1beta1/EnumResponse.java | 26 ++++--
 .../showcase/v1beta1/ExpandRequest.java       | 40 ++++++---
 .../showcase/v1beta1/RepeatRequest.java       | 57 +++++++-----
 .../showcase/v1beta1/RepeatResponse.java      | 26 ++++--
 .../com/google/showcase/v1beta1/Room.java     | 40 ++++++---
 .../v1beta1/SearchBlurbsMetadata.java         | 26 ++++--
 .../com/google/showcase/v1beta1/Sequence.java | 40 ++++++---
 .../showcase/v1beta1/SequenceReport.java      | 68 +++++++++-----
 .../showcase/v1beta1/StreamBlurbsRequest.java | 26 ++++--
 .../v1beta1/StreamBlurbsResponse.java         | 26 ++++--
 .../showcase/v1beta1/StreamingSequence.java   | 40 ++++++---
 .../v1beta1/StreamingSequenceReport.java      | 68 +++++++++-----
 .../com/google/showcase/v1beta1/Test.java     | 27 ++++--
 .../com/google/showcase/v1beta1/TestRun.java  | 26 ++++--
 .../showcase/v1beta1/UpdateBlurbRequest.java  | 40 ++++++---
 .../showcase/v1beta1/UpdateRoomRequest.java   | 40 ++++++---
 .../showcase/v1beta1/UpdateUserRequest.java   | 40 ++++++---
 .../com/google/showcase/v1beta1/User.java     | 71 +++++++++------
 .../showcase/v1beta1/VerifyTestRequest.java   | 40 ++++-----
 .../showcase/v1beta1/VerifyTestResponse.java  | 26 ++++--
 .../google/showcase/v1beta1/WaitMetadata.java | 26 ++++--
 .../reflect-config.json                       | 90 +++++++++++++++++++
 .../reflect-config.json                       | 90 +++++++++++++++++++
 .../reflect-config.json                       | 90 +++++++++++++++++++
 .../reflect-config.json                       | 90 +++++++++++++++++++
 .../reflect-config.json                       | 90 +++++++++++++++++++
 .../com.google.iam.v1/reflect-config.json     | 90 +++++++++++++++++++
 .../reflect-config.json                       | 90 +++++++++++++++++++
 .../reflect-config.json                       | 90 +++++++++++++++++++
 .../reflect-config.json                       | 90 +++++++++++++++++++
 .../reflect-config.json                       | 90 +++++++++++++++++++
 .../reflect-config.json                       | 90 +++++++++++++++++++
 .../com.google.storage.v2/reflect-config.json | 90 +++++++++++++++++++
 59 files changed, 1995 insertions(+), 424 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e445322b42..d7de8f331c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -282,7 +282,7 @@ jobs:
       run: |
         mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip
     - name: Validate gapic-generator-java-bom
-      uses: googleapis/java-cloud-bom/tests/validate-bom@v26.13.0
+      uses: googleapis/java-cloud-bom/tests/validate-bom@2414e159ab8f882717ab7f6ae4c4a02c096b94fa
       with:
         bom-path: gapic-generator-java-bom/pom.xml
 
diff --git a/.kokoro/presubmit/downstream-compatibility.sh b/.kokoro/presubmit/downstream-compatibility.sh
index 3098983aef..d496e57208 100755
--- a/.kokoro/presubmit/downstream-compatibility.sh
+++ b/.kokoro/presubmit/downstream-compatibility.sh
@@ -38,9 +38,14 @@ echo "Install complete. java-shared-dependencies = $SHARED_DEPS_VERSION"
 
 pushd java-shared-dependencies/target
 for repo in ${REPOS_UNDER_TEST//,/ }; do # Split on comma
-  # Perform testing on last release, not HEAD
-  last_release=$(find_last_release_version "$repo")
-  git clone "https://github.com/googleapis/$repo.git" --depth=1 --branch "v$last_release"
+  # Perform testing on HEAD for google-cloud-java
+  if [ $repo == "google-cloud-java" ]; then
+    git clone "https://github.com/googleapis/$repo.git" --depth=1
+  else
+    # Perform testing on last release, not HEAD
+    last_release=$(find_last_release_version "$repo")
+    git clone "https://github.com/googleapis/$repo.git" --depth=1 --branch "v$last_release"
+  fi
   update_all_poms_dependency "$repo" google-cloud-shared-dependencies "$SHARED_DEPS_VERSION"
   pushd "$repo"
   JOB_TYPE="test" ./.kokoro/build.sh
diff --git a/api-common-java/pom.xml b/api-common-java/pom.xml
index 5c81e41f2f..77fdd5e423 100644
--- a/api-common-java/pom.xml
+++ b/api-common-java/pom.xml
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>com.google.errorprone</groupId>
             <artifactId>error_prone_annotations</artifactId>
-            <version>2.18.0</version>
+            <version>2.20.0</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml
index ab9b242268..094841be5f 100644
--- a/gapic-generator-java-pom-parent/pom.xml
+++ b/gapic-generator-java-pom-parent/pom.xml
@@ -27,15 +27,12 @@
         consistent across modules in this repository -->
     <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
     <auto-value.version>1.10.2</auto-value.version>
-    <grpc.version>1.56.1</grpc.version>
+    <grpc.version>1.58.0</grpc.version>
     <google.auth.version>1.19.0</google.auth.version>
     <google.http-client.version>1.43.3</google.http-client.version>
     <gson.version>2.10.1</gson.version>
     <guava.version>32.1.2-jre</guava.version>
-    <!--  On next protobuf upgrade (to 3.23.3 or higher),
-    remove temporarily j2objc-annotations exclusions from protobuf-java-util dependencies.
-      For context: https://github.com/googleapis/sdk-platform-java/pull/1791-->
-    <protobuf.version>3.23.2</protobuf.version>
+    <protobuf.version>3.24.0</protobuf.version>
     <maven.compiler.release>8</maven.compiler.release>
   </properties>
 
diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml
index c5d4eca423..ad9e8322fc 100644
--- a/gapic-generator-java/pom.xml
+++ b/gapic-generator-java/pom.xml
@@ -457,7 +457,7 @@
     <dependency>
       <groupId>com.google.errorprone</groupId>
       <artifactId>error_prone_annotations</artifactId>
-      <version>2.18.0</version>
+      <version>2.20.0</version>
     </dependency>
 
     <!--
diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties
index fec01cff3e..7e559c3941 100644
--- a/gax-java/dependencies.properties
+++ b/gax-java/dependencies.properties
@@ -29,9 +29,9 @@ version.gax_httpjson=2.33.1-SNAPSHOT
 # On next protobuf upgrade (to 3.23.3 or higher),
 # remove temporarily j2objc-annotations exclusions from protobuf-java-util dependencies.
 # For context: https://github.com/googleapis/sdk-platform-java/pull/1791
-version.com_google_protobuf=3.23.2
+version.com_google_protobuf=3.24.0
 version.google_java_format=1.15.0
-version.io_grpc=1.56.1
+version.io_grpc=1.58.0
 
 # Maven artifacts.
 # Note, the actual name of each property matters (bazel build scripts depend on it).
@@ -65,7 +65,7 @@ maven.com_google_guava_failureaccess=com.google.guava:failureaccess:1.0.1
 maven.org_apache_commons_commons_lang3=org.apache.commons:commons-lang3:3.12.0
 maven.com_google_android_annotations=com.google.android:annotations:4.1.1.4
 maven.com_google_code_findbugs_jsr305=com.google.code.findbugs:jsr305:3.0.2
-maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_prone_annotations:2.18.0
+maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_prone_annotations:2.20.0
 maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:2.8
 maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.10.2
 maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.10.2
diff --git a/gax-java/gax-grpc/pom.xml b/gax-java/gax-grpc/pom.xml
index af20d6c356..69e17eed32 100644
--- a/gax-java/gax-grpc/pom.xml
+++ b/gax-java/gax-grpc/pom.xml
@@ -39,6 +39,10 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-inprocess</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.threeten</groupId>
       <artifactId>threetenbp</artifactId>
diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml
index 42585cd95d..b3fcf474ed 100644
--- a/java-shared-dependencies/third-party-dependencies/pom.xml
+++ b/java-shared-dependencies/third-party-dependencies/pom.xml
@@ -28,7 +28,7 @@
     <animal-sniffer.version>1.23</animal-sniffer.version>
     <opencensus.version>0.31.1</opencensus.version>
     <findbugs.version>3.0.2</findbugs.version>
-    <errorprone.version>2.18.0</errorprone.version>
+    <errorprone.version>2.20.0</errorprone.version>
     <jackson.version>2.15.2</jackson.version>
     <codec.version>1.15</codec.version>
     <httpcomponents.httpcore.version>4.4.16</httpcomponents.httpcore.version>
diff --git a/java-shared-dependencies/upper-bound-check/pom.xml b/java-shared-dependencies/upper-bound-check/pom.xml
index 6deaa1c36d..cc6794af4a 100644
--- a/java-shared-dependencies/upper-bound-check/pom.xml
+++ b/java-shared-dependencies/upper-bound-check/pom.xml
@@ -144,12 +144,6 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java-util</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.j2objc</groupId>
-          <artifactId>j2objc-annotations</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.api</groupId>
diff --git a/showcase/gapic-showcase/src/main/resources/META-INF/native-image/com.google.showcase.v1beta1/reflect-config.json b/showcase/gapic-showcase/src/main/resources/META-INF/native-image/com.google.showcase.v1beta1/reflect-config.json
index 6f0c5c0265..69f46413ca 100644
--- a/showcase/gapic-showcase/src/main/resources/META-INF/native-image/com.google.showcase.v1beta1/reflect-config.json
+++ b/showcase/gapic-showcase/src/main/resources/META-INF/native-image/com.google.showcase.v1beta1/reflect-config.json
@@ -1079,6 +1079,78 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$FieldPresence",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$JsonFormat",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$MessageEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$RepeatedFieldEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$StringFieldValidation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto",
     "queryAllDeclaredConstructors": true,
@@ -1142,6 +1214,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
     "queryAllDeclaredConstructors": true,
diff --git a/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGrpc.java b/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGrpc.java
index f7369c33f1..ac687ff3e1 100644
--- a/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGrpc.java
+++ b/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGrpc.java
@@ -17,7 +17,7 @@ public final class ComplianceGrpc {
 
   private ComplianceGrpc() {}
 
-  public static final String SERVICE_NAME = "google.showcase.v1beta1.Compliance";
+  public static final java.lang.String SERVICE_NAME = "google.showcase.v1beta1.Compliance";
 
   // Static method descriptors that strictly reflect the proto.
   private static volatile io.grpc.MethodDescriptor<com.google.showcase.v1beta1.RepeatRequest,
@@ -1124,9 +1124,9 @@ private static final class ComplianceFileDescriptorSupplier
   private static final class ComplianceMethodDescriptorSupplier
       extends ComplianceBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
-    private final String methodName;
+    private final java.lang.String methodName;
 
-    ComplianceMethodDescriptorSupplier(String methodName) {
+    ComplianceMethodDescriptorSupplier(java.lang.String methodName) {
       this.methodName = methodName;
     }
 
diff --git a/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoGrpc.java b/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoGrpc.java
index 2084c1ff33..168eafd37e 100644
--- a/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoGrpc.java
+++ b/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoGrpc.java
@@ -21,7 +21,7 @@ public final class EchoGrpc {
 
   private EchoGrpc() {}
 
-  public static final String SERVICE_NAME = "google.showcase.v1beta1.Echo";
+  public static final java.lang.String SERVICE_NAME = "google.showcase.v1beta1.Echo";
 
   // Static method descriptors that strictly reflect the proto.
   private static volatile io.grpc.MethodDescriptor<com.google.showcase.v1beta1.EchoRequest,
@@ -1004,9 +1004,9 @@ private static final class EchoFileDescriptorSupplier
   private static final class EchoMethodDescriptorSupplier
       extends EchoBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
-    private final String methodName;
+    private final java.lang.String methodName;
 
-    EchoMethodDescriptorSupplier(String methodName) {
+    EchoMethodDescriptorSupplier(java.lang.String methodName) {
       this.methodName = methodName;
     }
 
diff --git a/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/IdentityGrpc.java b/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/IdentityGrpc.java
index 32874ee8e3..4d0168e2a5 100644
--- a/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/IdentityGrpc.java
+++ b/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/IdentityGrpc.java
@@ -15,7 +15,7 @@ public final class IdentityGrpc {
 
   private IdentityGrpc() {}
 
-  public static final String SERVICE_NAME = "google.showcase.v1beta1.Identity";
+  public static final java.lang.String SERVICE_NAME = "google.showcase.v1beta1.Identity";
 
   // Static method descriptors that strictly reflect the proto.
   private static volatile io.grpc.MethodDescriptor<com.google.showcase.v1beta1.CreateUserRequest,
@@ -631,9 +631,9 @@ private static final class IdentityFileDescriptorSupplier
   private static final class IdentityMethodDescriptorSupplier
       extends IdentityBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
-    private final String methodName;
+    private final java.lang.String methodName;
 
-    IdentityMethodDescriptorSupplier(String methodName) {
+    IdentityMethodDescriptorSupplier(java.lang.String methodName) {
       this.methodName = methodName;
     }
 
diff --git a/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/MessagingGrpc.java b/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/MessagingGrpc.java
index 3e5c74b8c2..04c1ed6ed8 100644
--- a/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/MessagingGrpc.java
+++ b/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/MessagingGrpc.java
@@ -17,7 +17,7 @@ public final class MessagingGrpc {
 
   private MessagingGrpc() {}
 
-  public static final String SERVICE_NAME = "google.showcase.v1beta1.Messaging";
+  public static final java.lang.String SERVICE_NAME = "google.showcase.v1beta1.Messaging";
 
   // Static method descriptors that strictly reflect the proto.
   private static volatile io.grpc.MethodDescriptor<com.google.showcase.v1beta1.CreateRoomRequest,
@@ -1385,9 +1385,9 @@ private static final class MessagingFileDescriptorSupplier
   private static final class MessagingMethodDescriptorSupplier
       extends MessagingBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
-    private final String methodName;
+    private final java.lang.String methodName;
 
-    MessagingMethodDescriptorSupplier(String methodName) {
+    MessagingMethodDescriptorSupplier(java.lang.String methodName) {
       this.methodName = methodName;
     }
 
diff --git a/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceServiceGrpc.java b/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceServiceGrpc.java
index bc33638347..5512a820dc 100644
--- a/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceServiceGrpc.java
+++ b/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceServiceGrpc.java
@@ -12,7 +12,7 @@ public final class SequenceServiceGrpc {
 
   private SequenceServiceGrpc() {}
 
-  public static final String SERVICE_NAME = "google.showcase.v1beta1.SequenceService";
+  public static final java.lang.String SERVICE_NAME = "google.showcase.v1beta1.SequenceService";
 
   // Static method descriptors that strictly reflect the proto.
   private static volatile io.grpc.MethodDescriptor<com.google.showcase.v1beta1.CreateSequenceRequest,
@@ -688,9 +688,9 @@ private static final class SequenceServiceFileDescriptorSupplier
   private static final class SequenceServiceMethodDescriptorSupplier
       extends SequenceServiceBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
-    private final String methodName;
+    private final java.lang.String methodName;
 
-    SequenceServiceMethodDescriptorSupplier(String methodName) {
+    SequenceServiceMethodDescriptorSupplier(java.lang.String methodName) {
       this.methodName = methodName;
     }
 
diff --git a/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestingGrpc.java b/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestingGrpc.java
index 185eb2868f..890e11e6ec 100644
--- a/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestingGrpc.java
+++ b/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestingGrpc.java
@@ -16,7 +16,7 @@ public final class TestingGrpc {
 
   private TestingGrpc() {}
 
-  public static final String SERVICE_NAME = "google.showcase.v1beta1.Testing";
+  public static final java.lang.String SERVICE_NAME = "google.showcase.v1beta1.Testing";
 
   // Static method descriptors that strictly reflect the proto.
   private static volatile io.grpc.MethodDescriptor<com.google.showcase.v1beta1.CreateSessionRequest,
@@ -920,9 +920,9 @@ private static final class TestingFileDescriptorSupplier
   private static final class TestingMethodDescriptorSupplier
       extends TestingBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
-    private final String methodName;
+    private final java.lang.String methodName;
 
-    TestingMethodDescriptorSupplier(String methodName) {
+    TestingMethodDescriptorSupplier(java.lang.String methodName) {
       this.methodName = methodName;
     }
 
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockRequest.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockRequest.java
index 2fea5ae2d2..a110ca9caa 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockRequest.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockRequest.java
@@ -42,6 +42,7 @@ protected java.lang.Object newInstance(
             com.google.showcase.v1beta1.BlockRequest.class, com.google.showcase.v1beta1.BlockRequest.Builder.class);
   }
 
+  private int bitField0_;
   private int responseCase_ = 0;
   @SuppressWarnings("serial")
   private java.lang.Object response_;
@@ -96,7 +97,7 @@ public int getNumber() {
    */
   @java.lang.Override
   public boolean hasResponseDelay() {
-    return responseDelay_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <pre>
@@ -225,7 +226,7 @@ public final boolean isInitialized() {
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (responseDelay_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getResponseDelay());
     }
     if (responseCase_ == 2) {
@@ -243,7 +244,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (responseDelay_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, getResponseDelay());
     }
@@ -438,13 +439,19 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.BlockRequest.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getResponseDelayFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -497,11 +504,14 @@ public com.google.showcase.v1beta1.BlockRequest buildPartial() {
 
     private void buildPartial0(com.google.showcase.v1beta1.BlockRequest result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.responseDelay_ = responseDelayBuilder_ == null
             ? responseDelay_
             : responseDelayBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     private void buildPartialOneofs(com.google.showcase.v1beta1.BlockRequest result) {
@@ -742,8 +752,10 @@ public Builder mergeResponseDelay(com.google.protobuf.Duration value) {
       } else {
         responseDelayBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (responseDelay_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Blurb.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Blurb.java
index b775dfa7a1..ce3793857f 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Blurb.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Blurb.java
@@ -45,6 +45,7 @@ protected java.lang.Object newInstance(
             com.google.showcase.v1beta1.Blurb.class, com.google.showcase.v1beta1.Blurb.Builder.class);
   }
 
+  private int bitField0_;
   private int contentCase_ = 0;
   @SuppressWarnings("serial")
   private java.lang.Object content_;
@@ -328,7 +329,7 @@ public com.google.protobuf.ByteString getImage() {
    */
   @java.lang.Override
   public boolean hasCreateTime() {
-    return createTime_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <pre>
@@ -366,7 +367,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUpdateTime() {
-    return updateTime_ != null;
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    * <pre>
@@ -559,10 +560,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       output.writeBytes(
           4, (com.google.protobuf.ByteString) content_);
     }
-    if (createTime_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(5, getCreateTime());
     }
-    if (updateTime_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(6, getUpdateTime());
     }
     if (legacyIdCase_ == 7) {
@@ -594,11 +595,11 @@ public int getSerializedSize() {
         .computeBytesSize(
             4, (com.google.protobuf.ByteString) content_);
     }
-    if (createTime_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(5, getCreateTime());
     }
-    if (updateTime_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(6, getUpdateTime());
     }
@@ -834,13 +835,20 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.Blurb.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getCreateTimeFieldBuilder();
+        getUpdateTimeFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -902,16 +910,20 @@ private void buildPartial0(com.google.showcase.v1beta1.Blurb result) {
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.user_ = user_;
       }
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000010) != 0)) {
         result.createTime_ = createTimeBuilder_ == null
             ? createTime_
             : createTimeBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000020) != 0)) {
         result.updateTime_ = updateTimeBuilder_ == null
             ? updateTime_
             : updateTimeBuilder_.build();
+        to_bitField0_ |= 0x00000002;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     private void buildPartialOneofs(com.google.showcase.v1beta1.Blurb result) {
@@ -1578,8 +1590,10 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+      if (createTime_ != null) {
+        bitField0_ |= 0x00000010;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -1733,8 +1747,10 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000020;
-      onChanged();
+      if (updateTime_ != null) {
+        bitField0_ |= 0x00000020;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceData.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceData.java
index c4f9d78caf..fe5243f457 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceData.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceData.java
@@ -421,7 +421,7 @@ public com.google.protobuf.ByteString getFBytes() {
    */
   @java.lang.Override
   public boolean hasFChild() {
-    return fChild_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <code>.google.showcase.v1beta1.ComplianceDataChild f_child = 16;</code>
@@ -448,7 +448,7 @@ public com.google.showcase.v1beta1.ComplianceDataChildOrBuilder getFChildOrBuild
    */
   @java.lang.Override
   public boolean hasPString() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    * <code>optional string p_string = 17;</code>
@@ -494,7 +494,7 @@ public java.lang.String getPString() {
    */
   @java.lang.Override
   public boolean hasPInt32() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return ((bitField0_ & 0x00000004) != 0);
   }
   /**
    * <code>optional int32 p_int32 = 18;</code>
@@ -513,7 +513,7 @@ public int getPInt32() {
    */
   @java.lang.Override
   public boolean hasPDouble() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return ((bitField0_ & 0x00000008) != 0);
   }
   /**
    * <code>optional double p_double = 19;</code>
@@ -532,7 +532,7 @@ public double getPDouble() {
    */
   @java.lang.Override
   public boolean hasPBool() {
-    return ((bitField0_ & 0x00000008) != 0);
+    return ((bitField0_ & 0x00000010) != 0);
   }
   /**
    * <code>optional bool p_bool = 20;</code>
@@ -550,7 +550,7 @@ public boolean getPBool() {
    * @return Whether the pKingdom field is set.
    */
   @java.lang.Override public boolean hasPKingdom() {
-    return ((bitField0_ & 0x00000010) != 0);
+    return ((bitField0_ & 0x00000020) != 0);
   }
   /**
    * <code>optional .google.showcase.v1beta1.ComplianceData.LifeKingdom p_kingdom = 23;</code>
@@ -576,7 +576,7 @@ public boolean getPBool() {
    */
   @java.lang.Override
   public boolean hasPChild() {
-    return ((bitField0_ & 0x00000020) != 0);
+    return ((bitField0_ & 0x00000040) != 0);
   }
   /**
    * <code>optional .google.showcase.v1beta1.ComplianceDataChild p_child = 21;</code>
@@ -653,28 +653,28 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     if (!fBytes_.isEmpty()) {
       output.writeBytes(15, fBytes_);
     }
-    if (fChild_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(16, getFChild());
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 17, pString_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       output.writeInt32(18, pInt32_);
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       output.writeDouble(19, pDouble_);
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (((bitField0_ & 0x00000010) != 0)) {
       output.writeBool(20, pBool_);
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (((bitField0_ & 0x00000040) != 0)) {
       output.writeMessage(21, getPChild());
     }
     if (fKingdom_ != com.google.showcase.v1beta1.ComplianceData.LifeKingdom.LIFE_KINGDOM_UNSPECIFIED.getNumber()) {
       output.writeEnum(22, fKingdom_);
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (((bitField0_ & 0x00000020) != 0)) {
       output.writeEnum(23, pKingdom_);
     }
     getUnknownFields().writeTo(output);
@@ -745,26 +745,26 @@ public int getSerializedSize() {
       size += com.google.protobuf.CodedOutputStream
         .computeBytesSize(15, fBytes_);
     }
-    if (fChild_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(16, getFChild());
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(17, pString_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(18, pInt32_);
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeDoubleSize(19, pDouble_);
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (((bitField0_ & 0x00000010) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(20, pBool_);
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (((bitField0_ & 0x00000040) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(21, getPChild());
     }
@@ -772,7 +772,7 @@ public int getSerializedSize() {
       size += com.google.protobuf.CodedOutputStream
         .computeEnumSize(22, fKingdom_);
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (((bitField0_ & 0x00000020) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeEnumSize(23, pKingdom_);
     }
@@ -1195,37 +1195,38 @@ private void buildPartial0(com.google.showcase.v1beta1.ComplianceData result) {
       if (((from_bitField0_ & 0x00008000) != 0)) {
         result.fKingdom_ = fKingdom_;
       }
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00010000) != 0)) {
         result.fChild_ = fChildBuilder_ == null
             ? fChild_
             : fChildBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
-      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00020000) != 0)) {
         result.pString_ = pString_;
-        to_bitField0_ |= 0x00000001;
+        to_bitField0_ |= 0x00000002;
       }
       if (((from_bitField0_ & 0x00040000) != 0)) {
         result.pInt32_ = pInt32_;
-        to_bitField0_ |= 0x00000002;
+        to_bitField0_ |= 0x00000004;
       }
       if (((from_bitField0_ & 0x00080000) != 0)) {
         result.pDouble_ = pDouble_;
-        to_bitField0_ |= 0x00000004;
+        to_bitField0_ |= 0x00000008;
       }
       if (((from_bitField0_ & 0x00100000) != 0)) {
         result.pBool_ = pBool_;
-        to_bitField0_ |= 0x00000008;
+        to_bitField0_ |= 0x00000010;
       }
       if (((from_bitField0_ & 0x00200000) != 0)) {
         result.pKingdom_ = pKingdom_;
-        to_bitField0_ |= 0x00000010;
+        to_bitField0_ |= 0x00000020;
       }
       if (((from_bitField0_ & 0x00400000) != 0)) {
         result.pChild_ = pChildBuilder_ == null
             ? pChild_
             : pChildBuilder_.build();
-        to_bitField0_ |= 0x00000020;
+        to_bitField0_ |= 0x00000040;
       }
       result.bitField0_ |= to_bitField0_;
     }
@@ -2148,8 +2149,10 @@ public Builder mergeFChild(com.google.showcase.v1beta1.ComplianceDataChild value
       } else {
         fChildBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00010000;
-      onChanged();
+      if (fChild_ != null) {
+        bitField0_ |= 0x00010000;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -2526,8 +2529,10 @@ public Builder mergePChild(com.google.showcase.v1beta1.ComplianceDataChild value
       } else {
         pChildBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00400000;
-      onChanged();
+      if (pChild_ != null) {
+        bitField0_ |= 0x00400000;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataChild.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataChild.java
index c1a4b7d265..ab67a154a5 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataChild.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataChild.java
@@ -141,7 +141,7 @@ public boolean getFBool() {
    */
   @java.lang.Override
   public boolean hasFChild() {
-    return fChild_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <code>.google.showcase.v1beta1.ComplianceDataGrandchild f_child = 5;</code>
@@ -168,7 +168,7 @@ public com.google.showcase.v1beta1.ComplianceDataGrandchildOrBuilder getFChildOr
    */
   @java.lang.Override
   public boolean hasPString() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    * <code>optional string p_string = 6;</code>
@@ -214,7 +214,7 @@ public java.lang.String getPString() {
    */
   @java.lang.Override
   public boolean hasPFloat() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return ((bitField0_ & 0x00000004) != 0);
   }
   /**
    * <code>optional float p_float = 7;</code>
@@ -233,7 +233,7 @@ public float getPFloat() {
    */
   @java.lang.Override
   public boolean hasPDouble() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return ((bitField0_ & 0x00000008) != 0);
   }
   /**
    * <code>optional double p_double = 8;</code>
@@ -252,7 +252,7 @@ public double getPDouble() {
    */
   @java.lang.Override
   public boolean hasPBool() {
-    return ((bitField0_ & 0x00000008) != 0);
+    return ((bitField0_ & 0x00000010) != 0);
   }
   /**
    * <code>optional bool p_bool = 9;</code>
@@ -289,7 +289,7 @@ public boolean getPBool() {
    */
   @java.lang.Override
   public boolean hasPChild() {
-    return ((bitField0_ & 0x00000010) != 0);
+    return ((bitField0_ & 0x00000020) != 0);
   }
   /**
    * <code>optional .google.showcase.v1beta1.ComplianceDataGrandchild p_child = 10;</code>
@@ -333,22 +333,22 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     if (fBool_ != false) {
       output.writeBool(4, fBool_);
     }
-    if (fChild_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(5, getFChild());
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 6, pString_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       output.writeFloat(7, pFloat_);
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       output.writeDouble(8, pDouble_);
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (((bitField0_ & 0x00000010) != 0)) {
       output.writeBool(9, pBool_);
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (((bitField0_ & 0x00000020) != 0)) {
       output.writeMessage(10, getPChild());
     }
     if (fContinent_ != com.google.showcase.v1beta1.Continent.CONTINENT_UNSPECIFIED.getNumber()) {
@@ -381,26 +381,26 @@ public int getSerializedSize() {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(4, fBool_);
     }
-    if (fChild_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(5, getFChild());
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, pString_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeFloatSize(7, pFloat_);
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeDoubleSize(8, pDouble_);
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (((bitField0_ & 0x00000010) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(9, pBool_);
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (((bitField0_ & 0x00000020) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(10, getPChild());
     }
@@ -730,27 +730,28 @@ private void buildPartial0(com.google.showcase.v1beta1.ComplianceDataChild resul
       if (((from_bitField0_ & 0x00000010) != 0)) {
         result.fContinent_ = fContinent_;
       }
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000020) != 0)) {
         result.fChild_ = fChildBuilder_ == null
             ? fChild_
             : fChildBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
-      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000040) != 0)) {
         result.pString_ = pString_;
-        to_bitField0_ |= 0x00000001;
+        to_bitField0_ |= 0x00000002;
       }
       if (((from_bitField0_ & 0x00000080) != 0)) {
         result.pFloat_ = pFloat_;
-        to_bitField0_ |= 0x00000002;
+        to_bitField0_ |= 0x00000004;
       }
       if (((from_bitField0_ & 0x00000100) != 0)) {
         result.pDouble_ = pDouble_;
-        to_bitField0_ |= 0x00000004;
+        to_bitField0_ |= 0x00000008;
       }
       if (((from_bitField0_ & 0x00000200) != 0)) {
         result.pBool_ = pBool_;
-        to_bitField0_ |= 0x00000008;
+        to_bitField0_ |= 0x00000010;
       }
       if (((from_bitField0_ & 0x00000400) != 0)) {
         result.pContinent_ = pContinent_;
@@ -759,7 +760,7 @@ private void buildPartial0(com.google.showcase.v1beta1.ComplianceDataChild resul
         result.pChild_ = pChildBuilder_ == null
             ? pChild_
             : pChildBuilder_.build();
-        to_bitField0_ |= 0x00000010;
+        to_bitField0_ |= 0x00000020;
       }
       result.bitField0_ |= to_bitField0_;
     }
@@ -1242,8 +1243,10 @@ public Builder mergeFChild(com.google.showcase.v1beta1.ComplianceDataGrandchild
       } else {
         fChildBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000020;
-      onChanged();
+      if (fChild_ != null) {
+        bitField0_ |= 0x00000020;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -1613,8 +1616,10 @@ public Builder mergePChild(com.google.showcase.v1beta1.ComplianceDataGrandchild
       } else {
         pChildBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000800;
-      onChanged();
+      if (pChild_ != null) {
+        bitField0_ |= 0x00000800;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateBlurbRequest.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateBlurbRequest.java
index d2a560d851..66f0461b1a 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateBlurbRequest.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateBlurbRequest.java
@@ -44,6 +44,7 @@ protected java.lang.Object newInstance(
             com.google.showcase.v1beta1.CreateBlurbRequest.class, com.google.showcase.v1beta1.CreateBlurbRequest.Builder.class);
   }
 
+  private int bitField0_;
   public static final int PARENT_FIELD_NUMBER = 1;
   @SuppressWarnings("serial")
   private volatile java.lang.Object parent_ = "";
@@ -105,7 +106,7 @@ public java.lang.String getParent() {
    */
   @java.lang.Override
   public boolean hasBlurb() {
-    return blurb_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <pre>
@@ -148,7 +149,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
     }
-    if (blurb_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(2, getBlurb());
     }
     getUnknownFields().writeTo(output);
@@ -163,7 +164,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
     }
-    if (blurb_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(2, getBlurb());
     }
@@ -330,13 +331,19 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.CreateBlurbRequest.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getBlurbFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -384,11 +391,14 @@ private void buildPartial0(com.google.showcase.v1beta1.CreateBlurbRequest result
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.parent_ = parent_;
       }
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.blurb_ = blurbBuilder_ == null
             ? blurb_
             : blurbBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -681,8 +691,10 @@ public Builder mergeBlurb(com.google.showcase.v1beta1.Blurb value) {
       } else {
         blurbBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+      if (blurb_ != null) {
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateRoomRequest.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateRoomRequest.java
index 343787a016..0410e43b24 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateRoomRequest.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateRoomRequest.java
@@ -43,6 +43,7 @@ protected java.lang.Object newInstance(
             com.google.showcase.v1beta1.CreateRoomRequest.class, com.google.showcase.v1beta1.CreateRoomRequest.Builder.class);
   }
 
+  private int bitField0_;
   public static final int ROOM_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.Room room_;
   /**
@@ -55,7 +56,7 @@ protected java.lang.Object newInstance(
    */
   @java.lang.Override
   public boolean hasRoom() {
-    return room_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <pre>
@@ -95,7 +96,7 @@ public final boolean isInitialized() {
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (room_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getRoom());
     }
     getUnknownFields().writeTo(output);
@@ -107,7 +108,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (room_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, getRoom());
     }
@@ -270,13 +271,19 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.CreateRoomRequest.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getRoomFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -320,11 +327,14 @@ public com.google.showcase.v1beta1.CreateRoomRequest buildPartial() {
 
     private void buildPartial0(com.google.showcase.v1beta1.CreateRoomRequest result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.room_ = roomBuilder_ == null
             ? room_
             : roomBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -510,8 +520,10 @@ public Builder mergeRoom(com.google.showcase.v1beta1.Room value) {
       } else {
         roomBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (room_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSequenceRequest.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSequenceRequest.java
index 72f272198e..b5df0c26f7 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSequenceRequest.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSequenceRequest.java
@@ -38,6 +38,7 @@ protected java.lang.Object newInstance(
             com.google.showcase.v1beta1.CreateSequenceRequest.class, com.google.showcase.v1beta1.CreateSequenceRequest.Builder.class);
   }
 
+  private int bitField0_;
   public static final int SEQUENCE_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.Sequence sequence_;
   /**
@@ -46,7 +47,7 @@ protected java.lang.Object newInstance(
    */
   @java.lang.Override
   public boolean hasSequence() {
-    return sequence_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <code>.google.showcase.v1beta1.Sequence sequence = 1;</code>
@@ -78,7 +79,7 @@ public final boolean isInitialized() {
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (sequence_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getSequence());
     }
     getUnknownFields().writeTo(output);
@@ -90,7 +91,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (sequence_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, getSequence());
     }
@@ -248,13 +249,19 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.CreateSequenceRequest.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getSequenceFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -298,11 +305,14 @@ public com.google.showcase.v1beta1.CreateSequenceRequest buildPartial() {
 
     private void buildPartial0(com.google.showcase.v1beta1.CreateSequenceRequest result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.sequence_ = sequenceBuilder_ == null
             ? sequence_
             : sequenceBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -468,8 +478,10 @@ public Builder mergeSequence(com.google.showcase.v1beta1.Sequence value) {
       } else {
         sequenceBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (sequence_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSessionRequest.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSessionRequest.java
index 825c59d111..6788e2332f 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSessionRequest.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSessionRequest.java
@@ -42,6 +42,7 @@ protected java.lang.Object newInstance(
             com.google.showcase.v1beta1.CreateSessionRequest.class, com.google.showcase.v1beta1.CreateSessionRequest.Builder.class);
   }
 
+  private int bitField0_;
   public static final int SESSION_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.Session session_;
   /**
@@ -56,7 +57,7 @@ protected java.lang.Object newInstance(
    */
   @java.lang.Override
   public boolean hasSession() {
-    return session_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <pre>
@@ -100,7 +101,7 @@ public final boolean isInitialized() {
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (session_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getSession());
     }
     getUnknownFields().writeTo(output);
@@ -112,7 +113,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (session_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, getSession());
     }
@@ -274,13 +275,19 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.CreateSessionRequest.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getSessionFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -324,11 +331,14 @@ public com.google.showcase.v1beta1.CreateSessionRequest buildPartial() {
 
     private void buildPartial0(com.google.showcase.v1beta1.CreateSessionRequest result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.session_ = sessionBuilder_ == null
             ? session_
             : sessionBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -524,8 +534,10 @@ public Builder mergeSession(com.google.showcase.v1beta1.Session value) {
       } else {
         sessionBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (session_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateStreamingSequenceRequest.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateStreamingSequenceRequest.java
index a618d2e264..4160f59067 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateStreamingSequenceRequest.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateStreamingSequenceRequest.java
@@ -38,6 +38,7 @@ protected java.lang.Object newInstance(
             com.google.showcase.v1beta1.CreateStreamingSequenceRequest.class, com.google.showcase.v1beta1.CreateStreamingSequenceRequest.Builder.class);
   }
 
+  private int bitField0_;
   public static final int STREAMING_SEQUENCE_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.StreamingSequence streamingSequence_;
   /**
@@ -46,7 +47,7 @@ protected java.lang.Object newInstance(
    */
   @java.lang.Override
   public boolean hasStreamingSequence() {
-    return streamingSequence_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <code>.google.showcase.v1beta1.StreamingSequence streaming_sequence = 1;</code>
@@ -78,7 +79,7 @@ public final boolean isInitialized() {
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (streamingSequence_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getStreamingSequence());
     }
     getUnknownFields().writeTo(output);
@@ -90,7 +91,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (streamingSequence_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, getStreamingSequence());
     }
@@ -248,13 +249,19 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.CreateStreamingSequenceRequest.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getStreamingSequenceFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -298,11 +305,14 @@ public com.google.showcase.v1beta1.CreateStreamingSequenceRequest buildPartial()
 
     private void buildPartial0(com.google.showcase.v1beta1.CreateStreamingSequenceRequest result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.streamingSequence_ = streamingSequenceBuilder_ == null
             ? streamingSequence_
             : streamingSequenceBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -468,8 +478,10 @@ public Builder mergeStreamingSequence(com.google.showcase.v1beta1.StreamingSeque
       } else {
         streamingSequenceBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (streamingSequence_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateUserRequest.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateUserRequest.java
index 8fa50ea709..e4c7d7d7c0 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateUserRequest.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateUserRequest.java
@@ -43,6 +43,7 @@ protected java.lang.Object newInstance(
             com.google.showcase.v1beta1.CreateUserRequest.class, com.google.showcase.v1beta1.CreateUserRequest.Builder.class);
   }
 
+  private int bitField0_;
   public static final int USER_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.User user_;
   /**
@@ -55,7 +56,7 @@ protected java.lang.Object newInstance(
    */
   @java.lang.Override
   public boolean hasUser() {
-    return user_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <pre>
@@ -95,7 +96,7 @@ public final boolean isInitialized() {
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (user_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getUser());
     }
     getUnknownFields().writeTo(output);
@@ -107,7 +108,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (user_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, getUser());
     }
@@ -270,13 +271,19 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.CreateUserRequest.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getUserFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -320,11 +327,14 @@ public com.google.showcase.v1beta1.CreateUserRequest buildPartial() {
 
     private void buildPartial0(com.google.showcase.v1beta1.CreateUserRequest result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.user_ = userBuilder_ == null
             ? user_
             : userBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -510,8 +520,10 @@ public Builder mergeUser(com.google.showcase.v1beta1.User value) {
       } else {
         userBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (user_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumResponse.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumResponse.java
index ce06086a88..1ec6c25cf7 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumResponse.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumResponse.java
@@ -39,6 +39,7 @@ protected java.lang.Object newInstance(
             com.google.showcase.v1beta1.EnumResponse.class, com.google.showcase.v1beta1.EnumResponse.Builder.class);
   }
 
+  private int bitField0_;
   public static final int REQUEST_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.EnumRequest request_;
   /**
@@ -51,7 +52,7 @@ protected java.lang.Object newInstance(
    */
   @java.lang.Override
   public boolean hasRequest() {
-    return request_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <pre>
@@ -117,7 +118,7 @@ public final boolean isInitialized() {
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (request_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getRequest());
     }
     if (continent_ != com.google.showcase.v1beta1.Continent.CONTINENT_UNSPECIFIED.getNumber()) {
@@ -132,7 +133,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (request_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, getRequest());
     }
@@ -297,13 +298,19 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.EnumResponse.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getRequestFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -348,14 +355,17 @@ public com.google.showcase.v1beta1.EnumResponse buildPartial() {
 
     private void buildPartial0(com.google.showcase.v1beta1.EnumResponse result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.request_ = requestBuilder_ == null
             ? request_
             : requestBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.continent_ = continent_;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -549,8 +559,10 @@ public Builder mergeRequest(com.google.showcase.v1beta1.EnumRequest value) {
       } else {
         requestBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (request_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ExpandRequest.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ExpandRequest.java
index ea941ff518..2520630d04 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ExpandRequest.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ExpandRequest.java
@@ -43,6 +43,7 @@ protected java.lang.Object newInstance(
             com.google.showcase.v1beta1.ExpandRequest.class, com.google.showcase.v1beta1.ExpandRequest.Builder.class);
   }
 
+  private int bitField0_;
   public static final int CONTENT_FIELD_NUMBER = 1;
   @SuppressWarnings("serial")
   private volatile java.lang.Object content_ = "";
@@ -102,7 +103,7 @@ public java.lang.String getContent() {
    */
   @java.lang.Override
   public boolean hasError() {
-    return error_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <pre>
@@ -140,7 +141,7 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
    */
   @java.lang.Override
   public boolean hasStreamWaitTime() {
-    return streamWaitTime_ != null;
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    * <pre>
@@ -183,10 +184,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(content_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, content_);
     }
-    if (error_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(2, getError());
     }
-    if (streamWaitTime_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(3, getStreamWaitTime());
     }
     getUnknownFields().writeTo(output);
@@ -201,11 +202,11 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(content_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, content_);
     }
-    if (error_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(2, getError());
     }
-    if (streamWaitTime_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(3, getStreamWaitTime());
     }
@@ -380,13 +381,20 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.ExpandRequest.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getErrorFieldBuilder();
+        getStreamWaitTimeFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -439,16 +447,20 @@ private void buildPartial0(com.google.showcase.v1beta1.ExpandRequest result) {
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.content_ = content_;
       }
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.error_ = errorBuilder_ == null
             ? error_
             : errorBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.streamWaitTime_ = streamWaitTimeBuilder_ == null
             ? streamWaitTime_
             : streamWaitTimeBuilder_.build();
+        to_bitField0_ |= 0x00000002;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -746,8 +758,10 @@ public Builder mergeError(com.google.rpc.Status value) {
       } else {
         errorBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+      if (error_ != null) {
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -901,8 +915,10 @@ public Builder mergeStreamWaitTime(com.google.protobuf.Duration value) {
       } else {
         streamWaitTimeBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+      if (streamWaitTime_ != null) {
+        bitField0_ |= 0x00000004;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatRequest.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatRequest.java
index 2a5d971dcb..dc37f3e643 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatRequest.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatRequest.java
@@ -88,7 +88,7 @@ public java.lang.String getName() {
    */
   @java.lang.Override
   public boolean hasInfo() {
-    return info_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <code>.google.showcase.v1beta1.ComplianceData info = 2;</code>
@@ -135,7 +135,7 @@ public boolean getServerVerify() {
    */
   @java.lang.Override
   public boolean hasIntendedBindingUri() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    * <pre>
@@ -227,7 +227,7 @@ public double getFDouble() {
    */
   @java.lang.Override
   public boolean hasPInt32() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return ((bitField0_ & 0x00000004) != 0);
   }
   /**
    * <code>optional int32 p_int32 = 7;</code>
@@ -246,7 +246,7 @@ public int getPInt32() {
    */
   @java.lang.Override
   public boolean hasPInt64() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return ((bitField0_ & 0x00000008) != 0);
   }
   /**
    * <code>optional int64 p_int64 = 8;</code>
@@ -265,7 +265,7 @@ public long getPInt64() {
    */
   @java.lang.Override
   public boolean hasPDouble() {
-    return ((bitField0_ & 0x00000008) != 0);
+    return ((bitField0_ & 0x00000010) != 0);
   }
   /**
    * <code>optional double p_double = 9;</code>
@@ -293,7 +293,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    if (info_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(2, getInfo());
     }
     if (serverVerify_ != false) {
@@ -308,16 +308,16 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     if (java.lang.Double.doubleToRawLongBits(fDouble_) != 0) {
       output.writeDouble(6, fDouble_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       output.writeInt32(7, pInt32_);
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       output.writeInt64(8, pInt64_);
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (((bitField0_ & 0x00000010) != 0)) {
       output.writeDouble(9, pDouble_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 10, intendedBindingUri_);
     }
     getUnknownFields().writeTo(output);
@@ -332,7 +332,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    if (info_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(2, getInfo());
     }
@@ -352,19 +352,19 @@ public int getSerializedSize() {
       size += com.google.protobuf.CodedOutputStream
         .computeDoubleSize(6, fDouble_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(7, pInt32_);
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(8, pInt64_);
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (((bitField0_ & 0x00000010) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeDoubleSize(9, pDouble_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, intendedBindingUri_);
     }
     size += getUnknownFields().getSerializedSize();
@@ -584,13 +584,19 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.RepeatRequest.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getInfoFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -646,18 +652,19 @@ private void buildPartial0(com.google.showcase.v1beta1.RepeatRequest result) {
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.name_ = name_;
       }
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.info_ = infoBuilder_ == null
             ? info_
             : infoBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.serverVerify_ = serverVerify_;
       }
-      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000008) != 0)) {
         result.intendedBindingUri_ = intendedBindingUri_;
-        to_bitField0_ |= 0x00000001;
+        to_bitField0_ |= 0x00000002;
       }
       if (((from_bitField0_ & 0x00000010) != 0)) {
         result.fInt32_ = fInt32_;
@@ -670,15 +677,15 @@ private void buildPartial0(com.google.showcase.v1beta1.RepeatRequest result) {
       }
       if (((from_bitField0_ & 0x00000080) != 0)) {
         result.pInt32_ = pInt32_;
-        to_bitField0_ |= 0x00000002;
+        to_bitField0_ |= 0x00000004;
       }
       if (((from_bitField0_ & 0x00000100) != 0)) {
         result.pInt64_ = pInt64_;
-        to_bitField0_ |= 0x00000004;
+        to_bitField0_ |= 0x00000008;
       }
       if (((from_bitField0_ & 0x00000200) != 0)) {
         result.pDouble_ = pDouble_;
-        to_bitField0_ |= 0x00000008;
+        to_bitField0_ |= 0x00000010;
       }
       result.bitField0_ |= to_bitField0_;
     }
@@ -994,8 +1001,10 @@ public Builder mergeInfo(com.google.showcase.v1beta1.ComplianceData value) {
       } else {
         infoBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+      if (info_ != null) {
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatResponse.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatResponse.java
index 228003f482..54192c00a6 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatResponse.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatResponse.java
@@ -39,6 +39,7 @@ protected java.lang.Object newInstance(
             com.google.showcase.v1beta1.RepeatResponse.class, com.google.showcase.v1beta1.RepeatResponse.Builder.class);
   }
 
+  private int bitField0_;
   public static final int REQUEST_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.RepeatRequest request_;
   /**
@@ -47,7 +48,7 @@ protected java.lang.Object newInstance(
    */
   @java.lang.Override
   public boolean hasRequest() {
-    return request_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <code>.google.showcase.v1beta1.RepeatRequest request = 1;</code>
@@ -126,7 +127,7 @@ public final boolean isInitialized() {
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (request_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getRequest());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(bindingUri_)) {
@@ -141,7 +142,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (request_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, getRequest());
     }
@@ -306,13 +307,19 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.RepeatResponse.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getRequestFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -357,14 +364,17 @@ public com.google.showcase.v1beta1.RepeatResponse buildPartial() {
 
     private void buildPartial0(com.google.showcase.v1beta1.RepeatResponse result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.request_ = requestBuilder_ == null
             ? request_
             : requestBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.bindingUri_ = bindingUri_;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -540,8 +550,10 @@ public Builder mergeRequest(com.google.showcase.v1beta1.RepeatRequest value) {
       } else {
         requestBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (request_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Room.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Room.java
index 43388cf6a7..a59f47ef64 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Room.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Room.java
@@ -45,6 +45,7 @@ protected java.lang.Object newInstance(
             com.google.showcase.v1beta1.Room.class, com.google.showcase.v1beta1.Room.Builder.class);
   }
 
+  private int bitField0_;
   public static final int NAME_FIELD_NUMBER = 1;
   @SuppressWarnings("serial")
   private volatile java.lang.Object name_ = "";
@@ -198,7 +199,7 @@ public java.lang.String getDescription() {
    */
   @java.lang.Override
   public boolean hasCreateTime() {
-    return createTime_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <pre>
@@ -236,7 +237,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUpdateTime() {
-    return updateTime_ != null;
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    * <pre>
@@ -285,10 +286,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, description_);
     }
-    if (createTime_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(4, getCreateTime());
     }
-    if (updateTime_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(5, getUpdateTime());
     }
     getUnknownFields().writeTo(output);
@@ -309,11 +310,11 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, description_);
     }
-    if (createTime_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(4, getCreateTime());
     }
-    if (updateTime_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(5, getUpdateTime());
     }
@@ -496,13 +497,20 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.Room.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getCreateTimeFieldBuilder();
+        getUpdateTimeFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -563,16 +571,20 @@ private void buildPartial0(com.google.showcase.v1beta1.Room result) {
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.description_ = description_;
       }
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000008) != 0)) {
         result.createTime_ = createTimeBuilder_ == null
             ? createTime_
             : createTimeBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000010) != 0)) {
         result.updateTime_ = updateTimeBuilder_ == null
             ? updateTime_
             : updateTimeBuilder_.build();
+        to_bitField0_ |= 0x00000002;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -1074,8 +1086,10 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+      if (createTime_ != null) {
+        bitField0_ |= 0x00000008;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -1229,8 +1243,10 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+      if (updateTime_ != null) {
+        bitField0_ |= 0x00000010;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsMetadata.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsMetadata.java
index c86dbeb922..ddb8940217 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsMetadata.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsMetadata.java
@@ -43,6 +43,7 @@ protected java.lang.Object newInstance(
             com.google.showcase.v1beta1.SearchBlurbsMetadata.class, com.google.showcase.v1beta1.SearchBlurbsMetadata.Builder.class);
   }
 
+  private int bitField0_;
   public static final int RETRY_INFO_FIELD_NUMBER = 1;
   private com.google.rpc.RetryInfo retryInfo_;
   /**
@@ -55,7 +56,7 @@ protected java.lang.Object newInstance(
    */
   @java.lang.Override
   public boolean hasRetryInfo() {
-    return retryInfo_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <pre>
@@ -95,7 +96,7 @@ public final boolean isInitialized() {
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (retryInfo_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getRetryInfo());
     }
     getUnknownFields().writeTo(output);
@@ -107,7 +108,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (retryInfo_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, getRetryInfo());
     }
@@ -270,13 +271,19 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.SearchBlurbsMetadata.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getRetryInfoFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -320,11 +327,14 @@ public com.google.showcase.v1beta1.SearchBlurbsMetadata buildPartial() {
 
     private void buildPartial0(com.google.showcase.v1beta1.SearchBlurbsMetadata result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.retryInfo_ = retryInfoBuilder_ == null
             ? retryInfo_
             : retryInfoBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -510,8 +520,10 @@ public Builder mergeRetryInfo(com.google.rpc.RetryInfo value) {
       } else {
         retryInfoBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (retryInfo_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Sequence.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Sequence.java
index 29245079fe..8d5d96490b 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Sequence.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Sequence.java
@@ -137,6 +137,7 @@ protected java.lang.Object newInstance(
               com.google.showcase.v1beta1.Sequence.Response.class, com.google.showcase.v1beta1.Sequence.Response.Builder.class);
     }
 
+    private int bitField0_;
     public static final int STATUS_FIELD_NUMBER = 1;
     private com.google.rpc.Status status_;
     /**
@@ -149,7 +150,7 @@ protected java.lang.Object newInstance(
      */
     @java.lang.Override
     public boolean hasStatus() {
-      return status_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      * <pre>
@@ -187,7 +188,7 @@ public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
      */
     @java.lang.Override
     public boolean hasDelay() {
-      return delay_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      * <pre>
@@ -227,10 +228,10 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (status_ != null) {
+      if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getStatus());
       }
-      if (delay_ != null) {
+      if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getDelay());
       }
       getUnknownFields().writeTo(output);
@@ -242,11 +243,11 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (status_ != null) {
+      if (((bitField0_ & 0x00000001) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(1, getStatus());
       }
-      if (delay_ != null) {
+      if (((bitField0_ & 0x00000002) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(2, getDelay());
       }
@@ -417,13 +418,20 @@ public static final class Builder extends
 
       // Construct using com.google.showcase.v1beta1.Sequence.Response.newBuilder()
       private Builder() {
-
+        maybeForceBuilderInitialization();
       }
 
       private Builder(
           com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getStatusFieldBuilder();
+          getDelayFieldBuilder();
+        }
       }
       @java.lang.Override
       public Builder clear() {
@@ -472,16 +480,20 @@ public com.google.showcase.v1beta1.Sequence.Response buildPartial() {
 
       private void buildPartial0(com.google.showcase.v1beta1.Sequence.Response result) {
         int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.status_ = statusBuilder_ == null
               ? status_
               : statusBuilder_.build();
+          to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.delay_ = delayBuilder_ == null
               ? delay_
               : delayBuilder_.build();
+          to_bitField0_ |= 0x00000002;
         }
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -677,8 +689,10 @@ public Builder mergeStatus(com.google.rpc.Status value) {
         } else {
           statusBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
-        onChanged();
+        if (status_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
@@ -832,8 +846,10 @@ public Builder mergeDelay(com.google.protobuf.Duration value) {
         } else {
           delayBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+        if (delay_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceReport.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceReport.java
index 1aeb9d403f..05540add4d 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceReport.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceReport.java
@@ -207,6 +207,7 @@ protected java.lang.Object newInstance(
               com.google.showcase.v1beta1.SequenceReport.Attempt.class, com.google.showcase.v1beta1.SequenceReport.Attempt.Builder.class);
     }
 
+    private int bitField0_;
     public static final int ATTEMPT_NUMBER_FIELD_NUMBER = 1;
     private int attemptNumber_ = 0;
     /**
@@ -234,7 +235,7 @@ public int getAttemptNumber() {
      */
     @java.lang.Override
     public boolean hasAttemptDeadline() {
-      return attemptDeadline_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      * <pre>
@@ -273,7 +274,7 @@ public com.google.protobuf.TimestampOrBuilder getAttemptDeadlineOrBuilder() {
      */
     @java.lang.Override
     public boolean hasResponseTime() {
-      return responseTime_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      * <pre>
@@ -314,7 +315,7 @@ public com.google.protobuf.TimestampOrBuilder getResponseTimeOrBuilder() {
      */
     @java.lang.Override
     public boolean hasAttemptDelay() {
-      return attemptDelay_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      * <pre>
@@ -354,7 +355,7 @@ public com.google.protobuf.DurationOrBuilder getAttemptDelayOrBuilder() {
      */
     @java.lang.Override
     public boolean hasStatus() {
-      return status_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      * <pre>
@@ -397,16 +398,16 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (attemptNumber_ != 0) {
         output.writeInt32(1, attemptNumber_);
       }
-      if (attemptDeadline_ != null) {
+      if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(2, getAttemptDeadline());
       }
-      if (responseTime_ != null) {
+      if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(3, getResponseTime());
       }
-      if (attemptDelay_ != null) {
+      if (((bitField0_ & 0x00000004) != 0)) {
         output.writeMessage(4, getAttemptDelay());
       }
-      if (status_ != null) {
+      if (((bitField0_ & 0x00000008) != 0)) {
         output.writeMessage(5, getStatus());
       }
       getUnknownFields().writeTo(output);
@@ -422,19 +423,19 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(1, attemptNumber_);
       }
-      if (attemptDeadline_ != null) {
+      if (((bitField0_ & 0x00000001) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(2, getAttemptDeadline());
       }
-      if (responseTime_ != null) {
+      if (((bitField0_ & 0x00000002) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, getResponseTime());
       }
-      if (attemptDelay_ != null) {
+      if (((bitField0_ & 0x00000004) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(4, getAttemptDelay());
       }
-      if (status_ != null) {
+      if (((bitField0_ & 0x00000008) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(5, getStatus());
       }
@@ -627,13 +628,22 @@ public static final class Builder extends
 
       // Construct using com.google.showcase.v1beta1.SequenceReport.Attempt.newBuilder()
       private Builder() {
-
+        maybeForceBuilderInitialization();
       }
 
       private Builder(
           com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getAttemptDeadlineFieldBuilder();
+          getResponseTimeFieldBuilder();
+          getAttemptDelayFieldBuilder();
+          getStatusFieldBuilder();
+        }
       }
       @java.lang.Override
       public Builder clear() {
@@ -696,26 +706,32 @@ private void buildPartial0(com.google.showcase.v1beta1.SequenceReport.Attempt re
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.attemptNumber_ = attemptNumber_;
         }
+        int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.attemptDeadline_ = attemptDeadlineBuilder_ == null
               ? attemptDeadline_
               : attemptDeadlineBuilder_.build();
+          to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.responseTime_ = responseTimeBuilder_ == null
               ? responseTime_
               : responseTimeBuilder_.build();
+          to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000008) != 0)) {
           result.attemptDelay_ = attemptDelayBuilder_ == null
               ? attemptDelay_
               : attemptDelayBuilder_.build();
+          to_bitField0_ |= 0x00000004;
         }
         if (((from_bitField0_ & 0x00000010) != 0)) {
           result.status_ = statusBuilder_ == null
               ? status_
               : statusBuilder_.build();
+          to_bitField0_ |= 0x00000008;
         }
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -983,8 +999,10 @@ public Builder mergeAttemptDeadline(com.google.protobuf.Timestamp value) {
         } else {
           attemptDeadlineBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+        if (attemptDeadline_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
@@ -1143,8 +1161,10 @@ public Builder mergeResponseTime(com.google.protobuf.Timestamp value) {
         } else {
           responseTimeBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000004;
-        onChanged();
+        if (responseTime_ != null) {
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
         return this;
       }
       /**
@@ -1307,8 +1327,10 @@ public Builder mergeAttemptDelay(com.google.protobuf.Duration value) {
         } else {
           attemptDelayBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000008;
-        onChanged();
+        if (attemptDelay_ != null) {
+          bitField0_ |= 0x00000008;
+          onChanged();
+        }
         return this;
       }
       /**
@@ -1466,8 +1488,10 @@ public Builder mergeStatus(com.google.rpc.Status value) {
         } else {
           statusBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000010;
-        onChanged();
+        if (status_ != null) {
+          bitField0_ |= 0x00000010;
+          onChanged();
+        }
         return this;
       }
       /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsRequest.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsRequest.java
index 7bc237e8fa..cd60f7b32f 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsRequest.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsRequest.java
@@ -44,6 +44,7 @@ protected java.lang.Object newInstance(
             com.google.showcase.v1beta1.StreamBlurbsRequest.class, com.google.showcase.v1beta1.StreamBlurbsRequest.Builder.class);
   }
 
+  private int bitField0_;
   public static final int NAME_FIELD_NUMBER = 1;
   @SuppressWarnings("serial")
   private volatile java.lang.Object name_ = "";
@@ -103,7 +104,7 @@ public java.lang.String getName() {
    */
   @java.lang.Override
   public boolean hasExpireTime() {
-    return expireTime_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <pre>
@@ -146,7 +147,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    if (expireTime_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(2, getExpireTime());
     }
     getUnknownFields().writeTo(output);
@@ -161,7 +162,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    if (expireTime_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(2, getExpireTime());
     }
@@ -328,13 +329,19 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.StreamBlurbsRequest.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getExpireTimeFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -382,11 +389,14 @@ private void buildPartial0(com.google.showcase.v1beta1.StreamBlurbsRequest resul
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.name_ = name_;
       }
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.expireTime_ = expireTimeBuilder_ == null
             ? expireTime_
             : expireTimeBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -674,8 +684,10 @@ public Builder mergeExpireTime(com.google.protobuf.Timestamp value) {
       } else {
         expireTimeBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+      if (expireTime_ != null) {
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsResponse.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsResponse.java
index 9246127242..5f141d3684 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsResponse.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsResponse.java
@@ -198,6 +198,7 @@ private Action(int value) {
     // @@protoc_insertion_point(enum_scope:google.showcase.v1beta1.StreamBlurbsResponse.Action)
   }
 
+  private int bitField0_;
   public static final int BLURB_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.Blurb blurb_;
   /**
@@ -210,7 +211,7 @@ private Action(int value) {
    */
   @java.lang.Override
   public boolean hasBlurb() {
-    return blurb_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <pre>
@@ -276,7 +277,7 @@ public final boolean isInitialized() {
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (blurb_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getBlurb());
     }
     if (action_ != com.google.showcase.v1beta1.StreamBlurbsResponse.Action.ACTION_UNSPECIFIED.getNumber()) {
@@ -291,7 +292,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (blurb_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, getBlurb());
     }
@@ -461,13 +462,19 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.StreamBlurbsResponse.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getBlurbFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -512,14 +519,17 @@ public com.google.showcase.v1beta1.StreamBlurbsResponse buildPartial() {
 
     private void buildPartial0(com.google.showcase.v1beta1.StreamBlurbsResponse result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.blurb_ = blurbBuilder_ == null
             ? blurb_
             : blurbBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.action_ = action_;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -713,8 +723,10 @@ public Builder mergeBlurb(com.google.showcase.v1beta1.Blurb value) {
       } else {
         blurbBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (blurb_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequence.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequence.java
index 78e297002a..c71ac5f925 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequence.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequence.java
@@ -148,6 +148,7 @@ protected java.lang.Object newInstance(
               com.google.showcase.v1beta1.StreamingSequence.Response.class, com.google.showcase.v1beta1.StreamingSequence.Response.Builder.class);
     }
 
+    private int bitField0_;
     public static final int STATUS_FIELD_NUMBER = 1;
     private com.google.rpc.Status status_;
     /**
@@ -160,7 +161,7 @@ protected java.lang.Object newInstance(
      */
     @java.lang.Override
     public boolean hasStatus() {
-      return status_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      * <pre>
@@ -198,7 +199,7 @@ public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
      */
     @java.lang.Override
     public boolean hasDelay() {
-      return delay_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      * <pre>
@@ -253,10 +254,10 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (status_ != null) {
+      if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getStatus());
       }
-      if (delay_ != null) {
+      if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getDelay());
       }
       if (responseIndex_ != 0) {
@@ -271,11 +272,11 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (status_ != null) {
+      if (((bitField0_ & 0x00000001) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(1, getStatus());
       }
-      if (delay_ != null) {
+      if (((bitField0_ & 0x00000002) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(2, getDelay());
       }
@@ -454,13 +455,20 @@ public static final class Builder extends
 
       // Construct using com.google.showcase.v1beta1.StreamingSequence.Response.newBuilder()
       private Builder() {
-
+        maybeForceBuilderInitialization();
       }
 
       private Builder(
           com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getStatusFieldBuilder();
+          getDelayFieldBuilder();
+        }
       }
       @java.lang.Override
       public Builder clear() {
@@ -510,19 +518,23 @@ public com.google.showcase.v1beta1.StreamingSequence.Response buildPartial() {
 
       private void buildPartial0(com.google.showcase.v1beta1.StreamingSequence.Response result) {
         int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.status_ = statusBuilder_ == null
               ? status_
               : statusBuilder_.build();
+          to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.delay_ = delayBuilder_ == null
               ? delay_
               : delayBuilder_.build();
+          to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.responseIndex_ = responseIndex_;
         }
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -726,8 +738,10 @@ public Builder mergeStatus(com.google.rpc.Status value) {
         } else {
           statusBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
-        onChanged();
+        if (status_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
@@ -881,8 +895,10 @@ public Builder mergeDelay(com.google.protobuf.Duration value) {
         } else {
           delayBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+        if (delay_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReport.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReport.java
index 011be18358..3614f4806b 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReport.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReport.java
@@ -220,6 +220,7 @@ protected java.lang.Object newInstance(
               com.google.showcase.v1beta1.StreamingSequenceReport.Attempt.class, com.google.showcase.v1beta1.StreamingSequenceReport.Attempt.Builder.class);
     }
 
+    private int bitField0_;
     public static final int ATTEMPT_NUMBER_FIELD_NUMBER = 1;
     private int attemptNumber_ = 0;
     /**
@@ -247,7 +248,7 @@ public int getAttemptNumber() {
      */
     @java.lang.Override
     public boolean hasAttemptDeadline() {
-      return attemptDeadline_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      * <pre>
@@ -286,7 +287,7 @@ public com.google.protobuf.TimestampOrBuilder getAttemptDeadlineOrBuilder() {
      */
     @java.lang.Override
     public boolean hasResponseTime() {
-      return responseTime_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      * <pre>
@@ -327,7 +328,7 @@ public com.google.protobuf.TimestampOrBuilder getResponseTimeOrBuilder() {
      */
     @java.lang.Override
     public boolean hasAttemptDelay() {
-      return attemptDelay_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      * <pre>
@@ -367,7 +368,7 @@ public com.google.protobuf.DurationOrBuilder getAttemptDelayOrBuilder() {
      */
     @java.lang.Override
     public boolean hasStatus() {
-      return status_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      * <pre>
@@ -449,16 +450,16 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (attemptNumber_ != 0) {
         output.writeInt32(1, attemptNumber_);
       }
-      if (attemptDeadline_ != null) {
+      if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(2, getAttemptDeadline());
       }
-      if (responseTime_ != null) {
+      if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(3, getResponseTime());
       }
-      if (attemptDelay_ != null) {
+      if (((bitField0_ & 0x00000004) != 0)) {
         output.writeMessage(4, getAttemptDelay());
       }
-      if (status_ != null) {
+      if (((bitField0_ & 0x00000008) != 0)) {
         output.writeMessage(5, getStatus());
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(contentSent_)) {
@@ -477,19 +478,19 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(1, attemptNumber_);
       }
-      if (attemptDeadline_ != null) {
+      if (((bitField0_ & 0x00000001) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(2, getAttemptDeadline());
       }
-      if (responseTime_ != null) {
+      if (((bitField0_ & 0x00000002) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, getResponseTime());
       }
-      if (attemptDelay_ != null) {
+      if (((bitField0_ & 0x00000004) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(4, getAttemptDelay());
       }
-      if (status_ != null) {
+      if (((bitField0_ & 0x00000008) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(5, getStatus());
       }
@@ -689,13 +690,22 @@ public static final class Builder extends
 
       // Construct using com.google.showcase.v1beta1.StreamingSequenceReport.Attempt.newBuilder()
       private Builder() {
-
+        maybeForceBuilderInitialization();
       }
 
       private Builder(
           com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getAttemptDeadlineFieldBuilder();
+          getResponseTimeFieldBuilder();
+          getAttemptDelayFieldBuilder();
+          getStatusFieldBuilder();
+        }
       }
       @java.lang.Override
       public Builder clear() {
@@ -759,29 +769,35 @@ private void buildPartial0(com.google.showcase.v1beta1.StreamingSequenceReport.A
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.attemptNumber_ = attemptNumber_;
         }
+        int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.attemptDeadline_ = attemptDeadlineBuilder_ == null
               ? attemptDeadline_
               : attemptDeadlineBuilder_.build();
+          to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.responseTime_ = responseTimeBuilder_ == null
               ? responseTime_
               : responseTimeBuilder_.build();
+          to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000008) != 0)) {
           result.attemptDelay_ = attemptDelayBuilder_ == null
               ? attemptDelay_
               : attemptDelayBuilder_.build();
+          to_bitField0_ |= 0x00000004;
         }
         if (((from_bitField0_ & 0x00000010) != 0)) {
           result.status_ = statusBuilder_ == null
               ? status_
               : statusBuilder_.build();
+          to_bitField0_ |= 0x00000008;
         }
         if (((from_bitField0_ & 0x00000020) != 0)) {
           result.contentSent_ = contentSent_;
         }
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -1059,8 +1075,10 @@ public Builder mergeAttemptDeadline(com.google.protobuf.Timestamp value) {
         } else {
           attemptDeadlineBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+        if (attemptDeadline_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
@@ -1219,8 +1237,10 @@ public Builder mergeResponseTime(com.google.protobuf.Timestamp value) {
         } else {
           responseTimeBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000004;
-        onChanged();
+        if (responseTime_ != null) {
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
         return this;
       }
       /**
@@ -1383,8 +1403,10 @@ public Builder mergeAttemptDelay(com.google.protobuf.Duration value) {
         } else {
           attemptDelayBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000008;
-        onChanged();
+        if (attemptDelay_ != null) {
+          bitField0_ |= 0x00000008;
+          onChanged();
+        }
         return this;
       }
       /**
@@ -1542,8 +1564,10 @@ public Builder mergeStatus(com.google.rpc.Status value) {
         } else {
           statusBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000010;
-        onChanged();
+        if (status_ != null) {
+          bitField0_ |= 0x00000010;
+          onChanged();
+        }
         return this;
       }
       /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Test.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Test.java
index 3b5d3be9b0..4dd2e8d593 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Test.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Test.java
@@ -1071,6 +1071,7 @@ public com.google.showcase.v1beta1.Test.Blueprint.Invocation getDefaultInstanceF
 
     }
 
+    private int bitField0_;
     public static final int NAME_FIELD_NUMBER = 1;
     @SuppressWarnings("serial")
     private volatile java.lang.Object name_ = "";
@@ -1177,7 +1178,7 @@ public java.lang.String getDescription() {
      */
     @java.lang.Override
     public boolean hasRequest() {
-      return request_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      * <pre>
@@ -1284,7 +1285,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 2, description_);
       }
-      if (request_ != null) {
+      if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(3, getRequest());
       }
       for (int i = 0; i < additionalRequests_.size(); i++) {
@@ -1305,7 +1306,7 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, description_);
       }
-      if (request_ != null) {
+      if (((bitField0_ & 0x00000001) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, getRequest());
       }
@@ -1488,13 +1489,20 @@ public static final class Builder extends
 
       // Construct using com.google.showcase.v1beta1.Test.Blueprint.newBuilder()
       private Builder() {
-
+        maybeForceBuilderInitialization();
       }
 
       private Builder(
           com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getRequestFieldBuilder();
+          getAdditionalRequestsFieldBuilder();
+        }
       }
       @java.lang.Override
       public Builder clear() {
@@ -1566,11 +1574,14 @@ private void buildPartial0(com.google.showcase.v1beta1.Test.Blueprint result) {
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.description_ = description_;
         }
+        int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.request_ = requestBuilder_ == null
               ? request_
               : requestBuilder_.build();
+          to_bitField0_ |= 0x00000001;
         }
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -1999,8 +2010,10 @@ public Builder mergeRequest(com.google.showcase.v1beta1.Test.Blueprint.Invocatio
         } else {
           requestBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000004;
-        onChanged();
+        if (request_ != null) {
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
         return this;
       }
       /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestRun.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestRun.java
index 68f8fe689d..ec6bcf97c1 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestRun.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestRun.java
@@ -43,6 +43,7 @@ protected java.lang.Object newInstance(
             com.google.showcase.v1beta1.TestRun.class, com.google.showcase.v1beta1.TestRun.Builder.class);
   }
 
+  private int bitField0_;
   public static final int TEST_FIELD_NUMBER = 1;
   @SuppressWarnings("serial")
   private volatile java.lang.Object test_ = "";
@@ -106,7 +107,7 @@ public java.lang.String getTest() {
    */
   @java.lang.Override
   public boolean hasIssue() {
-    return issue_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <pre>
@@ -149,7 +150,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(test_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, test_);
     }
-    if (issue_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(2, getIssue());
     }
     getUnknownFields().writeTo(output);
@@ -164,7 +165,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(test_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, test_);
     }
-    if (issue_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(2, getIssue());
     }
@@ -330,13 +331,19 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.TestRun.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getIssueFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -384,11 +391,14 @@ private void buildPartial0(com.google.showcase.v1beta1.TestRun result) {
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.test_ = test_;
       }
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.issue_ = issueBuilder_ == null
             ? issue_
             : issueBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -686,8 +696,10 @@ public Builder mergeIssue(com.google.showcase.v1beta1.Issue value) {
       } else {
         issueBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+      if (issue_ != null) {
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateBlurbRequest.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateBlurbRequest.java
index 693e11388d..2999b5b39c 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateBlurbRequest.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateBlurbRequest.java
@@ -43,6 +43,7 @@ protected java.lang.Object newInstance(
             com.google.showcase.v1beta1.UpdateBlurbRequest.class, com.google.showcase.v1beta1.UpdateBlurbRequest.Builder.class);
   }
 
+  private int bitField0_;
   public static final int BLURB_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.Blurb blurb_;
   /**
@@ -55,7 +56,7 @@ protected java.lang.Object newInstance(
    */
   @java.lang.Override
   public boolean hasBlurb() {
-    return blurb_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <pre>
@@ -94,7 +95,7 @@ public com.google.showcase.v1beta1.BlurbOrBuilder getBlurbOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUpdateMask() {
-    return updateMask_ != null;
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    * <pre>
@@ -136,10 +137,10 @@ public final boolean isInitialized() {
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (blurb_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getBlurb());
     }
-    if (updateMask_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(2, getUpdateMask());
     }
     getUnknownFields().writeTo(output);
@@ -151,11 +152,11 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (blurb_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, getBlurb());
     }
-    if (updateMask_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(2, getUpdateMask());
     }
@@ -327,13 +328,20 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.UpdateBlurbRequest.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getBlurbFieldBuilder();
+        getUpdateMaskFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -382,16 +390,20 @@ public com.google.showcase.v1beta1.UpdateBlurbRequest buildPartial() {
 
     private void buildPartial0(com.google.showcase.v1beta1.UpdateBlurbRequest result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.blurb_ = blurbBuilder_ == null
             ? blurb_
             : blurbBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.updateMask_ = updateMaskBuilder_ == null
             ? updateMask_
             : updateMaskBuilder_.build();
+        to_bitField0_ |= 0x00000002;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -587,8 +599,10 @@ public Builder mergeBlurb(com.google.showcase.v1beta1.Blurb value) {
       } else {
         blurbBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (blurb_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -747,8 +761,10 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+      if (updateMask_ != null) {
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateRoomRequest.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateRoomRequest.java
index bc7c2ce2ec..e4e676f16c 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateRoomRequest.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateRoomRequest.java
@@ -43,6 +43,7 @@ protected java.lang.Object newInstance(
             com.google.showcase.v1beta1.UpdateRoomRequest.class, com.google.showcase.v1beta1.UpdateRoomRequest.Builder.class);
   }
 
+  private int bitField0_;
   public static final int ROOM_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.Room room_;
   /**
@@ -55,7 +56,7 @@ protected java.lang.Object newInstance(
    */
   @java.lang.Override
   public boolean hasRoom() {
-    return room_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <pre>
@@ -94,7 +95,7 @@ public com.google.showcase.v1beta1.RoomOrBuilder getRoomOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUpdateMask() {
-    return updateMask_ != null;
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    * <pre>
@@ -136,10 +137,10 @@ public final boolean isInitialized() {
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (room_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getRoom());
     }
-    if (updateMask_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(2, getUpdateMask());
     }
     getUnknownFields().writeTo(output);
@@ -151,11 +152,11 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (room_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, getRoom());
     }
-    if (updateMask_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(2, getUpdateMask());
     }
@@ -327,13 +328,20 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.UpdateRoomRequest.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getRoomFieldBuilder();
+        getUpdateMaskFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -382,16 +390,20 @@ public com.google.showcase.v1beta1.UpdateRoomRequest buildPartial() {
 
     private void buildPartial0(com.google.showcase.v1beta1.UpdateRoomRequest result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.room_ = roomBuilder_ == null
             ? room_
             : roomBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.updateMask_ = updateMaskBuilder_ == null
             ? updateMask_
             : updateMaskBuilder_.build();
+        to_bitField0_ |= 0x00000002;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -587,8 +599,10 @@ public Builder mergeRoom(com.google.showcase.v1beta1.Room value) {
       } else {
         roomBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (room_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -747,8 +761,10 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+      if (updateMask_ != null) {
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateUserRequest.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateUserRequest.java
index af856bda97..bbbb3c081d 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateUserRequest.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateUserRequest.java
@@ -43,6 +43,7 @@ protected java.lang.Object newInstance(
             com.google.showcase.v1beta1.UpdateUserRequest.class, com.google.showcase.v1beta1.UpdateUserRequest.Builder.class);
   }
 
+  private int bitField0_;
   public static final int USER_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.User user_;
   /**
@@ -55,7 +56,7 @@ protected java.lang.Object newInstance(
    */
   @java.lang.Override
   public boolean hasUser() {
-    return user_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <pre>
@@ -94,7 +95,7 @@ public com.google.showcase.v1beta1.UserOrBuilder getUserOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUpdateMask() {
-    return updateMask_ != null;
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    * <pre>
@@ -136,10 +137,10 @@ public final boolean isInitialized() {
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (user_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getUser());
     }
-    if (updateMask_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(2, getUpdateMask());
     }
     getUnknownFields().writeTo(output);
@@ -151,11 +152,11 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (user_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, getUser());
     }
-    if (updateMask_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(2, getUpdateMask());
     }
@@ -327,13 +328,20 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.UpdateUserRequest.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getUserFieldBuilder();
+        getUpdateMaskFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -382,16 +390,20 @@ public com.google.showcase.v1beta1.UpdateUserRequest buildPartial() {
 
     private void buildPartial0(com.google.showcase.v1beta1.UpdateUserRequest result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.user_ = userBuilder_ == null
             ? user_
             : userBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.updateMask_ = updateMaskBuilder_ == null
             ? updateMask_
             : updateMaskBuilder_.build();
+        to_bitField0_ |= 0x00000002;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -587,8 +599,10 @@ public Builder mergeUser(com.google.showcase.v1beta1.User value) {
       } else {
         userBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (user_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -747,8 +761,10 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+      if (updateMask_ != null) {
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/User.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/User.java
index c52585f30f..44d635bfc0 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/User.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/User.java
@@ -200,7 +200,7 @@ public java.lang.String getEmail() {
    */
   @java.lang.Override
   public boolean hasCreateTime() {
-    return createTime_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <pre>
@@ -238,7 +238,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUpdateTime() {
-    return updateTime_ != null;
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    * <pre>
@@ -276,7 +276,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasAge() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return ((bitField0_ & 0x00000004) != 0);
   }
   /**
    * <pre>
@@ -303,7 +303,7 @@ public int getAge() {
    */
   @java.lang.Override
   public boolean hasHeightFeet() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return ((bitField0_ & 0x00000008) != 0);
   }
   /**
    * <pre>
@@ -334,7 +334,7 @@ public double getHeightFeet() {
    */
   @java.lang.Override
   public boolean hasNickname() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return ((bitField0_ & 0x00000010) != 0);
   }
   /**
    * <pre>
@@ -401,7 +401,7 @@ public java.lang.String getNickname() {
    */
   @java.lang.Override
   public boolean hasEnableNotifications() {
-    return ((bitField0_ & 0x00000008) != 0);
+    return ((bitField0_ & 0x00000020) != 0);
   }
   /**
    * <pre>
@@ -442,22 +442,22 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(email_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, email_);
     }
-    if (createTime_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(4, getCreateTime());
     }
-    if (updateTime_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(5, getUpdateTime());
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       output.writeInt32(6, age_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       output.writeDouble(7, heightFeet_);
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (((bitField0_ & 0x00000010) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, nickname_);
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (((bitField0_ & 0x00000020) != 0)) {
       output.writeBool(9, enableNotifications_);
     }
     getUnknownFields().writeTo(output);
@@ -478,26 +478,26 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(email_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, email_);
     }
-    if (createTime_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(4, getCreateTime());
     }
-    if (updateTime_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(5, getUpdateTime());
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(6, age_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeDoubleSize(7, heightFeet_);
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (((bitField0_ & 0x00000010) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, nickname_);
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (((bitField0_ & 0x00000020) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(9, enableNotifications_);
     }
@@ -719,13 +719,20 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.User.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getCreateTimeFieldBuilder();
+        getUpdateTimeFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -790,32 +797,34 @@ private void buildPartial0(com.google.showcase.v1beta1.User result) {
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.email_ = email_;
       }
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000008) != 0)) {
         result.createTime_ = createTimeBuilder_ == null
             ? createTime_
             : createTimeBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000010) != 0)) {
         result.updateTime_ = updateTimeBuilder_ == null
             ? updateTime_
             : updateTimeBuilder_.build();
+        to_bitField0_ |= 0x00000002;
       }
-      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000020) != 0)) {
         result.age_ = age_;
-        to_bitField0_ |= 0x00000001;
+        to_bitField0_ |= 0x00000004;
       }
       if (((from_bitField0_ & 0x00000040) != 0)) {
         result.heightFeet_ = heightFeet_;
-        to_bitField0_ |= 0x00000002;
+        to_bitField0_ |= 0x00000008;
       }
       if (((from_bitField0_ & 0x00000080) != 0)) {
         result.nickname_ = nickname_;
-        to_bitField0_ |= 0x00000004;
+        to_bitField0_ |= 0x00000010;
       }
       if (((from_bitField0_ & 0x00000100) != 0)) {
         result.enableNotifications_ = enableNotifications_;
-        to_bitField0_ |= 0x00000008;
+        to_bitField0_ |= 0x00000020;
       }
       result.bitField0_ |= to_bitField0_;
     }
@@ -1353,8 +1362,10 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+      if (createTime_ != null) {
+        bitField0_ |= 0x00000008;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -1508,8 +1519,10 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+      if (updateTime_ != null) {
+        bitField0_ |= 0x00000010;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestRequest.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestRequest.java
index 88204b80f0..7d2ab1a048 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestRequest.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestRequest.java
@@ -18,7 +18,7 @@ private VerifyTestRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> buil
   private VerifyTestRequest() {
     name_ = "";
     answer_ = com.google.protobuf.ByteString.EMPTY;
-    answers_ = java.util.Collections.emptyList();
+    answers_ = emptyList(com.google.protobuf.ByteString.class);
   }
 
   @java.lang.Override
@@ -105,7 +105,8 @@ public com.google.protobuf.ByteString getAnswer() {
 
   public static final int ANSWERS_FIELD_NUMBER = 3;
   @SuppressWarnings("serial")
-  private java.util.List<com.google.protobuf.ByteString> answers_;
+  private com.google.protobuf.Internal.ProtobufList<com.google.protobuf.ByteString> answers_ =
+      emptyList(com.google.protobuf.ByteString.class);
   /**
    * <pre>
    * The answers from the test if multiple are to be checked
@@ -364,7 +365,7 @@ public Builder clear() {
       bitField0_ = 0;
       name_ = "";
       answer_ = com.google.protobuf.ByteString.EMPTY;
-      answers_ = java.util.Collections.emptyList();
+      answers_ = emptyList(com.google.protobuf.ByteString.class);
       return this;
     }
 
@@ -391,20 +392,11 @@ public com.google.showcase.v1beta1.VerifyTestRequest build() {
     @java.lang.Override
     public com.google.showcase.v1beta1.VerifyTestRequest buildPartial() {
       com.google.showcase.v1beta1.VerifyTestRequest result = new com.google.showcase.v1beta1.VerifyTestRequest(this);
-      buildPartialRepeatedFields(result);
       if (bitField0_ != 0) { buildPartial0(result); }
       onBuilt();
       return result;
     }
 
-    private void buildPartialRepeatedFields(com.google.showcase.v1beta1.VerifyTestRequest result) {
-      if (((bitField0_ & 0x00000004) != 0)) {
-        answers_ = java.util.Collections.unmodifiableList(answers_);
-        bitField0_ = (bitField0_ & ~0x00000004);
-      }
-      result.answers_ = answers_;
-    }
-
     private void buildPartial0(com.google.showcase.v1beta1.VerifyTestRequest result) {
       int from_bitField0_ = bitField0_;
       if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -413,6 +405,10 @@ private void buildPartial0(com.google.showcase.v1beta1.VerifyTestRequest result)
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.answer_ = answer_;
       }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        answers_.makeImmutable();
+        result.answers_ = answers_;
+      }
     }
 
     @java.lang.Override
@@ -470,7 +466,8 @@ public Builder mergeFrom(com.google.showcase.v1beta1.VerifyTestRequest other) {
       if (!other.answers_.isEmpty()) {
         if (answers_.isEmpty()) {
           answers_ = other.answers_;
-          bitField0_ = (bitField0_ & ~0x00000004);
+          answers_.makeImmutable();
+          bitField0_ |= 0x00000004;
         } else {
           ensureAnswersIsMutable();
           answers_.addAll(other.answers_);
@@ -672,12 +669,12 @@ public Builder clearAnswer() {
       return this;
     }
 
-    private java.util.List<com.google.protobuf.ByteString> answers_ = java.util.Collections.emptyList();
+    private com.google.protobuf.Internal.ProtobufList<com.google.protobuf.ByteString> answers_ = emptyList(com.google.protobuf.ByteString.class);
     private void ensureAnswersIsMutable() {
-      if (!((bitField0_ & 0x00000004) != 0)) {
-        answers_ = new java.util.ArrayList<com.google.protobuf.ByteString>(answers_);
-        bitField0_ |= 0x00000004;
+      if (!answers_.isModifiable()) {
+        answers_ = makeMutableCopy(answers_);
       }
+      bitField0_ |= 0x00000004;
     }
     /**
      * <pre>
@@ -689,8 +686,8 @@ private void ensureAnswersIsMutable() {
      */
     public java.util.List<com.google.protobuf.ByteString>
         getAnswersList() {
-      return ((bitField0_ & 0x00000004) != 0) ?
-               java.util.Collections.unmodifiableList(answers_) : answers_;
+      answers_.makeImmutable();
+      return answers_;
     }
     /**
      * <pre>
@@ -730,6 +727,7 @@ public Builder setAnswers(
       if (value == null) { throw new NullPointerException(); }
       ensureAnswersIsMutable();
       answers_.set(index, value);
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -746,6 +744,7 @@ public Builder addAnswers(com.google.protobuf.ByteString value) {
       if (value == null) { throw new NullPointerException(); }
       ensureAnswersIsMutable();
       answers_.add(value);
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -763,6 +762,7 @@ public Builder addAllAnswers(
       ensureAnswersIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(
           values, answers_);
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -775,7 +775,7 @@ public Builder addAllAnswers(
      * @return This builder for chaining.
      */
     public Builder clearAnswers() {
-      answers_ = java.util.Collections.emptyList();
+      answers_ = emptyList(com.google.protobuf.ByteString.class);
       bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestResponse.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestResponse.java
index a571f339e0..0077cce7b7 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestResponse.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestResponse.java
@@ -38,6 +38,7 @@ protected java.lang.Object newInstance(
             com.google.showcase.v1beta1.VerifyTestResponse.class, com.google.showcase.v1beta1.VerifyTestResponse.Builder.class);
   }
 
+  private int bitField0_;
   public static final int ISSUE_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.Issue issue_;
   /**
@@ -50,7 +51,7 @@ protected java.lang.Object newInstance(
    */
   @java.lang.Override
   public boolean hasIssue() {
-    return issue_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <pre>
@@ -90,7 +91,7 @@ public final boolean isInitialized() {
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (issue_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getIssue());
     }
     getUnknownFields().writeTo(output);
@@ -102,7 +103,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (issue_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, getIssue());
     }
@@ -260,13 +261,19 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.VerifyTestResponse.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getIssueFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -310,11 +317,14 @@ public com.google.showcase.v1beta1.VerifyTestResponse buildPartial() {
 
     private void buildPartial0(com.google.showcase.v1beta1.VerifyTestResponse result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.issue_ = issueBuilder_ == null
             ? issue_
             : issueBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -500,8 +510,10 @@ public Builder mergeIssue(com.google.showcase.v1beta1.Issue value) {
       } else {
         issueBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (issue_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitMetadata.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitMetadata.java
index feb5919990..bbb4df8fc7 100644
--- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitMetadata.java
+++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitMetadata.java
@@ -42,6 +42,7 @@ protected java.lang.Object newInstance(
             com.google.showcase.v1beta1.WaitMetadata.class, com.google.showcase.v1beta1.WaitMetadata.Builder.class);
   }
 
+  private int bitField0_;
   public static final int END_TIME_FIELD_NUMBER = 1;
   private com.google.protobuf.Timestamp endTime_;
   /**
@@ -54,7 +55,7 @@ protected java.lang.Object newInstance(
    */
   @java.lang.Override
   public boolean hasEndTime() {
-    return endTime_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <pre>
@@ -94,7 +95,7 @@ public final boolean isInitialized() {
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (endTime_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getEndTime());
     }
     getUnknownFields().writeTo(output);
@@ -106,7 +107,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (endTime_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, getEndTime());
     }
@@ -268,13 +269,19 @@ public static final class Builder extends
 
     // Construct using com.google.showcase.v1beta1.WaitMetadata.newBuilder()
     private Builder() {
-
+      maybeForceBuilderInitialization();
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getEndTimeFieldBuilder();
+      }
     }
     @java.lang.Override
     public Builder clear() {
@@ -318,11 +325,14 @@ public com.google.showcase.v1beta1.WaitMetadata buildPartial() {
 
     private void buildPartial0(com.google.showcase.v1beta1.WaitMetadata result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.endTime_ = endTimeBuilder_ == null
             ? endTime_
             : endTimeBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -508,8 +518,10 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
       } else {
         endTimeBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (endTime_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/test/integration/goldens/apigeeconnect/src/META-INF/native-image/com.google.cloud.apigeeconnect.v1/reflect-config.json b/test/integration/goldens/apigeeconnect/src/META-INF/native-image/com.google.cloud.apigeeconnect.v1/reflect-config.json
index 2e6f281c3a..0de3cfa041 100644
--- a/test/integration/goldens/apigeeconnect/src/META-INF/native-image/com.google.cloud.apigeeconnect.v1/reflect-config.json
+++ b/test/integration/goldens/apigeeconnect/src/META-INF/native-image/com.google.cloud.apigeeconnect.v1/reflect-config.json
@@ -827,6 +827,78 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$FieldPresence",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$JsonFormat",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$MessageEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$RepeatedFieldEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$StringFieldValidation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto",
     "queryAllDeclaredConstructors": true,
@@ -890,6 +962,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
     "queryAllDeclaredConstructors": true,
diff --git a/test/integration/goldens/asset/src/META-INF/native-image/com.google.cloud.asset.v1/reflect-config.json b/test/integration/goldens/asset/src/META-INF/native-image/com.google.cloud.asset.v1/reflect-config.json
index 297c16fd54..000b39cb0b 100644
--- a/test/integration/goldens/asset/src/META-INF/native-image/com.google.cloud.asset.v1/reflect-config.json
+++ b/test/integration/goldens/asset/src/META-INF/native-image/com.google.cloud.asset.v1/reflect-config.json
@@ -3257,6 +3257,78 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$FieldPresence",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$JsonFormat",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$MessageEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$RepeatedFieldEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$StringFieldValidation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto",
     "queryAllDeclaredConstructors": true,
@@ -3320,6 +3392,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
     "queryAllDeclaredConstructors": true,
diff --git a/test/integration/goldens/bigtable/src/META-INF/native-image/com.google.cloud.bigtable.data.v2/reflect-config.json b/test/integration/goldens/bigtable/src/META-INF/native-image/com.google.cloud.bigtable.data.v2/reflect-config.json
index d7f2903798..168062a512 100644
--- a/test/integration/goldens/bigtable/src/META-INF/native-image/com.google.cloud.bigtable.data.v2/reflect-config.json
+++ b/test/integration/goldens/bigtable/src/META-INF/native-image/com.google.cloud.bigtable.data.v2/reflect-config.json
@@ -1403,6 +1403,78 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$FieldPresence",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$JsonFormat",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$MessageEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$RepeatedFieldEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$StringFieldValidation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto",
     "queryAllDeclaredConstructors": true,
@@ -1466,6 +1538,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
     "queryAllDeclaredConstructors": true,
diff --git a/test/integration/goldens/compute/src/META-INF/native-image/com.google.cloud.compute.v1small/reflect-config.json b/test/integration/goldens/compute/src/META-INF/native-image/com.google.cloud.compute.v1small/reflect-config.json
index 1b9220affb..987f989730 100644
--- a/test/integration/goldens/compute/src/META-INF/native-image/com.google.cloud.compute.v1small/reflect-config.json
+++ b/test/integration/goldens/compute/src/META-INF/native-image/com.google.cloud.compute.v1small/reflect-config.json
@@ -935,6 +935,78 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$FieldPresence",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$JsonFormat",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$MessageEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$RepeatedFieldEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$StringFieldValidation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto",
     "queryAllDeclaredConstructors": true,
@@ -998,6 +1070,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
     "queryAllDeclaredConstructors": true,
diff --git a/test/integration/goldens/credentials/src/META-INF/native-image/com.google.cloud.iam.credentials.v1/reflect-config.json b/test/integration/goldens/credentials/src/META-INF/native-image/com.google.cloud.iam.credentials.v1/reflect-config.json
index b2a95ce3d9..92bc6346c8 100644
--- a/test/integration/goldens/credentials/src/META-INF/native-image/com.google.cloud.iam.credentials.v1/reflect-config.json
+++ b/test/integration/goldens/credentials/src/META-INF/native-image/com.google.cloud.iam.credentials.v1/reflect-config.json
@@ -710,6 +710,78 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$FieldPresence",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$JsonFormat",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$MessageEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$RepeatedFieldEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$StringFieldValidation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto",
     "queryAllDeclaredConstructors": true,
@@ -773,6 +845,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
     "queryAllDeclaredConstructors": true,
diff --git a/test/integration/goldens/iam/src/META-INF/native-image/com.google.iam.v1/reflect-config.json b/test/integration/goldens/iam/src/META-INF/native-image/com.google.iam.v1/reflect-config.json
index 14539168b3..cae6c3d6a2 100644
--- a/test/integration/goldens/iam/src/META-INF/native-image/com.google.iam.v1/reflect-config.json
+++ b/test/integration/goldens/iam/src/META-INF/native-image/com.google.iam.v1/reflect-config.json
@@ -809,6 +809,78 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$FieldPresence",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$JsonFormat",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$MessageEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$RepeatedFieldEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$StringFieldValidation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto",
     "queryAllDeclaredConstructors": true,
@@ -872,6 +944,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
     "queryAllDeclaredConstructors": true,
diff --git a/test/integration/goldens/kms/src/META-INF/native-image/com.google.cloud.kms.v1/reflect-config.json b/test/integration/goldens/kms/src/META-INF/native-image/com.google.cloud.kms.v1/reflect-config.json
index 7ac6ca0945..017158379c 100644
--- a/test/integration/goldens/kms/src/META-INF/native-image/com.google.cloud.kms.v1/reflect-config.json
+++ b/test/integration/goldens/kms/src/META-INF/native-image/com.google.cloud.kms.v1/reflect-config.json
@@ -1763,6 +1763,78 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$FieldPresence",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$JsonFormat",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$MessageEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$RepeatedFieldEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$StringFieldValidation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto",
     "queryAllDeclaredConstructors": true,
@@ -1826,6 +1898,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
     "queryAllDeclaredConstructors": true,
diff --git a/test/integration/goldens/library/src/META-INF/native-image/com.google.cloud.example.library.v1/reflect-config.json b/test/integration/goldens/library/src/META-INF/native-image/com.google.cloud.example.library.v1/reflect-config.json
index 47acb99fa6..8dee8617da 100644
--- a/test/integration/goldens/library/src/META-INF/native-image/com.google.cloud.example.library.v1/reflect-config.json
+++ b/test/integration/goldens/library/src/META-INF/native-image/com.google.cloud.example.library.v1/reflect-config.json
@@ -836,6 +836,78 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$FieldPresence",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$JsonFormat",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$MessageEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$RepeatedFieldEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$StringFieldValidation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto",
     "queryAllDeclaredConstructors": true,
@@ -899,6 +971,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
     "queryAllDeclaredConstructors": true,
diff --git a/test/integration/goldens/logging/src/META-INF/native-image/com.google.cloud.logging.v2/reflect-config.json b/test/integration/goldens/logging/src/META-INF/native-image/com.google.cloud.logging.v2/reflect-config.json
index 073ab41b72..28d1264577 100644
--- a/test/integration/goldens/logging/src/META-INF/native-image/com.google.cloud.logging.v2/reflect-config.json
+++ b/test/integration/goldens/logging/src/META-INF/native-image/com.google.cloud.logging.v2/reflect-config.json
@@ -2213,6 +2213,78 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$FieldPresence",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$JsonFormat",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$MessageEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$RepeatedFieldEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$StringFieldValidation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto",
     "queryAllDeclaredConstructors": true,
@@ -2276,6 +2348,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
     "queryAllDeclaredConstructors": true,
diff --git a/test/integration/goldens/pubsub/src/META-INF/native-image/com.google.cloud.pubsub.v1/reflect-config.json b/test/integration/goldens/pubsub/src/META-INF/native-image/com.google.cloud.pubsub.v1/reflect-config.json
index 1ceb7d0a9e..78ba5611f0 100644
--- a/test/integration/goldens/pubsub/src/META-INF/native-image/com.google.cloud.pubsub.v1/reflect-config.json
+++ b/test/integration/goldens/pubsub/src/META-INF/native-image/com.google.cloud.pubsub.v1/reflect-config.json
@@ -809,6 +809,78 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$FieldPresence",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$JsonFormat",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$MessageEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$RepeatedFieldEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$StringFieldValidation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto",
     "queryAllDeclaredConstructors": true,
@@ -872,6 +944,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
     "queryAllDeclaredConstructors": true,
diff --git a/test/integration/goldens/redis/src/META-INF/native-image/com.google.cloud.redis.v1beta1/reflect-config.json b/test/integration/goldens/redis/src/META-INF/native-image/com.google.cloud.redis.v1beta1/reflect-config.json
index e202548752..e84f03ae34 100644
--- a/test/integration/goldens/redis/src/META-INF/native-image/com.google.cloud.redis.v1beta1/reflect-config.json
+++ b/test/integration/goldens/redis/src/META-INF/native-image/com.google.cloud.redis.v1beta1/reflect-config.json
@@ -1277,6 +1277,78 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$FieldPresence",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$JsonFormat",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$MessageEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$RepeatedFieldEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$StringFieldValidation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto",
     "queryAllDeclaredConstructors": true,
@@ -1340,6 +1412,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
     "queryAllDeclaredConstructors": true,
diff --git a/test/integration/goldens/storage/src/META-INF/native-image/com.google.storage.v2/reflect-config.json b/test/integration/goldens/storage/src/META-INF/native-image/com.google.storage.v2/reflect-config.json
index 498cd73337..61f68b3587 100644
--- a/test/integration/goldens/storage/src/META-INF/native-image/com.google.storage.v2/reflect-config.json
+++ b/test/integration/goldens/storage/src/META-INF/native-image/com.google.storage.v2/reflect-config.json
@@ -845,6 +845,78 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$FieldPresence",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$JsonFormat",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$MessageEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$RepeatedFieldEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$StringFieldValidation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto",
     "queryAllDeclaredConstructors": true,
@@ -908,6 +980,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
     "queryAllDeclaredConstructors": true,