diff --git a/java-dialogflow/README.md b/java-dialogflow/README.md
index 3fece4c7a263..62724a36d2b1 100644
--- a/java-dialogflow/README.md
+++ b/java-dialogflow/README.md
@@ -19,20 +19,20 @@ If you are using Maven, add this to your pom.xml file:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-dialogflow</artifactId>
-  <version>4.13.0</version>
+  <version>4.14.0</version>
 </dependency>
 ```
 
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-dialogflow:4.13.0'
+implementation 'com.google.cloud:google-cloud-dialogflow:4.14.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-dialogflow" % "4.13.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-dialogflow" % "4.14.0"
 ```
 
 ## Authentication
diff --git a/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/ConversationsClient.java b/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/ConversationsClient.java
index e2833687c980..57dcf5b0e058 100644
--- a/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/ConversationsClient.java
+++ b/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/ConversationsClient.java
@@ -1054,6 +1054,148 @@ public final UnaryCallable<ListMessagesRequest, ListMessagesResponse> listMessag
     return stub.listMessagesCallable();
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Suggests summary for a conversation based on specific historical messages. The range of the
+   * messages to be used for summary can be specified in the request.
+   *
+   * <p>Sample code:
+   *
+   * <pre>{@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (ConversationsClient conversationsClient = ConversationsClient.create()) {
+   *   ConversationName conversation =
+   *       ConversationName.ofProjectConversationName("[PROJECT]", "[CONVERSATION]");
+   *   SuggestConversationSummaryResponse response =
+   *       conversationsClient.suggestConversationSummary(conversation);
+   * }
+   * }</pre>
+   *
+   * @param conversation Required. The conversation to fetch suggestion for. Format:
+   *     `projects/&lt;Project ID&gt;/locations/&lt;Location ID&gt;/conversations/&lt;Conversation
+   *     ID&gt;`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final SuggestConversationSummaryResponse suggestConversationSummary(
+      ConversationName conversation) {
+    SuggestConversationSummaryRequest request =
+        SuggestConversationSummaryRequest.newBuilder()
+            .setConversation(conversation == null ? null : conversation.toString())
+            .build();
+    return suggestConversationSummary(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Suggests summary for a conversation based on specific historical messages. The range of the
+   * messages to be used for summary can be specified in the request.
+   *
+   * <p>Sample code:
+   *
+   * <pre>{@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (ConversationsClient conversationsClient = ConversationsClient.create()) {
+   *   String conversation =
+   *       ConversationName.ofProjectConversationName("[PROJECT]", "[CONVERSATION]").toString();
+   *   SuggestConversationSummaryResponse response =
+   *       conversationsClient.suggestConversationSummary(conversation);
+   * }
+   * }</pre>
+   *
+   * @param conversation Required. The conversation to fetch suggestion for. Format:
+   *     `projects/&lt;Project ID&gt;/locations/&lt;Location ID&gt;/conversations/&lt;Conversation
+   *     ID&gt;`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final SuggestConversationSummaryResponse suggestConversationSummary(String conversation) {
+    SuggestConversationSummaryRequest request =
+        SuggestConversationSummaryRequest.newBuilder().setConversation(conversation).build();
+    return suggestConversationSummary(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Suggests summary for a conversation based on specific historical messages. The range of the
+   * messages to be used for summary can be specified in the request.
+   *
+   * <p>Sample code:
+   *
+   * <pre>{@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (ConversationsClient conversationsClient = ConversationsClient.create()) {
+   *   SuggestConversationSummaryRequest request =
+   *       SuggestConversationSummaryRequest.newBuilder()
+   *           .setConversation(
+   *               ConversationName.ofProjectConversationName("[PROJECT]", "[CONVERSATION]")
+   *                   .toString())
+   *           .setLatestMessage(
+   *               MessageName.ofProjectConversationMessageName(
+   *                       "[PROJECT]", "[CONVERSATION]", "[MESSAGE]")
+   *                   .toString())
+   *           .setContextSize(1116903569)
+   *           .build();
+   *   SuggestConversationSummaryResponse response =
+   *       conversationsClient.suggestConversationSummary(request);
+   * }
+   * }</pre>
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final SuggestConversationSummaryResponse suggestConversationSummary(
+      SuggestConversationSummaryRequest request) {
+    return suggestConversationSummaryCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Suggests summary for a conversation based on specific historical messages. The range of the
+   * messages to be used for summary can be specified in the request.
+   *
+   * <p>Sample code:
+   *
+   * <pre>{@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (ConversationsClient conversationsClient = ConversationsClient.create()) {
+   *   SuggestConversationSummaryRequest request =
+   *       SuggestConversationSummaryRequest.newBuilder()
+   *           .setConversation(
+   *               ConversationName.ofProjectConversationName("[PROJECT]", "[CONVERSATION]")
+   *                   .toString())
+   *           .setLatestMessage(
+   *               MessageName.ofProjectConversationMessageName(
+   *                       "[PROJECT]", "[CONVERSATION]", "[MESSAGE]")
+   *                   .toString())
+   *           .setContextSize(1116903569)
+   *           .build();
+   *   ApiFuture<SuggestConversationSummaryResponse> future =
+   *       conversationsClient.suggestConversationSummaryCallable().futureCall(request);
+   *   // Do something.
+   *   SuggestConversationSummaryResponse response = future.get();
+   * }
+   * }</pre>
+   */
+  public final UnaryCallable<SuggestConversationSummaryRequest, SuggestConversationSummaryResponse>
+      suggestConversationSummaryCallable() {
+    return stub.suggestConversationSummaryCallable();
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Lists information about the supported locations for this service.
diff --git a/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/ConversationsSettings.java b/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/ConversationsSettings.java
index 58d603f4a4bc..5c000c3976e3 100644
--- a/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/ConversationsSettings.java
+++ b/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/ConversationsSettings.java
@@ -109,6 +109,12 @@ public UnaryCallSettings<GetConversationRequest, Conversation> getConversationSe
     return ((ConversationsStubSettings) getStubSettings()).listMessagesSettings();
   }
 
+  /** Returns the object with the settings used for calls to suggestConversationSummary. */
+  public UnaryCallSettings<SuggestConversationSummaryRequest, SuggestConversationSummaryResponse>
+      suggestConversationSummarySettings() {
+    return ((ConversationsStubSettings) getStubSettings()).suggestConversationSummarySettings();
+  }
+
   /** Returns the object with the settings used for calls to listLocations. */
   public PagedCallSettings<ListLocationsRequest, ListLocationsResponse, ListLocationsPagedResponse>
       listLocationsSettings() {
@@ -267,6 +273,13 @@ public Builder applyToAllUnaryMethods(
       return getStubSettingsBuilder().listMessagesSettings();
     }
 
+    /** Returns the builder for the settings used for calls to suggestConversationSummary. */
+    public UnaryCallSettings.Builder<
+            SuggestConversationSummaryRequest, SuggestConversationSummaryResponse>
+        suggestConversationSummarySettings() {
+      return getStubSettingsBuilder().suggestConversationSummarySettings();
+    }
+
     /** Returns the builder for the settings used for calls to listLocations. */
     public PagedCallSettings.Builder<
             ListLocationsRequest, ListLocationsResponse, ListLocationsPagedResponse>
diff --git a/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/gapic_metadata.json b/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/gapic_metadata.json
index dcb148daddf5..58096a213f76 100644
--- a/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/gapic_metadata.json
+++ b/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/gapic_metadata.json
@@ -126,6 +126,9 @@
             },
             "ListMessages": {
               "methods": ["listMessages", "listMessages", "listMessages", "listMessagesPagedCallable", "listMessagesCallable"]
+            },
+            "SuggestConversationSummary": {
+              "methods": ["suggestConversationSummary", "suggestConversationSummary", "suggestConversationSummary", "suggestConversationSummaryCallable"]
             }
           }
         }
diff --git a/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/ConversationsStub.java b/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/ConversationsStub.java
index 8f52a5549932..792b72f10ba9 100644
--- a/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/ConversationsStub.java
+++ b/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/ConversationsStub.java
@@ -30,6 +30,8 @@
 import com.google.cloud.dialogflow.v2.ListConversationsResponse;
 import com.google.cloud.dialogflow.v2.ListMessagesRequest;
 import com.google.cloud.dialogflow.v2.ListMessagesResponse;
+import com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest;
+import com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse;
 import com.google.cloud.location.GetLocationRequest;
 import com.google.cloud.location.ListLocationsRequest;
 import com.google.cloud.location.ListLocationsResponse;
@@ -75,6 +77,12 @@ public UnaryCallable<ListMessagesRequest, ListMessagesResponse> listMessagesCall
     throw new UnsupportedOperationException("Not implemented: listMessagesCallable()");
   }
 
+  public UnaryCallable<SuggestConversationSummaryRequest, SuggestConversationSummaryResponse>
+      suggestConversationSummaryCallable() {
+    throw new UnsupportedOperationException(
+        "Not implemented: suggestConversationSummaryCallable()");
+  }
+
   public UnaryCallable<ListLocationsRequest, ListLocationsPagedResponse>
       listLocationsPagedCallable() {
     throw new UnsupportedOperationException("Not implemented: listLocationsPagedCallable()");
diff --git a/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/ConversationsStubSettings.java b/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/ConversationsStubSettings.java
index 10c0e133443a..d82458cf442a 100644
--- a/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/ConversationsStubSettings.java
+++ b/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/ConversationsStubSettings.java
@@ -54,6 +54,8 @@
 import com.google.cloud.dialogflow.v2.ListMessagesRequest;
 import com.google.cloud.dialogflow.v2.ListMessagesResponse;
 import com.google.cloud.dialogflow.v2.Message;
+import com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest;
+import com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse;
 import com.google.cloud.location.GetLocationRequest;
 import com.google.cloud.location.ListLocationsRequest;
 import com.google.cloud.location.ListLocationsResponse;
@@ -124,6 +126,9 @@ public class ConversationsStubSettings extends StubSettings<ConversationsStubSet
   private final PagedCallSettings<
           ListMessagesRequest, ListMessagesResponse, ListMessagesPagedResponse>
       listMessagesSettings;
+  private final UnaryCallSettings<
+          SuggestConversationSummaryRequest, SuggestConversationSummaryResponse>
+      suggestConversationSummarySettings;
   private final PagedCallSettings<
           ListLocationsRequest, ListLocationsResponse, ListLocationsPagedResponse>
       listLocationsSettings;
@@ -325,6 +330,12 @@ public UnaryCallSettings<GetConversationRequest, Conversation> getConversationSe
     return listMessagesSettings;
   }
 
+  /** Returns the object with the settings used for calls to suggestConversationSummary. */
+  public UnaryCallSettings<SuggestConversationSummaryRequest, SuggestConversationSummaryResponse>
+      suggestConversationSummarySettings() {
+    return suggestConversationSummarySettings;
+  }
+
   /** Returns the object with the settings used for calls to listLocations. */
   public PagedCallSettings<ListLocationsRequest, ListLocationsResponse, ListLocationsPagedResponse>
       listLocationsSettings() {
@@ -447,6 +458,8 @@ protected ConversationsStubSettings(Builder settingsBuilder) throws IOException
     getConversationSettings = settingsBuilder.getConversationSettings().build();
     completeConversationSettings = settingsBuilder.completeConversationSettings().build();
     listMessagesSettings = settingsBuilder.listMessagesSettings().build();
+    suggestConversationSummarySettings =
+        settingsBuilder.suggestConversationSummarySettings().build();
     listLocationsSettings = settingsBuilder.listLocationsSettings().build();
     getLocationSettings = settingsBuilder.getLocationSettings().build();
   }
@@ -466,6 +479,9 @@ public static class Builder extends StubSettings.Builder<ConversationsStubSettin
     private final PagedCallSettings.Builder<
             ListMessagesRequest, ListMessagesResponse, ListMessagesPagedResponse>
         listMessagesSettings;
+    private final UnaryCallSettings.Builder<
+            SuggestConversationSummaryRequest, SuggestConversationSummaryResponse>
+        suggestConversationSummarySettings;
     private final PagedCallSettings.Builder<
             ListLocationsRequest, ListLocationsResponse, ListLocationsPagedResponse>
         listLocationsSettings;
@@ -513,6 +529,7 @@ protected Builder(ClientContext clientContext) {
       getConversationSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
       completeConversationSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
       listMessagesSettings = PagedCallSettings.newBuilder(LIST_MESSAGES_PAGE_STR_FACT);
+      suggestConversationSummarySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
       listLocationsSettings = PagedCallSettings.newBuilder(LIST_LOCATIONS_PAGE_STR_FACT);
       getLocationSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
@@ -523,6 +540,7 @@ protected Builder(ClientContext clientContext) {
               getConversationSettings,
               completeConversationSettings,
               listMessagesSettings,
+              suggestConversationSummarySettings,
               listLocationsSettings,
               getLocationSettings);
       initDefaults(this);
@@ -536,6 +554,7 @@ protected Builder(ConversationsStubSettings settings) {
       getConversationSettings = settings.getConversationSettings.toBuilder();
       completeConversationSettings = settings.completeConversationSettings.toBuilder();
       listMessagesSettings = settings.listMessagesSettings.toBuilder();
+      suggestConversationSummarySettings = settings.suggestConversationSummarySettings.toBuilder();
       listLocationsSettings = settings.listLocationsSettings.toBuilder();
       getLocationSettings = settings.getLocationSettings.toBuilder();
 
@@ -546,6 +565,7 @@ protected Builder(ConversationsStubSettings settings) {
               getConversationSettings,
               completeConversationSettings,
               listMessagesSettings,
+              suggestConversationSummarySettings,
               listLocationsSettings,
               getLocationSettings);
     }
@@ -602,6 +622,11 @@ private static Builder initDefaults(Builder builder) {
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
 
+      builder
+          .suggestConversationSummarySettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
+
       builder
           .listLocationsSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
@@ -662,6 +687,13 @@ public Builder applyToAllUnaryMethods(
       return listMessagesSettings;
     }
 
+    /** Returns the builder for the settings used for calls to suggestConversationSummary. */
+    public UnaryCallSettings.Builder<
+            SuggestConversationSummaryRequest, SuggestConversationSummaryResponse>
+        suggestConversationSummarySettings() {
+      return suggestConversationSummarySettings;
+    }
+
     /** Returns the builder for the settings used for calls to listLocations. */
     public PagedCallSettings.Builder<
             ListLocationsRequest, ListLocationsResponse, ListLocationsPagedResponse>
diff --git a/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcConversationsStub.java b/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcConversationsStub.java
index 3357f878444c..962da9443bd0 100644
--- a/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcConversationsStub.java
+++ b/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcConversationsStub.java
@@ -34,6 +34,8 @@
 import com.google.cloud.dialogflow.v2.ListConversationsResponse;
 import com.google.cloud.dialogflow.v2.ListMessagesRequest;
 import com.google.cloud.dialogflow.v2.ListMessagesResponse;
+import com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest;
+import com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse;
 import com.google.cloud.location.GetLocationRequest;
 import com.google.cloud.location.ListLocationsRequest;
 import com.google.cloud.location.ListLocationsResponse;
@@ -105,6 +107,20 @@ public class GrpcConversationsStub extends ConversationsStub {
                   ProtoUtils.marshaller(ListMessagesResponse.getDefaultInstance()))
               .build();
 
+  private static final MethodDescriptor<
+          SuggestConversationSummaryRequest, SuggestConversationSummaryResponse>
+      suggestConversationSummaryMethodDescriptor =
+          MethodDescriptor
+              .<SuggestConversationSummaryRequest, SuggestConversationSummaryResponse>newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(
+                  "google.cloud.dialogflow.v2.Conversations/SuggestConversationSummary")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(SuggestConversationSummaryRequest.getDefaultInstance()))
+              .setResponseMarshaller(
+                  ProtoUtils.marshaller(SuggestConversationSummaryResponse.getDefaultInstance()))
+              .build();
+
   private static final MethodDescriptor<ListLocationsRequest, ListLocationsResponse>
       listLocationsMethodDescriptor =
           MethodDescriptor.<ListLocationsRequest, ListLocationsResponse>newBuilder()
@@ -135,6 +151,8 @@ public class GrpcConversationsStub extends ConversationsStub {
   private final UnaryCallable<ListMessagesRequest, ListMessagesResponse> listMessagesCallable;
   private final UnaryCallable<ListMessagesRequest, ListMessagesPagedResponse>
       listMessagesPagedCallable;
+  private final UnaryCallable<SuggestConversationSummaryRequest, SuggestConversationSummaryResponse>
+      suggestConversationSummaryCallable;
   private final UnaryCallable<ListLocationsRequest, ListLocationsResponse> listLocationsCallable;
   private final UnaryCallable<ListLocationsRequest, ListLocationsPagedResponse>
       listLocationsPagedCallable;
@@ -234,6 +252,18 @@ protected GrpcConversationsStub(
                   return params.build();
                 })
             .build();
+    GrpcCallSettings<SuggestConversationSummaryRequest, SuggestConversationSummaryResponse>
+        suggestConversationSummaryTransportSettings =
+            GrpcCallSettings
+                .<SuggestConversationSummaryRequest, SuggestConversationSummaryResponse>newBuilder()
+                .setMethodDescriptor(suggestConversationSummaryMethodDescriptor)
+                .setParamsExtractor(
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("conversation", String.valueOf(request.getConversation()));
+                      return params.build();
+                    })
+                .build();
     GrpcCallSettings<ListLocationsRequest, ListLocationsResponse> listLocationsTransportSettings =
         GrpcCallSettings.<ListLocationsRequest, ListLocationsResponse>newBuilder()
             .setMethodDescriptor(listLocationsMethodDescriptor)
@@ -284,6 +314,11 @@ protected GrpcConversationsStub(
     this.listMessagesPagedCallable =
         callableFactory.createPagedCallable(
             listMessagesTransportSettings, settings.listMessagesSettings(), clientContext);
+    this.suggestConversationSummaryCallable =
+        callableFactory.createUnaryCallable(
+            suggestConversationSummaryTransportSettings,
+            settings.suggestConversationSummarySettings(),
+            clientContext);
     this.listLocationsCallable =
         callableFactory.createUnaryCallable(
             listLocationsTransportSettings, settings.listLocationsSettings(), clientContext);
@@ -339,6 +374,12 @@ public UnaryCallable<ListMessagesRequest, ListMessagesPagedResponse> listMessage
     return listMessagesPagedCallable;
   }
 
+  @Override
+  public UnaryCallable<SuggestConversationSummaryRequest, SuggestConversationSummaryResponse>
+      suggestConversationSummaryCallable() {
+    return suggestConversationSummaryCallable;
+  }
+
   @Override
   public UnaryCallable<ListLocationsRequest, ListLocationsResponse> listLocationsCallable() {
     return listLocationsCallable;
diff --git a/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/HttpJsonConversationsStub.java b/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/HttpJsonConversationsStub.java
index ed45e340c242..2e9260bd0e54 100644
--- a/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/HttpJsonConversationsStub.java
+++ b/java-dialogflow/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/HttpJsonConversationsStub.java
@@ -40,6 +40,8 @@
 import com.google.cloud.dialogflow.v2.ListConversationsResponse;
 import com.google.cloud.dialogflow.v2.ListMessagesRequest;
 import com.google.cloud.dialogflow.v2.ListMessagesResponse;
+import com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest;
+import com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse;
 import com.google.cloud.location.GetLocationRequest;
 import com.google.cloud.location.ListLocationsRequest;
 import com.google.cloud.location.ListLocationsResponse;
@@ -255,6 +257,50 @@ public class HttpJsonConversationsStub extends ConversationsStub {
                       .build())
               .build();
 
+  private static final ApiMethodDescriptor<
+          SuggestConversationSummaryRequest, SuggestConversationSummaryResponse>
+      suggestConversationSummaryMethodDescriptor =
+          ApiMethodDescriptor
+              .<SuggestConversationSummaryRequest, SuggestConversationSummaryResponse>newBuilder()
+              .setFullMethodName(
+                  "google.cloud.dialogflow.v2.Conversations/SuggestConversationSummary")
+              .setHttpMethod("POST")
+              .setType(ApiMethodDescriptor.MethodType.UNARY)
+              .setRequestFormatter(
+                  ProtoMessageRequestFormatter.<SuggestConversationSummaryRequest>newBuilder()
+                      .setPath(
+                          "/v2/{conversation=projects/*/conversations/*}/suggestions:suggestConversationSummary",
+                          request -> {
+                            Map<String, String> fields = new HashMap<>();
+                            ProtoRestSerializer<SuggestConversationSummaryRequest> serializer =
+                                ProtoRestSerializer.create();
+                            serializer.putPathParam(
+                                fields, "conversation", request.getConversation());
+                            return fields;
+                          })
+                      .setAdditionalPaths(
+                          "/v2/{conversation=projects/*/locations/*/conversations/*}/suggestions:suggestConversationSummary")
+                      .setQueryParamsExtractor(
+                          request -> {
+                            Map<String, List<String>> fields = new HashMap<>();
+                            ProtoRestSerializer<SuggestConversationSummaryRequest> serializer =
+                                ProtoRestSerializer.create();
+                            serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
+                            return fields;
+                          })
+                      .setRequestBodyExtractor(
+                          request ->
+                              ProtoRestSerializer.create()
+                                  .toBody(
+                                      "*", request.toBuilder().clearConversation().build(), true))
+                      .build())
+              .setResponseParser(
+                  ProtoMessageResponseParser.<SuggestConversationSummaryResponse>newBuilder()
+                      .setDefaultInstance(SuggestConversationSummaryResponse.getDefaultInstance())
+                      .setDefaultTypeRegistry(typeRegistry)
+                      .build())
+              .build();
+
   private static final ApiMethodDescriptor<ListLocationsRequest, ListLocationsResponse>
       listLocationsMethodDescriptor =
           ApiMethodDescriptor.<ListLocationsRequest, ListLocationsResponse>newBuilder()
@@ -334,6 +380,8 @@ public class HttpJsonConversationsStub extends ConversationsStub {
   private final UnaryCallable<ListMessagesRequest, ListMessagesResponse> listMessagesCallable;
   private final UnaryCallable<ListMessagesRequest, ListMessagesPagedResponse>
       listMessagesPagedCallable;
+  private final UnaryCallable<SuggestConversationSummaryRequest, SuggestConversationSummaryResponse>
+      suggestConversationSummaryCallable;
   private final UnaryCallable<ListLocationsRequest, ListLocationsResponse> listLocationsCallable;
   private final UnaryCallable<ListLocationsRequest, ListLocationsPagedResponse>
       listLocationsPagedCallable;
@@ -409,6 +457,13 @@ protected HttpJsonConversationsStub(
             .setMethodDescriptor(listMessagesMethodDescriptor)
             .setTypeRegistry(typeRegistry)
             .build();
+    HttpJsonCallSettings<SuggestConversationSummaryRequest, SuggestConversationSummaryResponse>
+        suggestConversationSummaryTransportSettings =
+            HttpJsonCallSettings
+                .<SuggestConversationSummaryRequest, SuggestConversationSummaryResponse>newBuilder()
+                .setMethodDescriptor(suggestConversationSummaryMethodDescriptor)
+                .setTypeRegistry(typeRegistry)
+                .build();
     HttpJsonCallSettings<ListLocationsRequest, ListLocationsResponse>
         listLocationsTransportSettings =
             HttpJsonCallSettings.<ListLocationsRequest, ListLocationsResponse>newBuilder()
@@ -450,6 +505,11 @@ protected HttpJsonConversationsStub(
     this.listMessagesPagedCallable =
         callableFactory.createPagedCallable(
             listMessagesTransportSettings, settings.listMessagesSettings(), clientContext);
+    this.suggestConversationSummaryCallable =
+        callableFactory.createUnaryCallable(
+            suggestConversationSummaryTransportSettings,
+            settings.suggestConversationSummarySettings(),
+            clientContext);
     this.listLocationsCallable =
         callableFactory.createUnaryCallable(
             listLocationsTransportSettings, settings.listLocationsSettings(), clientContext);
@@ -472,6 +532,7 @@ public static List<ApiMethodDescriptor> getMethodDescriptors() {
     methodDescriptors.add(getConversationMethodDescriptor);
     methodDescriptors.add(completeConversationMethodDescriptor);
     methodDescriptors.add(listMessagesMethodDescriptor);
+    methodDescriptors.add(suggestConversationSummaryMethodDescriptor);
     methodDescriptors.add(listLocationsMethodDescriptor);
     methodDescriptors.add(getLocationMethodDescriptor);
     return methodDescriptors;
@@ -514,6 +575,12 @@ public UnaryCallable<ListMessagesRequest, ListMessagesPagedResponse> listMessage
     return listMessagesPagedCallable;
   }
 
+  @Override
+  public UnaryCallable<SuggestConversationSummaryRequest, SuggestConversationSummaryResponse>
+      suggestConversationSummaryCallable() {
+    return suggestConversationSummaryCallable;
+  }
+
   @Override
   public UnaryCallable<ListLocationsRequest, ListLocationsResponse> listLocationsCallable() {
     return listLocationsCallable;
diff --git a/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ConversationModelsClientHttpJsonTest.java b/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ConversationModelsClientHttpJsonTest.java
index 11e9413b6ad8..d81a6c119f5f 100644
--- a/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ConversationModelsClientHttpJsonTest.java
+++ b/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ConversationModelsClientHttpJsonTest.java
@@ -406,6 +406,7 @@ public void getConversationModelEvaluationTest() throws Exception {
             .setDisplayName("displayName1714148973")
             .setEvaluationConfig(EvaluationConfig.newBuilder().build())
             .setCreateTime(Timestamp.newBuilder().build())
+            .setRawHumanEvalTemplateCsv("rawHumanEvalTemplateCsv-247435189")
             .build();
     mockService.addResponse(expectedResponse);
 
@@ -511,6 +512,7 @@ public void createConversationModelEvaluationTest() throws Exception {
             .setDisplayName("displayName1714148973")
             .setEvaluationConfig(EvaluationConfig.newBuilder().build())
             .setCreateTime(Timestamp.newBuilder().build())
+            .setRawHumanEvalTemplateCsv("rawHumanEvalTemplateCsv-247435189")
             .build();
     Operation resultOperation =
         Operation.newBuilder()
@@ -575,6 +577,7 @@ public void createConversationModelEvaluationTest2() throws Exception {
             .setDisplayName("displayName1714148973")
             .setEvaluationConfig(EvaluationConfig.newBuilder().build())
             .setCreateTime(Timestamp.newBuilder().build())
+            .setRawHumanEvalTemplateCsv("rawHumanEvalTemplateCsv-247435189")
             .build();
     Operation resultOperation =
         Operation.newBuilder()
diff --git a/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ConversationModelsClientTest.java b/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ConversationModelsClientTest.java
index 10191f6e1c73..e0ce65d8eb4e 100644
--- a/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ConversationModelsClientTest.java
+++ b/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ConversationModelsClientTest.java
@@ -388,6 +388,7 @@ public void getConversationModelEvaluationTest() throws Exception {
             .setDisplayName("displayName1714148973")
             .setEvaluationConfig(EvaluationConfig.newBuilder().build())
             .setCreateTime(Timestamp.newBuilder().build())
+            .setRawHumanEvalTemplateCsv("rawHumanEvalTemplateCsv-247435189")
             .build();
     mockConversationModels.addResponse(expectedResponse);
 
@@ -481,6 +482,7 @@ public void createConversationModelEvaluationTest() throws Exception {
             .setDisplayName("displayName1714148973")
             .setEvaluationConfig(EvaluationConfig.newBuilder().build())
             .setCreateTime(Timestamp.newBuilder().build())
+            .setRawHumanEvalTemplateCsv("rawHumanEvalTemplateCsv-247435189")
             .build();
     Operation resultOperation =
         Operation.newBuilder()
@@ -545,6 +547,7 @@ public void createConversationModelEvaluationTest2() throws Exception {
             .setDisplayName("displayName1714148973")
             .setEvaluationConfig(EvaluationConfig.newBuilder().build())
             .setCreateTime(Timestamp.newBuilder().build())
+            .setRawHumanEvalTemplateCsv("rawHumanEvalTemplateCsv-247435189")
             .build();
     Operation resultOperation =
         Operation.newBuilder()
diff --git a/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ConversationsClientHttpJsonTest.java b/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ConversationsClientHttpJsonTest.java
index b713377e6fb2..2642321b4928 100644
--- a/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ConversationsClientHttpJsonTest.java
+++ b/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ConversationsClientHttpJsonTest.java
@@ -717,6 +717,108 @@ public void listMessagesExceptionTest2() throws Exception {
     }
   }
 
+  @Test
+  public void suggestConversationSummaryTest() throws Exception {
+    SuggestConversationSummaryResponse expectedResponse =
+        SuggestConversationSummaryResponse.newBuilder()
+            .setSummary(SuggestConversationSummaryResponse.Summary.newBuilder().build())
+            .setLatestMessage(
+                MessageName.ofProjectConversationMessageName(
+                        "[PROJECT]", "[CONVERSATION]", "[MESSAGE]")
+                    .toString())
+            .setContextSize(1116903569)
+            .build();
+    mockService.addResponse(expectedResponse);
+
+    ConversationName conversation =
+        ConversationName.ofProjectConversationName("[PROJECT]", "[CONVERSATION]");
+
+    SuggestConversationSummaryResponse actualResponse =
+        client.suggestConversationSummary(conversation);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List<String> actualRequests = mockService.getRequestPaths();
+    Assert.assertEquals(1, actualRequests.size());
+
+    String apiClientHeaderKey =
+        mockService
+            .getRequestHeaders()
+            .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey())
+            .iterator()
+            .next();
+    Assert.assertTrue(
+        GaxHttpJsonProperties.getDefaultApiClientHeaderPattern()
+            .matcher(apiClientHeaderKey)
+            .matches());
+  }
+
+  @Test
+  public void suggestConversationSummaryExceptionTest() throws Exception {
+    ApiException exception =
+        ApiExceptionFactory.createException(
+            new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false);
+    mockService.addException(exception);
+
+    try {
+      ConversationName conversation =
+          ConversationName.ofProjectConversationName("[PROJECT]", "[CONVERSATION]");
+      client.suggestConversationSummary(conversation);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void suggestConversationSummaryTest2() throws Exception {
+    SuggestConversationSummaryResponse expectedResponse =
+        SuggestConversationSummaryResponse.newBuilder()
+            .setSummary(SuggestConversationSummaryResponse.Summary.newBuilder().build())
+            .setLatestMessage(
+                MessageName.ofProjectConversationMessageName(
+                        "[PROJECT]", "[CONVERSATION]", "[MESSAGE]")
+                    .toString())
+            .setContextSize(1116903569)
+            .build();
+    mockService.addResponse(expectedResponse);
+
+    String conversation = "projects/project-5228/conversations/conversation-5228";
+
+    SuggestConversationSummaryResponse actualResponse =
+        client.suggestConversationSummary(conversation);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List<String> actualRequests = mockService.getRequestPaths();
+    Assert.assertEquals(1, actualRequests.size());
+
+    String apiClientHeaderKey =
+        mockService
+            .getRequestHeaders()
+            .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey())
+            .iterator()
+            .next();
+    Assert.assertTrue(
+        GaxHttpJsonProperties.getDefaultApiClientHeaderPattern()
+            .matcher(apiClientHeaderKey)
+            .matches());
+  }
+
+  @Test
+  public void suggestConversationSummaryExceptionTest2() throws Exception {
+    ApiException exception =
+        ApiExceptionFactory.createException(
+            new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false);
+    mockService.addException(exception);
+
+    try {
+      String conversation = "projects/project-5228/conversations/conversation-5228";
+      client.suggestConversationSummary(conversation);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
   @Test
   public void listLocationsTest() throws Exception {
     Location responsesElement = Location.newBuilder().build();
diff --git a/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ConversationsClientTest.java b/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ConversationsClientTest.java
index 3e6cb8fdd2b4..b98c2d7e0862 100644
--- a/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ConversationsClientTest.java
+++ b/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ConversationsClientTest.java
@@ -656,6 +656,98 @@ public void listMessagesExceptionTest2() throws Exception {
     }
   }
 
+  @Test
+  public void suggestConversationSummaryTest() throws Exception {
+    SuggestConversationSummaryResponse expectedResponse =
+        SuggestConversationSummaryResponse.newBuilder()
+            .setSummary(SuggestConversationSummaryResponse.Summary.newBuilder().build())
+            .setLatestMessage(
+                MessageName.ofProjectConversationMessageName(
+                        "[PROJECT]", "[CONVERSATION]", "[MESSAGE]")
+                    .toString())
+            .setContextSize(1116903569)
+            .build();
+    mockConversations.addResponse(expectedResponse);
+
+    ConversationName conversation =
+        ConversationName.ofProjectConversationName("[PROJECT]", "[CONVERSATION]");
+
+    SuggestConversationSummaryResponse actualResponse =
+        client.suggestConversationSummary(conversation);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List<AbstractMessage> actualRequests = mockConversations.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    SuggestConversationSummaryRequest actualRequest =
+        ((SuggestConversationSummaryRequest) actualRequests.get(0));
+
+    Assert.assertEquals(conversation.toString(), actualRequest.getConversation());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  public void suggestConversationSummaryExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT);
+    mockConversations.addException(exception);
+
+    try {
+      ConversationName conversation =
+          ConversationName.ofProjectConversationName("[PROJECT]", "[CONVERSATION]");
+      client.suggestConversationSummary(conversation);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void suggestConversationSummaryTest2() throws Exception {
+    SuggestConversationSummaryResponse expectedResponse =
+        SuggestConversationSummaryResponse.newBuilder()
+            .setSummary(SuggestConversationSummaryResponse.Summary.newBuilder().build())
+            .setLatestMessage(
+                MessageName.ofProjectConversationMessageName(
+                        "[PROJECT]", "[CONVERSATION]", "[MESSAGE]")
+                    .toString())
+            .setContextSize(1116903569)
+            .build();
+    mockConversations.addResponse(expectedResponse);
+
+    String conversation = "conversation740154499";
+
+    SuggestConversationSummaryResponse actualResponse =
+        client.suggestConversationSummary(conversation);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List<AbstractMessage> actualRequests = mockConversations.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    SuggestConversationSummaryRequest actualRequest =
+        ((SuggestConversationSummaryRequest) actualRequests.get(0));
+
+    Assert.assertEquals(conversation, actualRequest.getConversation());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  public void suggestConversationSummaryExceptionTest2() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT);
+    mockConversations.addException(exception);
+
+    try {
+      String conversation = "conversation740154499";
+      client.suggestConversationSummary(conversation);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
   @Test
   public void listLocationsTest() throws Exception {
     Location responsesElement = Location.newBuilder().build();
diff --git a/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockConversationsImpl.java b/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockConversationsImpl.java
index 4399e5a4c26f..92cf37b7cc54 100644
--- a/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockConversationsImpl.java
+++ b/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockConversationsImpl.java
@@ -163,4 +163,26 @@ public void listMessages(
                   Exception.class.getName())));
     }
   }
+
+  @Override
+  public void suggestConversationSummary(
+      SuggestConversationSummaryRequest request,
+      StreamObserver<SuggestConversationSummaryResponse> responseObserver) {
+    Object response = responses.poll();
+    if (response instanceof SuggestConversationSummaryResponse) {
+      requests.add(request);
+      responseObserver.onNext(((SuggestConversationSummaryResponse) response));
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError(((Exception) response));
+    } else {
+      responseObserver.onError(
+          new IllegalArgumentException(
+              String.format(
+                  "Unrecognized response type %s for method SuggestConversationSummary, expected %s or %s",
+                  response == null ? "null" : response.getClass().getName(),
+                  SuggestConversationSummaryResponse.class.getName(),
+                  Exception.class.getName())));
+    }
+  }
 }
diff --git a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentsGrpc.java b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentsGrpc.java
index 289c111f750e..98ee5c549253 100644
--- a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentsGrpc.java
+++ b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentsGrpc.java
@@ -565,7 +565,8 @@ public void trainAgent(
      * The returned `Operation` type has the following method-specific fields:
      * - `metadata`: An empty [Struct
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#struct)
-     * - `response`: [ExportAgentResponse][google.cloud.dialogflow.v2.ExportAgentResponse]
+     * - `response`:
+     * [ExportAgentResponse][google.cloud.dialogflow.v2.ExportAgentResponse]
      * </pre>
      */
     public void exportAgent(
@@ -582,11 +583,13 @@ public void exportAgent(
      * Imports the specified agent from a ZIP file.
      * Uploads new intents and entity types without deleting the existing ones.
      * Intents and entity types with the same name are replaced with the new
-     * versions from [ImportAgentRequest][google.cloud.dialogflow.v2.ImportAgentRequest]. After the import, the imported draft
-     * agent will be trained automatically (unless disabled in agent settings).
-     * However, once the import is done, training may not be completed yet. Please
-     * call [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the operation it returns in order to train
-     * explicitly.
+     * versions from
+     * [ImportAgentRequest][google.cloud.dialogflow.v2.ImportAgentRequest]. After
+     * the import, the imported draft agent will be trained automatically (unless
+     * disabled in agent settings). However, once the import is done, training may
+     * not be completed yet. Please call
+     * [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the
+     * operation it returns in order to train explicitly.
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
@@ -617,8 +620,9 @@ public void importAgent(
      * entity types in the older version are deleted. After the restore, the
      * restored draft agent will be trained automatically (unless disabled in
      * agent settings). However, once the restore is done, training may not be
-     * completed yet. Please call [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the operation it
-     * returns in order to train explicitly.
+     * completed yet. Please call
+     * [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the
+     * operation it returns in order to train explicitly.
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
@@ -839,7 +843,8 @@ public void trainAgent(
      * The returned `Operation` type has the following method-specific fields:
      * - `metadata`: An empty [Struct
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#struct)
-     * - `response`: [ExportAgentResponse][google.cloud.dialogflow.v2.ExportAgentResponse]
+     * - `response`:
+     * [ExportAgentResponse][google.cloud.dialogflow.v2.ExportAgentResponse]
      * </pre>
      */
     public void exportAgent(
@@ -858,11 +863,13 @@ public void exportAgent(
      * Imports the specified agent from a ZIP file.
      * Uploads new intents and entity types without deleting the existing ones.
      * Intents and entity types with the same name are replaced with the new
-     * versions from [ImportAgentRequest][google.cloud.dialogflow.v2.ImportAgentRequest]. After the import, the imported draft
-     * agent will be trained automatically (unless disabled in agent settings).
-     * However, once the import is done, training may not be completed yet. Please
-     * call [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the operation it returns in order to train
-     * explicitly.
+     * versions from
+     * [ImportAgentRequest][google.cloud.dialogflow.v2.ImportAgentRequest]. After
+     * the import, the imported draft agent will be trained automatically (unless
+     * disabled in agent settings). However, once the import is done, training may
+     * not be completed yet. Please call
+     * [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the
+     * operation it returns in order to train explicitly.
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
@@ -895,8 +902,9 @@ public void importAgent(
      * entity types in the older version are deleted. After the restore, the
      * restored draft agent will be trained automatically (unless disabled in
      * agent settings). However, once the restore is done, training may not be
-     * completed yet. Please call [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the operation it
-     * returns in order to train explicitly.
+     * completed yet. Please call
+     * [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the
+     * operation it returns in order to train explicitly.
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
@@ -1050,7 +1058,8 @@ public com.google.longrunning.Operation trainAgent(
      * The returned `Operation` type has the following method-specific fields:
      * - `metadata`: An empty [Struct
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#struct)
-     * - `response`: [ExportAgentResponse][google.cloud.dialogflow.v2.ExportAgentResponse]
+     * - `response`:
+     * [ExportAgentResponse][google.cloud.dialogflow.v2.ExportAgentResponse]
      * </pre>
      */
     public com.google.longrunning.Operation exportAgent(
@@ -1066,11 +1075,13 @@ public com.google.longrunning.Operation exportAgent(
      * Imports the specified agent from a ZIP file.
      * Uploads new intents and entity types without deleting the existing ones.
      * Intents and entity types with the same name are replaced with the new
-     * versions from [ImportAgentRequest][google.cloud.dialogflow.v2.ImportAgentRequest]. After the import, the imported draft
-     * agent will be trained automatically (unless disabled in agent settings).
-     * However, once the import is done, training may not be completed yet. Please
-     * call [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the operation it returns in order to train
-     * explicitly.
+     * versions from
+     * [ImportAgentRequest][google.cloud.dialogflow.v2.ImportAgentRequest]. After
+     * the import, the imported draft agent will be trained automatically (unless
+     * disabled in agent settings). However, once the import is done, training may
+     * not be completed yet. Please call
+     * [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the
+     * operation it returns in order to train explicitly.
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
@@ -1100,8 +1111,9 @@ public com.google.longrunning.Operation importAgent(
      * entity types in the older version are deleted. After the restore, the
      * restored draft agent will be trained automatically (unless disabled in
      * agent settings). However, once the restore is done, training may not be
-     * completed yet. Please call [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the operation it
-     * returns in order to train explicitly.
+     * completed yet. Please call
+     * [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the
+     * operation it returns in order to train explicitly.
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
@@ -1249,7 +1261,8 @@ protected AgentsFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions ca
      * The returned `Operation` type has the following method-specific fields:
      * - `metadata`: An empty [Struct
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#struct)
-     * - `response`: [ExportAgentResponse][google.cloud.dialogflow.v2.ExportAgentResponse]
+     * - `response`:
+     * [ExportAgentResponse][google.cloud.dialogflow.v2.ExportAgentResponse]
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.longrunning.Operation>
@@ -1265,11 +1278,13 @@ protected AgentsFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions ca
      * Imports the specified agent from a ZIP file.
      * Uploads new intents and entity types without deleting the existing ones.
      * Intents and entity types with the same name are replaced with the new
-     * versions from [ImportAgentRequest][google.cloud.dialogflow.v2.ImportAgentRequest]. After the import, the imported draft
-     * agent will be trained automatically (unless disabled in agent settings).
-     * However, once the import is done, training may not be completed yet. Please
-     * call [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the operation it returns in order to train
-     * explicitly.
+     * versions from
+     * [ImportAgentRequest][google.cloud.dialogflow.v2.ImportAgentRequest]. After
+     * the import, the imported draft agent will be trained automatically (unless
+     * disabled in agent settings). However, once the import is done, training may
+     * not be completed yet. Please call
+     * [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the
+     * operation it returns in order to train explicitly.
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
@@ -1299,8 +1314,9 @@ protected AgentsFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions ca
      * entity types in the older version are deleted. After the restore, the
      * restored draft agent will be trained automatically (unless disabled in
      * agent settings). However, once the restore is done, training may not be
-     * completed yet. Please call [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the operation it
-     * returns in order to train explicitly.
+     * completed yet. Please call
+     * [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the
+     * operation it returns in order to train explicitly.
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
diff --git a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnswerRecordsGrpc.java b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnswerRecordsGrpc.java
index 96cd9e353ca7..ae2e65090eac 100644
--- a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnswerRecordsGrpc.java
+++ b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnswerRecordsGrpc.java
@@ -21,7 +21,8 @@
  *
  *
  * <pre>
- * Service for managing [AnswerRecords][google.cloud.dialogflow.v2.AnswerRecord].
+ * Service for managing
+ * [AnswerRecords][google.cloud.dialogflow.v2.AnswerRecord].
  * </pre>
  */
 @javax.annotation.Generated(
@@ -173,7 +174,8 @@ public AnswerRecordsFutureStub newStub(
    *
    *
    * <pre>
-   * Service for managing [AnswerRecords][google.cloud.dialogflow.v2.AnswerRecord].
+   * Service for managing
+   * [AnswerRecords][google.cloud.dialogflow.v2.AnswerRecord].
    * </pre>
    */
   public abstract static class AnswerRecordsImplBase implements io.grpc.BindableService {
@@ -233,7 +235,8 @@ public final io.grpc.ServerServiceDefinition bindService() {
    *
    *
    * <pre>
-   * Service for managing [AnswerRecords][google.cloud.dialogflow.v2.AnswerRecord].
+   * Service for managing
+   * [AnswerRecords][google.cloud.dialogflow.v2.AnswerRecord].
    * </pre>
    */
   public static final class AnswerRecordsStub
@@ -286,7 +289,8 @@ public void updateAnswerRecord(
    *
    *
    * <pre>
-   * Service for managing [AnswerRecords][google.cloud.dialogflow.v2.AnswerRecord].
+   * Service for managing
+   * [AnswerRecords][google.cloud.dialogflow.v2.AnswerRecord].
    * </pre>
    */
   public static final class AnswerRecordsBlockingStub
@@ -333,7 +337,8 @@ public com.google.cloud.dialogflow.v2.AnswerRecord updateAnswerRecord(
    *
    *
    * <pre>
-   * Service for managing [AnswerRecords][google.cloud.dialogflow.v2.AnswerRecord].
+   * Service for managing
+   * [AnswerRecords][google.cloud.dialogflow.v2.AnswerRecord].
    * </pre>
    */
   public static final class AnswerRecordsFutureStub
diff --git a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationDatasetsGrpc.java b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationDatasetsGrpc.java
index 7ec6071860e1..8697733e04a3 100644
--- a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationDatasetsGrpc.java
+++ b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationDatasetsGrpc.java
@@ -357,8 +357,10 @@ public abstract static class ConversationDatasetsImplBase implements io.grpc.Bin
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [CreateConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata]
-     * - `response`: [ConversationDataset][google.cloud.dialogflow.v2.ConversationDataset]
+     * - `metadata`:
+     * [CreateConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata]
+     * - `response`:
+     * [ConversationDataset][google.cloud.dialogflow.v2.ConversationDataset]
      * </pre>
      */
     public void createConversationDataset(
@@ -407,7 +409,8 @@ public void listConversationDatasets(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [DeleteConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationDatasetOperationMetadata]
+     * - `metadata`:
+     * [DeleteConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationDatasetOperationMetadata]
      * - `response`: An [Empty
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
      * </pre>
@@ -429,8 +432,10 @@ public void deleteConversationDataset(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [ImportConversationDataOperationMetadata][google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata]
-     * - `response`: [ImportConversationDataOperationResponse][google.cloud.dialogflow.v2.ImportConversationDataOperationResponse]
+     * - `metadata`:
+     * [ImportConversationDataOperationMetadata][google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata]
+     * - `response`:
+     * [ImportConversationDataOperationResponse][google.cloud.dialogflow.v2.ImportConversationDataOperationResponse]
      * </pre>
      */
     public void importConversationData(
@@ -510,8 +515,10 @@ protected ConversationDatasetsStub build(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [CreateConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata]
-     * - `response`: [ConversationDataset][google.cloud.dialogflow.v2.ConversationDataset]
+     * - `metadata`:
+     * [CreateConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata]
+     * - `response`:
+     * [ConversationDataset][google.cloud.dialogflow.v2.ConversationDataset]
      * </pre>
      */
     public void createConversationDataset(
@@ -566,7 +573,8 @@ public void listConversationDatasets(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [DeleteConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationDatasetOperationMetadata]
+     * - `metadata`:
+     * [DeleteConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationDatasetOperationMetadata]
      * - `response`: An [Empty
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
      * </pre>
@@ -590,8 +598,10 @@ public void deleteConversationDataset(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [ImportConversationDataOperationMetadata][google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata]
-     * - `response`: [ImportConversationDataOperationResponse][google.cloud.dialogflow.v2.ImportConversationDataOperationResponse]
+     * - `metadata`:
+     * [ImportConversationDataOperationMetadata][google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata]
+     * - `response`:
+     * [ImportConversationDataOperationResponse][google.cloud.dialogflow.v2.ImportConversationDataOperationResponse]
      * </pre>
      */
     public void importConversationData(
@@ -634,8 +644,10 @@ protected ConversationDatasetsBlockingStub build(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [CreateConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata]
-     * - `response`: [ConversationDataset][google.cloud.dialogflow.v2.ConversationDataset]
+     * - `metadata`:
+     * [CreateConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata]
+     * - `response`:
+     * [ConversationDataset][google.cloud.dialogflow.v2.ConversationDataset]
      * </pre>
      */
     public com.google.longrunning.Operation createConversationDataset(
@@ -679,7 +691,8 @@ public com.google.cloud.dialogflow.v2.ListConversationDatasetsResponse listConve
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [DeleteConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationDatasetOperationMetadata]
+     * - `metadata`:
+     * [DeleteConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationDatasetOperationMetadata]
      * - `response`: An [Empty
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
      * </pre>
@@ -700,8 +713,10 @@ public com.google.longrunning.Operation deleteConversationDataset(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [ImportConversationDataOperationMetadata][google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata]
-     * - `response`: [ImportConversationDataOperationResponse][google.cloud.dialogflow.v2.ImportConversationDataOperationResponse]
+     * - `metadata`:
+     * [ImportConversationDataOperationMetadata][google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata]
+     * - `response`:
+     * [ImportConversationDataOperationResponse][google.cloud.dialogflow.v2.ImportConversationDataOperationResponse]
      * </pre>
      */
     public com.google.longrunning.Operation importConversationData(
@@ -741,8 +756,10 @@ protected ConversationDatasetsFutureStub build(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [CreateConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata]
-     * - `response`: [ConversationDataset][google.cloud.dialogflow.v2.ConversationDataset]
+     * - `metadata`:
+     * [CreateConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata]
+     * - `response`:
+     * [ConversationDataset][google.cloud.dialogflow.v2.ConversationDataset]
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.longrunning.Operation>
@@ -791,7 +808,8 @@ protected ConversationDatasetsFutureStub build(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [DeleteConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationDatasetOperationMetadata]
+     * - `metadata`:
+     * [DeleteConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationDatasetOperationMetadata]
      * - `response`: An [Empty
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
      * </pre>
@@ -813,8 +831,10 @@ protected ConversationDatasetsFutureStub build(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [ImportConversationDataOperationMetadata][google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata]
-     * - `response`: [ImportConversationDataOperationResponse][google.cloud.dialogflow.v2.ImportConversationDataOperationResponse]
+     * - `metadata`:
+     * [ImportConversationDataOperationMetadata][google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata]
+     * - `response`:
+     * [ImportConversationDataOperationResponse][google.cloud.dialogflow.v2.ImportConversationDataOperationResponse]
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.longrunning.Operation>
diff --git a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationModelsGrpc.java b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationModelsGrpc.java
index c26627734d2d..f8f8ce2adf06 100644
--- a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationModelsGrpc.java
+++ b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationModelsGrpc.java
@@ -554,8 +554,10 @@ public abstract static class ConversationModelsImplBase implements io.grpc.Binda
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [CreateConversationModelOperationMetadata][google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata]
-     * - `response`: [ConversationModel][google.cloud.dialogflow.v2.ConversationModel]
+     * - `metadata`:
+     * [CreateConversationModelOperationMetadata][google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata]
+     * - `response`:
+     * [ConversationModel][google.cloud.dialogflow.v2.ConversationModel]
      * </pre>
      */
     public void createConversationModel(
@@ -603,7 +605,8 @@ public void listConversationModels(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [DeleteConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata]
+     * - `metadata`:
+     * [DeleteConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata]
      * - `response`: An [Empty
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
      * </pre>
@@ -626,7 +629,8 @@ public void deleteConversationModel(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [DeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata]
+     * - `metadata`:
+     * [DeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata]
      * - `response`: An [Empty
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
      * </pre>
@@ -649,7 +653,8 @@ public void deployConversationModel(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [UndeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata]
+     * - `metadata`:
+     * [UndeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata]
      * - `response`: An [Empty
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
      * </pre>
@@ -800,8 +805,10 @@ protected ConversationModelsStub build(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [CreateConversationModelOperationMetadata][google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata]
-     * - `response`: [ConversationModel][google.cloud.dialogflow.v2.ConversationModel]
+     * - `metadata`:
+     * [CreateConversationModelOperationMetadata][google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata]
+     * - `response`:
+     * [ConversationModel][google.cloud.dialogflow.v2.ConversationModel]
      * </pre>
      */
     public void createConversationModel(
@@ -855,7 +862,8 @@ public void listConversationModels(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [DeleteConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata]
+     * - `metadata`:
+     * [DeleteConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata]
      * - `response`: An [Empty
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
      * </pre>
@@ -880,7 +888,8 @@ public void deleteConversationModel(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [DeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata]
+     * - `metadata`:
+     * [DeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata]
      * - `response`: An [Empty
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
      * </pre>
@@ -905,7 +914,8 @@ public void deployConversationModel(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [UndeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata]
+     * - `metadata`:
+     * [UndeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata]
      * - `response`: An [Empty
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
      * </pre>
@@ -999,8 +1009,10 @@ protected ConversationModelsBlockingStub build(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [CreateConversationModelOperationMetadata][google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata]
-     * - `response`: [ConversationModel][google.cloud.dialogflow.v2.ConversationModel]
+     * - `metadata`:
+     * [CreateConversationModelOperationMetadata][google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata]
+     * - `response`:
+     * [ConversationModel][google.cloud.dialogflow.v2.ConversationModel]
      * </pre>
      */
     public com.google.longrunning.Operation createConversationModel(
@@ -1043,7 +1055,8 @@ public com.google.cloud.dialogflow.v2.ListConversationModelsResponse listConvers
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [DeleteConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata]
+     * - `metadata`:
+     * [DeleteConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata]
      * - `response`: An [Empty
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
      * </pre>
@@ -1065,7 +1078,8 @@ public com.google.longrunning.Operation deleteConversationModel(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [DeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata]
+     * - `metadata`:
+     * [DeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata]
      * - `response`: An [Empty
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
      * </pre>
@@ -1087,7 +1101,8 @@ public com.google.longrunning.Operation deployConversationModel(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [UndeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata]
+     * - `metadata`:
+     * [UndeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata]
      * - `response`: An [Empty
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
      * </pre>
@@ -1167,8 +1182,10 @@ protected ConversationModelsFutureStub build(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [CreateConversationModelOperationMetadata][google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata]
-     * - `response`: [ConversationModel][google.cloud.dialogflow.v2.ConversationModel]
+     * - `metadata`:
+     * [CreateConversationModelOperationMetadata][google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata]
+     * - `response`:
+     * [ConversationModel][google.cloud.dialogflow.v2.ConversationModel]
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.longrunning.Operation>
@@ -1215,7 +1232,8 @@ protected ConversationModelsFutureStub build(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [DeleteConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata]
+     * - `metadata`:
+     * [DeleteConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata]
      * - `response`: An [Empty
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
      * </pre>
@@ -1238,7 +1256,8 @@ protected ConversationModelsFutureStub build(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [DeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata]
+     * - `metadata`:
+     * [DeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata]
      * - `response`: An [Empty
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
      * </pre>
@@ -1261,7 +1280,8 @@ protected ConversationModelsFutureStub build(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [UndeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata]
+     * - `metadata`:
+     * [UndeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata]
      * - `response`: An [Empty
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
      * </pre>
diff --git a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationProfilesGrpc.java b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationProfilesGrpc.java
index 3d2ae0a6c765..3a28613d44e1 100644
--- a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationProfilesGrpc.java
+++ b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationProfilesGrpc.java
@@ -21,7 +21,8 @@
  *
  *
  * <pre>
- * Service for managing [ConversationProfiles][google.cloud.dialogflow.v2.ConversationProfile].
+ * Service for managing
+ * [ConversationProfiles][google.cloud.dialogflow.v2.ConversationProfile].
  * </pre>
  */
 @javax.annotation.Generated(
@@ -447,7 +448,8 @@ public ConversationProfilesFutureStub newStub(
    *
    *
    * <pre>
-   * Service for managing [ConversationProfiles][google.cloud.dialogflow.v2.ConversationProfile].
+   * Service for managing
+   * [ConversationProfiles][google.cloud.dialogflow.v2.ConversationProfile].
    * </pre>
    */
   public abstract static class ConversationProfilesImplBase implements io.grpc.BindableService {
@@ -489,7 +491,8 @@ public void getConversationProfile(
      * Creates a conversation profile in the specified project.
      * [ConversationProfile.CreateTime][] and [ConversationProfile.UpdateTime][]
      * aren't populated in the response. You can retrieve them via
-     * [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile] API.
+     * [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile]
+     * API.
      * </pre>
      */
     public void createConversationProfile(
@@ -507,7 +510,8 @@ public void createConversationProfile(
      * Updates the specified conversation profile.
      * [ConversationProfile.CreateTime][] and [ConversationProfile.UpdateTime][]
      * aren't populated in the response. You can retrieve them via
-     * [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile] API.
+     * [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile]
+     * API.
      * </pre>
      */
     public void updateConversationProfile(
@@ -543,8 +547,10 @@ public void deleteConversationProfile(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadata]
-     * - `response`: [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile]
+     * - `metadata`:
+     * [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadata]
+     * - `response`:
+     * [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile]
      * If a long running operation to add or update suggestion feature
      * config for the same conversation profile, participant role and suggestion
      * feature type exists, please cancel the existing long running operation
@@ -567,8 +573,10 @@ public void setSuggestionFeatureConfig(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetadata]
-     * - `response`: [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile]
+     * - `metadata`:
+     * [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetadata]
+     * - `response`:
+     * [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile]
      * </pre>
      */
     public void clearSuggestionFeatureConfig(
@@ -637,7 +645,8 @@ public final io.grpc.ServerServiceDefinition bindService() {
    *
    *
    * <pre>
-   * Service for managing [ConversationProfiles][google.cloud.dialogflow.v2.ConversationProfile].
+   * Service for managing
+   * [ConversationProfiles][google.cloud.dialogflow.v2.ConversationProfile].
    * </pre>
    */
   public static final class ConversationProfilesStub
@@ -693,7 +702,8 @@ public void getConversationProfile(
      * Creates a conversation profile in the specified project.
      * [ConversationProfile.CreateTime][] and [ConversationProfile.UpdateTime][]
      * aren't populated in the response. You can retrieve them via
-     * [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile] API.
+     * [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile]
+     * API.
      * </pre>
      */
     public void createConversationProfile(
@@ -713,7 +723,8 @@ public void createConversationProfile(
      * Updates the specified conversation profile.
      * [ConversationProfile.CreateTime][] and [ConversationProfile.UpdateTime][]
      * aren't populated in the response. You can retrieve them via
-     * [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile] API.
+     * [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile]
+     * API.
      * </pre>
      */
     public void updateConversationProfile(
@@ -753,8 +764,10 @@ public void deleteConversationProfile(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadata]
-     * - `response`: [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile]
+     * - `metadata`:
+     * [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadata]
+     * - `response`:
+     * [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile]
      * If a long running operation to add or update suggestion feature
      * config for the same conversation profile, participant role and suggestion
      * feature type exists, please cancel the existing long running operation
@@ -779,8 +792,10 @@ public void setSuggestionFeatureConfig(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetadata]
-     * - `response`: [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile]
+     * - `metadata`:
+     * [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetadata]
+     * - `response`:
+     * [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile]
      * </pre>
      */
     public void clearSuggestionFeatureConfig(
@@ -797,7 +812,8 @@ public void clearSuggestionFeatureConfig(
    *
    *
    * <pre>
-   * Service for managing [ConversationProfiles][google.cloud.dialogflow.v2.ConversationProfile].
+   * Service for managing
+   * [ConversationProfiles][google.cloud.dialogflow.v2.ConversationProfile].
    * </pre>
    */
   public static final class ConversationProfilesBlockingStub
@@ -846,7 +862,8 @@ public com.google.cloud.dialogflow.v2.ConversationProfile getConversationProfile
      * Creates a conversation profile in the specified project.
      * [ConversationProfile.CreateTime][] and [ConversationProfile.UpdateTime][]
      * aren't populated in the response. You can retrieve them via
-     * [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile] API.
+     * [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile]
+     * API.
      * </pre>
      */
     public com.google.cloud.dialogflow.v2.ConversationProfile createConversationProfile(
@@ -862,7 +879,8 @@ public com.google.cloud.dialogflow.v2.ConversationProfile createConversationProf
      * Updates the specified conversation profile.
      * [ConversationProfile.CreateTime][] and [ConversationProfile.UpdateTime][]
      * aren't populated in the response. You can retrieve them via
-     * [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile] API.
+     * [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile]
+     * API.
      * </pre>
      */
     public com.google.cloud.dialogflow.v2.ConversationProfile updateConversationProfile(
@@ -895,8 +913,10 @@ public com.google.protobuf.Empty deleteConversationProfile(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadata]
-     * - `response`: [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile]
+     * - `metadata`:
+     * [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadata]
+     * - `response`:
+     * [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile]
      * If a long running operation to add or update suggestion feature
      * config for the same conversation profile, participant role and suggestion
      * feature type exists, please cancel the existing long running operation
@@ -918,8 +938,10 @@ public com.google.longrunning.Operation setSuggestionFeatureConfig(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetadata]
-     * - `response`: [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile]
+     * - `metadata`:
+     * [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetadata]
+     * - `response`:
+     * [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile]
      * </pre>
      */
     public com.google.longrunning.Operation clearSuggestionFeatureConfig(
@@ -933,7 +955,8 @@ public com.google.longrunning.Operation clearSuggestionFeatureConfig(
    *
    *
    * <pre>
-   * Service for managing [ConversationProfiles][google.cloud.dialogflow.v2.ConversationProfile].
+   * Service for managing
+   * [ConversationProfiles][google.cloud.dialogflow.v2.ConversationProfile].
    * </pre>
    */
   public static final class ConversationProfilesFutureStub
@@ -986,7 +1009,8 @@ protected ConversationProfilesFutureStub build(
      * Creates a conversation profile in the specified project.
      * [ConversationProfile.CreateTime][] and [ConversationProfile.UpdateTime][]
      * aren't populated in the response. You can retrieve them via
-     * [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile] API.
+     * [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile]
+     * API.
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<
@@ -1004,7 +1028,8 @@ protected ConversationProfilesFutureStub build(
      * Updates the specified conversation profile.
      * [ConversationProfile.CreateTime][] and [ConversationProfile.UpdateTime][]
      * aren't populated in the response. You can retrieve them via
-     * [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile] API.
+     * [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile]
+     * API.
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<
@@ -1040,8 +1065,10 @@ protected ConversationProfilesFutureStub build(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadata]
-     * - `response`: [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile]
+     * - `metadata`:
+     * [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadata]
+     * - `response`:
+     * [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile]
      * If a long running operation to add or update suggestion feature
      * config for the same conversation profile, participant role and suggestion
      * feature type exists, please cancel the existing long running operation
@@ -1064,8 +1091,10 @@ protected ConversationProfilesFutureStub build(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetadata]
-     * - `response`: [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile]
+     * - `metadata`:
+     * [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetadata]
+     * - `response`:
+     * [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile]
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.longrunning.Operation>
diff --git a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationsGrpc.java b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationsGrpc.java
index 6dbeaa9f2ce4..ec753baa110f 100644
--- a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationsGrpc.java
+++ b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationsGrpc.java
@@ -21,7 +21,8 @@
  *
  *
  * <pre>
- * Service for managing [Conversations][google.cloud.dialogflow.v2.Conversation].
+ * Service for managing
+ * [Conversations][google.cloud.dialogflow.v2.Conversation].
  * </pre>
  */
 @javax.annotation.Generated(
@@ -269,6 +270,58 @@ private ConversationsGrpc() {}
     return getListMessagesMethod;
   }
 
+  private static volatile io.grpc.MethodDescriptor<
+          com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest,
+          com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse>
+      getSuggestConversationSummaryMethod;
+
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "SuggestConversationSummary",
+      requestType = com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest.class,
+      responseType = com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
+  public static io.grpc.MethodDescriptor<
+          com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest,
+          com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse>
+      getSuggestConversationSummaryMethod() {
+    io.grpc.MethodDescriptor<
+            com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest,
+            com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse>
+        getSuggestConversationSummaryMethod;
+    if ((getSuggestConversationSummaryMethod =
+            ConversationsGrpc.getSuggestConversationSummaryMethod)
+        == null) {
+      synchronized (ConversationsGrpc.class) {
+        if ((getSuggestConversationSummaryMethod =
+                ConversationsGrpc.getSuggestConversationSummaryMethod)
+            == null) {
+          ConversationsGrpc.getSuggestConversationSummaryMethod =
+              getSuggestConversationSummaryMethod =
+                  io.grpc.MethodDescriptor
+                      .<com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest,
+                          com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse>
+                          newBuilder()
+                      .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+                      .setFullMethodName(
+                          generateFullMethodName(SERVICE_NAME, "SuggestConversationSummary"))
+                      .setSampledToLocalTracing(true)
+                      .setRequestMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest
+                                  .getDefaultInstance()))
+                      .setResponseMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse
+                                  .getDefaultInstance()))
+                      .setSchemaDescriptor(
+                          new ConversationsMethodDescriptorSupplier("SuggestConversationSummary"))
+                      .build();
+        }
+      }
+    }
+    return getSuggestConversationSummaryMethod;
+  }
+
   /** Creates a new async stub that supports all call types for the service */
   public static ConversationsStub newStub(io.grpc.Channel channel) {
     io.grpc.stub.AbstractStub.StubFactory<ConversationsStub> factory =
@@ -314,7 +367,8 @@ public ConversationsFutureStub newStub(
    *
    *
    * <pre>
-   * Service for managing [Conversations][google.cloud.dialogflow.v2.Conversation].
+   * Service for managing
+   * [Conversations][google.cloud.dialogflow.v2.Conversation].
    * </pre>
    */
   public abstract static class ConversationsImplBase implements io.grpc.BindableService {
@@ -332,11 +386,14 @@ public abstract static class ConversationsImplBase implements io.grpc.BindableSe
      * user queries.
      * For Assist Stage, there's no dialogflow agent responding to user queries.
      * But we will provide suggestions which are generated from conversation.
-     * If [Conversation.conversation_profile][google.cloud.dialogflow.v2.Conversation.conversation_profile] is configured for a dialogflow
-     * agent, conversation will start from `Automated Agent Stage`, otherwise, it
-     * will start from `Assist Stage`. And during `Automated Agent Stage`, once an
-     * [Intent][google.cloud.dialogflow.v2.Intent] with [Intent.live_agent_handoff][google.cloud.dialogflow.v2.Intent.live_agent_handoff] is triggered, conversation
-     * will transfer to Assist Stage.
+     * If
+     * [Conversation.conversation_profile][google.cloud.dialogflow.v2.Conversation.conversation_profile]
+     * is configured for a dialogflow agent, conversation will start from
+     * `Automated Agent Stage`, otherwise, it will start from `Assist Stage`. And
+     * during `Automated Agent Stage`, once an
+     * [Intent][google.cloud.dialogflow.v2.Intent] with
+     * [Intent.live_agent_handoff][google.cloud.dialogflow.v2.Intent.live_agent_handoff]
+     * is triggered, conversation will transfer to Assist Stage.
      * </pre>
      */
     public void createConversation(
@@ -409,6 +466,24 @@ public void listMessages(
           getListMessagesMethod(), responseObserver);
     }
 
+    /**
+     *
+     *
+     * <pre>
+     * Suggests summary for a conversation based on specific historical messages.
+     * The range of the messages to be used for summary can be specified in the
+     * request.
+     * </pre>
+     */
+    public void suggestConversationSummary(
+        com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest request,
+        io.grpc.stub.StreamObserver<
+                com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse>
+            responseObserver) {
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getSuggestConversationSummaryMethod(), responseObserver);
+    }
+
     @java.lang.Override
     public final io.grpc.ServerServiceDefinition bindService() {
       return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
@@ -447,6 +522,13 @@ public final io.grpc.ServerServiceDefinition bindService() {
                       com.google.cloud.dialogflow.v2.ListMessagesRequest,
                       com.google.cloud.dialogflow.v2.ListMessagesResponse>(
                       this, METHODID_LIST_MESSAGES)))
+          .addMethod(
+              getSuggestConversationSummaryMethod(),
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
+                  new MethodHandlers<
+                      com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest,
+                      com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse>(
+                      this, METHODID_SUGGEST_CONVERSATION_SUMMARY)))
           .build();
     }
   }
@@ -455,7 +537,8 @@ public final io.grpc.ServerServiceDefinition bindService() {
    *
    *
    * <pre>
-   * Service for managing [Conversations][google.cloud.dialogflow.v2.Conversation].
+   * Service for managing
+   * [Conversations][google.cloud.dialogflow.v2.Conversation].
    * </pre>
    */
   public static final class ConversationsStub
@@ -482,11 +565,14 @@ protected ConversationsStub build(io.grpc.Channel channel, io.grpc.CallOptions c
      * user queries.
      * For Assist Stage, there's no dialogflow agent responding to user queries.
      * But we will provide suggestions which are generated from conversation.
-     * If [Conversation.conversation_profile][google.cloud.dialogflow.v2.Conversation.conversation_profile] is configured for a dialogflow
-     * agent, conversation will start from `Automated Agent Stage`, otherwise, it
-     * will start from `Assist Stage`. And during `Automated Agent Stage`, once an
-     * [Intent][google.cloud.dialogflow.v2.Intent] with [Intent.live_agent_handoff][google.cloud.dialogflow.v2.Intent.live_agent_handoff] is triggered, conversation
-     * will transfer to Assist Stage.
+     * If
+     * [Conversation.conversation_profile][google.cloud.dialogflow.v2.Conversation.conversation_profile]
+     * is configured for a dialogflow agent, conversation will start from
+     * `Automated Agent Stage`, otherwise, it will start from `Assist Stage`. And
+     * during `Automated Agent Stage`, once an
+     * [Intent][google.cloud.dialogflow.v2.Intent] with
+     * [Intent.live_agent_handoff][google.cloud.dialogflow.v2.Intent.live_agent_handoff]
+     * is triggered, conversation will transfer to Assist Stage.
      * </pre>
      */
     public void createConversation(
@@ -568,13 +654,34 @@ public void listMessages(
           request,
           responseObserver);
     }
+
+    /**
+     *
+     *
+     * <pre>
+     * Suggests summary for a conversation based on specific historical messages.
+     * The range of the messages to be used for summary can be specified in the
+     * request.
+     * </pre>
+     */
+    public void suggestConversationSummary(
+        com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest request,
+        io.grpc.stub.StreamObserver<
+                com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse>
+            responseObserver) {
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
+          getChannel().newCall(getSuggestConversationSummaryMethod(), getCallOptions()),
+          request,
+          responseObserver);
+    }
   }
 
   /**
    *
    *
    * <pre>
-   * Service for managing [Conversations][google.cloud.dialogflow.v2.Conversation].
+   * Service for managing
+   * [Conversations][google.cloud.dialogflow.v2.Conversation].
    * </pre>
    */
   public static final class ConversationsBlockingStub
@@ -602,11 +709,14 @@ protected ConversationsBlockingStub build(
      * user queries.
      * For Assist Stage, there's no dialogflow agent responding to user queries.
      * But we will provide suggestions which are generated from conversation.
-     * If [Conversation.conversation_profile][google.cloud.dialogflow.v2.Conversation.conversation_profile] is configured for a dialogflow
-     * agent, conversation will start from `Automated Agent Stage`, otherwise, it
-     * will start from `Assist Stage`. And during `Automated Agent Stage`, once an
-     * [Intent][google.cloud.dialogflow.v2.Intent] with [Intent.live_agent_handoff][google.cloud.dialogflow.v2.Intent.live_agent_handoff] is triggered, conversation
-     * will transfer to Assist Stage.
+     * If
+     * [Conversation.conversation_profile][google.cloud.dialogflow.v2.Conversation.conversation_profile]
+     * is configured for a dialogflow agent, conversation will start from
+     * `Automated Agent Stage`, otherwise, it will start from `Assist Stage`. And
+     * during `Automated Agent Stage`, once an
+     * [Intent][google.cloud.dialogflow.v2.Intent] with
+     * [Intent.live_agent_handoff][google.cloud.dialogflow.v2.Intent.live_agent_handoff]
+     * is triggered, conversation will transfer to Assist Stage.
      * </pre>
      */
     public com.google.cloud.dialogflow.v2.Conversation createConversation(
@@ -671,13 +781,30 @@ public com.google.cloud.dialogflow.v2.ListMessagesResponse listMessages(
       return io.grpc.stub.ClientCalls.blockingUnaryCall(
           getChannel(), getListMessagesMethod(), getCallOptions(), request);
     }
+
+    /**
+     *
+     *
+     * <pre>
+     * Suggests summary for a conversation based on specific historical messages.
+     * The range of the messages to be used for summary can be specified in the
+     * request.
+     * </pre>
+     */
+    public com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse
+        suggestConversationSummary(
+            com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getSuggestConversationSummaryMethod(), getCallOptions(), request);
+    }
   }
 
   /**
    *
    *
    * <pre>
-   * Service for managing [Conversations][google.cloud.dialogflow.v2.Conversation].
+   * Service for managing
+   * [Conversations][google.cloud.dialogflow.v2.Conversation].
    * </pre>
    */
   public static final class ConversationsFutureStub
@@ -705,11 +832,14 @@ protected ConversationsFutureStub build(
      * user queries.
      * For Assist Stage, there's no dialogflow agent responding to user queries.
      * But we will provide suggestions which are generated from conversation.
-     * If [Conversation.conversation_profile][google.cloud.dialogflow.v2.Conversation.conversation_profile] is configured for a dialogflow
-     * agent, conversation will start from `Automated Agent Stage`, otherwise, it
-     * will start from `Assist Stage`. And during `Automated Agent Stage`, once an
-     * [Intent][google.cloud.dialogflow.v2.Intent] with [Intent.live_agent_handoff][google.cloud.dialogflow.v2.Intent.live_agent_handoff] is triggered, conversation
-     * will transfer to Assist Stage.
+     * If
+     * [Conversation.conversation_profile][google.cloud.dialogflow.v2.Conversation.conversation_profile]
+     * is configured for a dialogflow agent, conversation will start from
+     * `Automated Agent Stage`, otherwise, it will start from `Assist Stage`. And
+     * during `Automated Agent Stage`, once an
+     * [Intent][google.cloud.dialogflow.v2.Intent] with
+     * [Intent.live_agent_handoff][google.cloud.dialogflow.v2.Intent.live_agent_handoff]
+     * is triggered, conversation will transfer to Assist Stage.
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<
@@ -779,6 +909,23 @@ protected ConversationsFutureStub build(
       return io.grpc.stub.ClientCalls.futureUnaryCall(
           getChannel().newCall(getListMessagesMethod(), getCallOptions()), request);
     }
+
+    /**
+     *
+     *
+     * <pre>
+     * Suggests summary for a conversation based on specific historical messages.
+     * The range of the messages to be used for summary can be specified in the
+     * request.
+     * </pre>
+     */
+    public com.google.common.util.concurrent.ListenableFuture<
+            com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse>
+        suggestConversationSummary(
+            com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest request) {
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getSuggestConversationSummaryMethod(), getCallOptions()), request);
+    }
   }
 
   private static final int METHODID_CREATE_CONVERSATION = 0;
@@ -786,6 +933,7 @@ protected ConversationsFutureStub build(
   private static final int METHODID_GET_CONVERSATION = 2;
   private static final int METHODID_COMPLETE_CONVERSATION = 3;
   private static final int METHODID_LIST_MESSAGES = 4;
+  private static final int METHODID_SUGGEST_CONVERSATION_SUMMARY = 5;
 
   private static final class MethodHandlers<Req, Resp>
       implements io.grpc.stub.ServerCalls.UnaryMethod<Req, Resp>,
@@ -835,6 +983,13 @@ public void invoke(Req request, io.grpc.stub.StreamObserver<Resp> responseObserv
               (io.grpc.stub.StreamObserver<com.google.cloud.dialogflow.v2.ListMessagesResponse>)
                   responseObserver);
           break;
+        case METHODID_SUGGEST_CONVERSATION_SUMMARY:
+          serviceImpl.suggestConversationSummary(
+              (com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest) request,
+              (io.grpc.stub.StreamObserver<
+                      com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse>)
+                  responseObserver);
+          break;
         default:
           throw new AssertionError();
       }
@@ -904,6 +1059,7 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() {
                       .addMethod(getGetConversationMethod())
                       .addMethod(getCompleteConversationMethod())
                       .addMethod(getListMessagesMethod())
+                      .addMethod(getSuggestConversationSummaryMethod())
                       .build();
         }
       }
diff --git a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DocumentsGrpc.java b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DocumentsGrpc.java
index 0fac8760cbba..a26397a9d74f 100644
--- a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DocumentsGrpc.java
+++ b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DocumentsGrpc.java
@@ -21,7 +21,8 @@
  *
  *
  * <pre>
- * Service for managing knowledge [Documents][google.cloud.dialogflow.v2.Document].
+ * Service for managing knowledge
+ * [Documents][google.cloud.dialogflow.v2.Document].
  * </pre>
  */
 @javax.annotation.Generated(
@@ -422,7 +423,8 @@ public DocumentsFutureStub newStub(
    *
    *
    * <pre>
-   * Service for managing knowledge [Documents][google.cloud.dialogflow.v2.Document].
+   * Service for managing knowledge
+   * [Documents][google.cloud.dialogflow.v2.Document].
    * </pre>
    */
   public abstract static class DocumentsImplBase implements io.grpc.BindableService {
@@ -464,7 +466,8 @@ public void getDocument(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
      * - `response`: [Document][google.cloud.dialogflow.v2.Document]
      * </pre>
      */
@@ -485,8 +488,10 @@ public void createDocument(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
-     * - `response`: [ImportDocumentsResponse][google.cloud.dialogflow.v2.ImportDocumentsResponse]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `response`:
+     * [ImportDocumentsResponse][google.cloud.dialogflow.v2.ImportDocumentsResponse]
      * </pre>
      */
     public void importDocuments(
@@ -504,7 +509,8 @@ public void importDocuments(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
      * - `response`: An [Empty
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
      * </pre>
@@ -524,7 +530,8 @@ public void deleteDocument(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
      * - `response`: [Document][google.cloud.dialogflow.v2.Document]
      * </pre>
      */
@@ -546,7 +553,8 @@ public void updateDocument(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
      * - `response`: [Document][google.cloud.dialogflow.v2.Document]
      * Note: The `projects.agent.knowledgeBases.documents` resource is deprecated;
      * only use `projects.knowledgeBases.documents`.
@@ -568,7 +576,8 @@ public void reloadDocument(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
      * - `response`: [Document][google.cloud.dialogflow.v2.Document]
      * </pre>
      */
@@ -639,7 +648,8 @@ public final io.grpc.ServerServiceDefinition bindService() {
    *
    *
    * <pre>
-   * Service for managing knowledge [Documents][google.cloud.dialogflow.v2.Document].
+   * Service for managing knowledge
+   * [Documents][google.cloud.dialogflow.v2.Document].
    * </pre>
    */
   public static final class DocumentsStub extends io.grpc.stub.AbstractAsyncStub<DocumentsStub> {
@@ -693,7 +703,8 @@ public void getDocument(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
      * - `response`: [Document][google.cloud.dialogflow.v2.Document]
      * </pre>
      */
@@ -716,8 +727,10 @@ public void createDocument(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
-     * - `response`: [ImportDocumentsResponse][google.cloud.dialogflow.v2.ImportDocumentsResponse]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `response`:
+     * [ImportDocumentsResponse][google.cloud.dialogflow.v2.ImportDocumentsResponse]
      * </pre>
      */
     public void importDocuments(
@@ -737,7 +750,8 @@ public void importDocuments(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
      * - `response`: An [Empty
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
      * </pre>
@@ -759,7 +773,8 @@ public void deleteDocument(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
      * - `response`: [Document][google.cloud.dialogflow.v2.Document]
      * </pre>
      */
@@ -783,7 +798,8 @@ public void updateDocument(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
      * - `response`: [Document][google.cloud.dialogflow.v2.Document]
      * Note: The `projects.agent.knowledgeBases.documents` resource is deprecated;
      * only use `projects.knowledgeBases.documents`.
@@ -807,7 +823,8 @@ public void reloadDocument(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
      * - `response`: [Document][google.cloud.dialogflow.v2.Document]
      * </pre>
      */
@@ -825,7 +842,8 @@ public void exportDocument(
    *
    *
    * <pre>
-   * Service for managing knowledge [Documents][google.cloud.dialogflow.v2.Document].
+   * Service for managing knowledge
+   * [Documents][google.cloud.dialogflow.v2.Document].
    * </pre>
    */
   public static final class DocumentsBlockingStub
@@ -874,7 +892,8 @@ public com.google.cloud.dialogflow.v2.Document getDocument(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
      * - `response`: [Document][google.cloud.dialogflow.v2.Document]
      * </pre>
      */
@@ -894,8 +913,10 @@ public com.google.longrunning.Operation createDocument(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
-     * - `response`: [ImportDocumentsResponse][google.cloud.dialogflow.v2.ImportDocumentsResponse]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `response`:
+     * [ImportDocumentsResponse][google.cloud.dialogflow.v2.ImportDocumentsResponse]
      * </pre>
      */
     public com.google.longrunning.Operation importDocuments(
@@ -912,7 +933,8 @@ public com.google.longrunning.Operation importDocuments(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
      * - `response`: An [Empty
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
      * </pre>
@@ -931,7 +953,8 @@ public com.google.longrunning.Operation deleteDocument(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
      * - `response`: [Document][google.cloud.dialogflow.v2.Document]
      * </pre>
      */
@@ -952,7 +975,8 @@ public com.google.longrunning.Operation updateDocument(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
      * - `response`: [Document][google.cloud.dialogflow.v2.Document]
      * Note: The `projects.agent.knowledgeBases.documents` resource is deprecated;
      * only use `projects.knowledgeBases.documents`.
@@ -973,7 +997,8 @@ public com.google.longrunning.Operation reloadDocument(
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
      * - `response`: [Document][google.cloud.dialogflow.v2.Document]
      * </pre>
      */
@@ -988,7 +1013,8 @@ public com.google.longrunning.Operation exportDocument(
    *
    *
    * <pre>
-   * Service for managing knowledge [Documents][google.cloud.dialogflow.v2.Document].
+   * Service for managing knowledge
+   * [Documents][google.cloud.dialogflow.v2.Document].
    * </pre>
    */
   public static final class DocumentsFutureStub
@@ -1038,7 +1064,8 @@ protected DocumentsFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
      * - `response`: [Document][google.cloud.dialogflow.v2.Document]
      * </pre>
      */
@@ -1058,8 +1085,10 @@ protected DocumentsFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
-     * - `response`: [ImportDocumentsResponse][google.cloud.dialogflow.v2.ImportDocumentsResponse]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `response`:
+     * [ImportDocumentsResponse][google.cloud.dialogflow.v2.ImportDocumentsResponse]
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.longrunning.Operation>
@@ -1076,7 +1105,8 @@ protected DocumentsFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
      * - `response`: An [Empty
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
      * </pre>
@@ -1095,7 +1125,8 @@ protected DocumentsFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
      * - `response`: [Document][google.cloud.dialogflow.v2.Document]
      * </pre>
      */
@@ -1116,7 +1147,8 @@ protected DocumentsFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
      * - `response`: [Document][google.cloud.dialogflow.v2.Document]
      * Note: The `projects.agent.knowledgeBases.documents` resource is deprecated;
      * only use `projects.knowledgeBases.documents`.
@@ -1137,7 +1169,8 @@ protected DocumentsFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions
      * This method is a [long-running
      * operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
      * The returned `Operation` type has the following method-specific fields:
-     * - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+     * - `metadata`:
+     * [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
      * - `response`: [Document][google.cloud.dialogflow.v2.Document]
      * </pre>
      */
diff --git a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesGrpc.java b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesGrpc.java
index 270b5416a6b3..4ee3fda717a0 100644
--- a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesGrpc.java
+++ b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesGrpc.java
@@ -640,7 +640,8 @@ public void deleteEntityType(
      * The returned `Operation` type has the following method-specific fields:
      * - `metadata`: An empty [Struct
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#struct)
-     * - `response`: [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse]
+     * - `response`:
+     * [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse]
      * Note: You should always train an agent prior to sending it queries. See the
      * [training
      * documentation](https://cloud.google.com/dialogflow/es/docs/training).
@@ -939,7 +940,8 @@ public void deleteEntityType(
      * The returned `Operation` type has the following method-specific fields:
      * - `metadata`: An empty [Struct
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#struct)
-     * - `response`: [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse]
+     * - `response`:
+     * [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse]
      * Note: You should always train an agent prior to sending it queries. See the
      * [training
      * documentation](https://cloud.google.com/dialogflow/es/docs/training).
@@ -1164,7 +1166,8 @@ public com.google.protobuf.Empty deleteEntityType(
      * The returned `Operation` type has the following method-specific fields:
      * - `metadata`: An empty [Struct
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#struct)
-     * - `response`: [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse]
+     * - `response`:
+     * [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse]
      * Note: You should always train an agent prior to sending it queries. See the
      * [training
      * documentation](https://cloud.google.com/dialogflow/es/docs/training).
@@ -1378,7 +1381,8 @@ protected EntityTypesFutureStub build(
      * The returned `Operation` type has the following method-specific fields:
      * - `metadata`: An empty [Struct
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#struct)
-     * - `response`: [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse]
+     * - `response`:
+     * [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse]
      * Note: You should always train an agent prior to sending it queries. See the
      * [training
      * documentation](https://cloud.google.com/dialogflow/es/docs/training).
diff --git a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentsGrpc.java b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentsGrpc.java
index 332e7063cb3b..fc4e850ebd12 100644
--- a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentsGrpc.java
+++ b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentsGrpc.java
@@ -480,7 +480,8 @@ public void deleteIntent(
      * The returned `Operation` type has the following method-specific fields:
      * - `metadata`: An empty [Struct
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#struct)
-     * - `response`: [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2.BatchUpdateIntentsResponse]
+     * - `response`:
+     * [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2.BatchUpdateIntentsResponse]
      * Note: You should always train an agent prior to sending it queries. See the
      * [training
      * documentation](https://cloud.google.com/dialogflow/es/docs/training).
@@ -682,7 +683,8 @@ public void deleteIntent(
      * The returned `Operation` type has the following method-specific fields:
      * - `metadata`: An empty [Struct
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#struct)
-     * - `response`: [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2.BatchUpdateIntentsResponse]
+     * - `response`:
+     * [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2.BatchUpdateIntentsResponse]
      * Note: You should always train an agent prior to sending it queries. See the
      * [training
      * documentation](https://cloud.google.com/dialogflow/es/docs/training).
@@ -826,7 +828,8 @@ public com.google.protobuf.Empty deleteIntent(
      * The returned `Operation` type has the following method-specific fields:
      * - `metadata`: An empty [Struct
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#struct)
-     * - `response`: [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2.BatchUpdateIntentsResponse]
+     * - `response`:
+     * [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2.BatchUpdateIntentsResponse]
      * Note: You should always train an agent prior to sending it queries. See the
      * [training
      * documentation](https://cloud.google.com/dialogflow/es/docs/training).
@@ -965,7 +968,8 @@ protected IntentsFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions c
      * The returned `Operation` type has the following method-specific fields:
      * - `metadata`: An empty [Struct
      *   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#struct)
-     * - `response`: [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2.BatchUpdateIntentsResponse]
+     * - `response`:
+     * [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2.BatchUpdateIntentsResponse]
      * Note: You should always train an agent prior to sending it queries. See the
      * [training
      * documentation](https://cloud.google.com/dialogflow/es/docs/training).
diff --git a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/KnowledgeBasesGrpc.java b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/KnowledgeBasesGrpc.java
index f720c5d066f0..6a7816fa80c3 100644
--- a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/KnowledgeBasesGrpc.java
+++ b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/KnowledgeBasesGrpc.java
@@ -21,7 +21,8 @@
  *
  *
  * <pre>
- * Service for managing [KnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBase].
+ * Service for managing
+ * [KnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBase].
  * </pre>
  */
 @javax.annotation.Generated(
@@ -315,7 +316,8 @@ public KnowledgeBasesFutureStub newStub(
    *
    *
    * <pre>
-   * Service for managing [KnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBase].
+   * Service for managing
+   * [KnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBase].
    * </pre>
    */
   public abstract static class KnowledgeBasesImplBase implements io.grpc.BindableService {
@@ -439,7 +441,8 @@ public final io.grpc.ServerServiceDefinition bindService() {
    *
    *
    * <pre>
-   * Service for managing [KnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBase].
+   * Service for managing
+   * [KnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBase].
    * </pre>
    */
   public static final class KnowledgeBasesStub
@@ -542,7 +545,8 @@ public void updateKnowledgeBase(
    *
    *
    * <pre>
-   * Service for managing [KnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBase].
+   * Service for managing
+   * [KnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBase].
    * </pre>
    */
   public static final class KnowledgeBasesBlockingStub
@@ -627,7 +631,8 @@ public com.google.cloud.dialogflow.v2.KnowledgeBase updateKnowledgeBase(
    *
    *
    * <pre>
-   * Service for managing [KnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBase].
+   * Service for managing
+   * [KnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBase].
    * </pre>
    */
   public static final class KnowledgeBasesFutureStub
diff --git a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesGrpc.java b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesGrpc.java
index af70f3e097d6..315de5a246d4 100644
--- a/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesGrpc.java
+++ b/java-dialogflow/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesGrpc.java
@@ -21,7 +21,8 @@
  *
  *
  * <pre>
- * Service for managing [SessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityType].
+ * Service for managing
+ * [SessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityType].
  * </pre>
  */
 @javax.annotation.Generated(
@@ -331,7 +332,8 @@ public SessionEntityTypesFutureStub newStub(
    *
    *
    * <pre>
-   * Service for managing [SessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityType].
+   * Service for managing
+   * [SessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityType].
    * </pre>
    */
   public abstract static class SessionEntityTypesImplBase implements io.grpc.BindableService {
@@ -472,7 +474,8 @@ public final io.grpc.ServerServiceDefinition bindService() {
    *
    *
    * <pre>
-   * Service for managing [SessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityType].
+   * Service for managing
+   * [SessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityType].
    * </pre>
    */
   public static final class SessionEntityTypesStub
@@ -593,7 +596,8 @@ public void deleteSessionEntityType(
    *
    *
    * <pre>
-   * Service for managing [SessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityType].
+   * Service for managing
+   * [SessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityType].
    * </pre>
    */
   public static final class SessionEntityTypesBlockingStub
@@ -696,7 +700,8 @@ public com.google.protobuf.Empty deleteSessionEntityType(
    *
    *
    * <pre>
-   * Service for managing [SessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityType].
+   * Service for managing
+   * [SessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityType].
    * </pre>
    */
   public static final class SessionEntityTypesFutureStub
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Agent.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Agent.java
index 28941f87a325..23ce80e8cf54 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Agent.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Agent.java
@@ -606,7 +606,9 @@ private Tier(int value) {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -661,7 +663,9 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
@@ -710,7 +714,9 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
   }
 
   public static final int DEFAULT_LANGUAGE_CODE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object defaultLanguageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object defaultLanguageCode_ = "";
   /**
    *
    *
@@ -767,6 +773,8 @@ public com.google.protobuf.ByteString getDefaultLanguageCodeBytes() {
   }
 
   public static final int SUPPORTED_LANGUAGE_CODES_FIELD_NUMBER = 4;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList supportedLanguageCodes_;
   /**
    *
@@ -836,7 +844,9 @@ public com.google.protobuf.ByteString getSupportedLanguageCodesBytes(int index)
   }
 
   public static final int TIME_ZONE_FIELD_NUMBER = 5;
-  private volatile java.lang.Object timeZone_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object timeZone_ = "";
   /**
    *
    *
@@ -889,7 +899,9 @@ public com.google.protobuf.ByteString getTimeZoneBytes() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 6;
-  private volatile java.lang.Object description_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object description_ = "";
   /**
    *
    *
@@ -940,7 +952,9 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
   }
 
   public static final int AVATAR_URI_FIELD_NUMBER = 7;
-  private volatile java.lang.Object avatarUri_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object avatarUri_ = "";
   /**
    *
    *
@@ -997,7 +1011,7 @@ public com.google.protobuf.ByteString getAvatarUriBytes() {
   }
 
   public static final int ENABLE_LOGGING_FIELD_NUMBER = 8;
-  private boolean enableLogging_;
+  private boolean enableLogging_ = false;
   /**
    *
    *
@@ -1015,7 +1029,7 @@ public boolean getEnableLogging() {
   }
 
   public static final int MATCH_MODE_FIELD_NUMBER = 9;
-  private int matchMode_;
+  private int matchMode_ = 0;
   /**
    *
    *
@@ -1028,7 +1042,7 @@ public boolean getEnableLogging() {
    * </code>
    *
    * @deprecated google.cloud.dialogflow.v2.Agent.match_mode is deprecated. See
-   *     google/cloud/dialogflow/v2/agent.proto;l=349
+   *     google/cloud/dialogflow/v2/agent.proto;l=353
    * @return The enum numeric value on the wire for matchMode.
    */
   @java.lang.Override
@@ -1048,20 +1062,19 @@ public int getMatchModeValue() {
    * </code>
    *
    * @deprecated google.cloud.dialogflow.v2.Agent.match_mode is deprecated. See
-   *     google/cloud/dialogflow/v2/agent.proto;l=349
+   *     google/cloud/dialogflow/v2/agent.proto;l=353
    * @return The matchMode.
    */
   @java.lang.Override
   @java.lang.Deprecated
   public com.google.cloud.dialogflow.v2.Agent.MatchMode getMatchMode() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.Agent.MatchMode result =
-        com.google.cloud.dialogflow.v2.Agent.MatchMode.valueOf(matchMode_);
+        com.google.cloud.dialogflow.v2.Agent.MatchMode.forNumber(matchMode_);
     return result == null ? com.google.cloud.dialogflow.v2.Agent.MatchMode.UNRECOGNIZED : result;
   }
 
   public static final int CLASSIFICATION_THRESHOLD_FIELD_NUMBER = 10;
-  private float classificationThreshold_;
+  private float classificationThreshold_ = 0F;
   /**
    *
    *
@@ -1085,7 +1098,7 @@ public float getClassificationThreshold() {
   }
 
   public static final int API_VERSION_FIELD_NUMBER = 14;
-  private int apiVersion_;
+  private int apiVersion_ = 0;
   /**
    *
    *
@@ -1124,14 +1137,13 @@ public int getApiVersionValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.Agent.ApiVersion getApiVersion() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.Agent.ApiVersion result =
-        com.google.cloud.dialogflow.v2.Agent.ApiVersion.valueOf(apiVersion_);
+        com.google.cloud.dialogflow.v2.Agent.ApiVersion.forNumber(apiVersion_);
     return result == null ? com.google.cloud.dialogflow.v2.Agent.ApiVersion.UNRECOGNIZED : result;
   }
 
   public static final int TIER_FIELD_NUMBER = 15;
-  private int tier_;
+  private int tier_ = 0;
   /**
    *
    *
@@ -1164,9 +1176,8 @@ public int getTierValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.Agent.Tier getTier() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.Agent.Tier result =
-        com.google.cloud.dialogflow.v2.Agent.Tier.valueOf(tier_);
+        com.google.cloud.dialogflow.v2.Agent.Tier.forNumber(tier_);
     return result == null ? com.google.cloud.dialogflow.v2.Agent.Tier.UNRECOGNIZED : result;
   }
 
@@ -1485,30 +1496,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       displayName_ = "";
-
       defaultLanguageCode_ = "";
-
       supportedLanguageCodes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000008);
       timeZone_ = "";
-
       description_ = "";
-
       avatarUri_ = "";
-
       enableLogging_ = false;
-
       matchMode_ = 0;
-
       classificationThreshold_ = 0F;
-
       apiVersion_ = 0;
-
       tier_ = 0;
-
       return this;
     }
 
@@ -1535,27 +1536,59 @@ public com.google.cloud.dialogflow.v2.Agent build() {
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.Agent buildPartial() {
       com.google.cloud.dialogflow.v2.Agent result = new com.google.cloud.dialogflow.v2.Agent(this);
-      int from_bitField0_ = bitField0_;
-      result.parent_ = parent_;
-      result.displayName_ = displayName_;
-      result.defaultLanguageCode_ = defaultLanguageCode_;
-      if (((bitField0_ & 0x00000001) != 0)) {
-        supportedLanguageCodes_ = supportedLanguageCodes_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000001);
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.supportedLanguageCodes_ = supportedLanguageCodes_;
-      result.timeZone_ = timeZone_;
-      result.description_ = description_;
-      result.avatarUri_ = avatarUri_;
-      result.enableLogging_ = enableLogging_;
-      result.matchMode_ = matchMode_;
-      result.classificationThreshold_ = classificationThreshold_;
-      result.apiVersion_ = apiVersion_;
-      result.tier_ = tier_;
       onBuilt();
       return result;
     }
 
+    private void buildPartialRepeatedFields(com.google.cloud.dialogflow.v2.Agent result) {
+      if (((bitField0_ & 0x00000008) != 0)) {
+        supportedLanguageCodes_ = supportedLanguageCodes_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000008);
+      }
+      result.supportedLanguageCodes_ = supportedLanguageCodes_;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.Agent result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.displayName_ = displayName_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.defaultLanguageCode_ = defaultLanguageCode_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.timeZone_ = timeZone_;
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.description_ = description_;
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.avatarUri_ = avatarUri_;
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.enableLogging_ = enableLogging_;
+      }
+      if (((from_bitField0_ & 0x00000100) != 0)) {
+        result.matchMode_ = matchMode_;
+      }
+      if (((from_bitField0_ & 0x00000200) != 0)) {
+        result.classificationThreshold_ = classificationThreshold_;
+      }
+      if (((from_bitField0_ & 0x00000400) != 0)) {
+        result.apiVersion_ = apiVersion_;
+      }
+      if (((from_bitField0_ & 0x00000800) != 0)) {
+        result.tier_ = tier_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -1603,20 +1636,23 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Agent other) {
       if (other == com.google.cloud.dialogflow.v2.Agent.getDefaultInstance()) return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getDefaultLanguageCode().isEmpty()) {
         defaultLanguageCode_ = other.defaultLanguageCode_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.supportedLanguageCodes_.isEmpty()) {
         if (supportedLanguageCodes_.isEmpty()) {
           supportedLanguageCodes_ = other.supportedLanguageCodes_;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000008);
         } else {
           ensureSupportedLanguageCodesIsMutable();
           supportedLanguageCodes_.addAll(other.supportedLanguageCodes_);
@@ -1625,14 +1661,17 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Agent other) {
       }
       if (!other.getTimeZone().isEmpty()) {
         timeZone_ = other.timeZone_;
+        bitField0_ |= 0x00000010;
         onChanged();
       }
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
+        bitField0_ |= 0x00000020;
         onChanged();
       }
       if (!other.getAvatarUri().isEmpty()) {
         avatarUri_ = other.avatarUri_;
+        bitField0_ |= 0x00000040;
         onChanged();
       }
       if (other.getEnableLogging() != false) {
@@ -1679,19 +1718,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 displayName_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 defaultLanguageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
@@ -1704,49 +1743,49 @@ public Builder mergeFrom(
             case 42:
               {
                 timeZone_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             case 50:
               {
                 description_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 50
             case 58:
               {
                 avatarUri_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 58
             case 64:
               {
                 enableLogging_ = input.readBool();
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 64
             case 72:
               {
                 matchMode_ = input.readEnum();
-
+                bitField0_ |= 0x00000100;
                 break;
               } // case 72
             case 85:
               {
                 classificationThreshold_ = input.readFloat();
-
+                bitField0_ |= 0x00000200;
                 break;
               } // case 85
             case 112:
               {
                 apiVersion_ = input.readEnum();
-
+                bitField0_ |= 0x00000400;
                 break;
               } // case 112
             case 120:
               {
                 tier_ = input.readEnum();
-
+                bitField0_ |= 0x00000800;
                 break;
               } // case 120
             default:
@@ -1838,8 +1877,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1858,8 +1897,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1883,8 +1922,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1950,8 +1989,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1967,8 +2006,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
-
       displayName_ = getDefaultInstance().getDisplayName();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1989,8 +2028,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -2068,8 +2107,8 @@ public Builder setDefaultLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       defaultLanguageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2089,8 +2128,8 @@ public Builder setDefaultLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDefaultLanguageCode() {
-
       defaultLanguageCode_ = getDefaultInstance().getDefaultLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -2115,8 +2154,8 @@ public Builder setDefaultLanguageCodeBytes(com.google.protobuf.ByteString value)
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       defaultLanguageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2125,10 +2164,10 @@ public Builder setDefaultLanguageCodeBytes(com.google.protobuf.ByteString value)
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureSupportedLanguageCodesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         supportedLanguageCodes_ =
             new com.google.protobuf.LazyStringArrayList(supportedLanguageCodes_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000008;
       }
     }
     /**
@@ -2279,7 +2318,7 @@ public Builder addAllSupportedLanguageCodes(java.lang.Iterable<java.lang.String>
      */
     public Builder clearSupportedLanguageCodes() {
       supportedLanguageCodes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -2375,8 +2414,8 @@ public Builder setTimeZone(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       timeZone_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2394,8 +2433,8 @@ public Builder setTimeZone(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTimeZone() {
-
       timeZone_ = getDefaultInstance().getTimeZone();
+      bitField0_ = (bitField0_ & ~0x00000010);
       onChanged();
       return this;
     }
@@ -2418,8 +2457,8 @@ public Builder setTimeZoneBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       timeZone_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2488,8 +2527,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       description_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2506,8 +2545,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
-
       description_ = getDefaultInstance().getDescription();
+      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -2529,8 +2568,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       description_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2608,8 +2647,8 @@ public Builder setAvatarUri(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       avatarUri_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2629,8 +2668,8 @@ public Builder setAvatarUri(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAvatarUri() {
-
       avatarUri_ = getDefaultInstance().getAvatarUri();
+      bitField0_ = (bitField0_ & ~0x00000040);
       onChanged();
       return this;
     }
@@ -2655,8 +2694,8 @@ public Builder setAvatarUriBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       avatarUri_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2692,6 +2731,7 @@ public boolean getEnableLogging() {
     public Builder setEnableLogging(boolean value) {
 
       enableLogging_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2707,7 +2747,7 @@ public Builder setEnableLogging(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearEnableLogging() {
-
+      bitField0_ = (bitField0_ & ~0x00000080);
       enableLogging_ = false;
       onChanged();
       return this;
@@ -2726,7 +2766,7 @@ public Builder clearEnableLogging() {
      * </code>
      *
      * @deprecated google.cloud.dialogflow.v2.Agent.match_mode is deprecated. See
-     *     google/cloud/dialogflow/v2/agent.proto;l=349
+     *     google/cloud/dialogflow/v2/agent.proto;l=353
      * @return The enum numeric value on the wire for matchMode.
      */
     @java.lang.Override
@@ -2746,14 +2786,14 @@ public int getMatchModeValue() {
      * </code>
      *
      * @deprecated google.cloud.dialogflow.v2.Agent.match_mode is deprecated. See
-     *     google/cloud/dialogflow/v2/agent.proto;l=349
+     *     google/cloud/dialogflow/v2/agent.proto;l=353
      * @param value The enum numeric value on the wire for matchMode to set.
      * @return This builder for chaining.
      */
     @java.lang.Deprecated
     public Builder setMatchModeValue(int value) {
-
       matchMode_ = value;
+      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -2769,15 +2809,14 @@ public Builder setMatchModeValue(int value) {
      * </code>
      *
      * @deprecated google.cloud.dialogflow.v2.Agent.match_mode is deprecated. See
-     *     google/cloud/dialogflow/v2/agent.proto;l=349
+     *     google/cloud/dialogflow/v2/agent.proto;l=353
      * @return The matchMode.
      */
     @java.lang.Override
     @java.lang.Deprecated
     public com.google.cloud.dialogflow.v2.Agent.MatchMode getMatchMode() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.Agent.MatchMode result =
-          com.google.cloud.dialogflow.v2.Agent.MatchMode.valueOf(matchMode_);
+          com.google.cloud.dialogflow.v2.Agent.MatchMode.forNumber(matchMode_);
       return result == null ? com.google.cloud.dialogflow.v2.Agent.MatchMode.UNRECOGNIZED : result;
     }
     /**
@@ -2792,7 +2831,7 @@ public com.google.cloud.dialogflow.v2.Agent.MatchMode getMatchMode() {
      * </code>
      *
      * @deprecated google.cloud.dialogflow.v2.Agent.match_mode is deprecated. See
-     *     google/cloud/dialogflow/v2/agent.proto;l=349
+     *     google/cloud/dialogflow/v2/agent.proto;l=353
      * @param value The matchMode to set.
      * @return This builder for chaining.
      */
@@ -2801,7 +2840,7 @@ public Builder setMatchMode(com.google.cloud.dialogflow.v2.Agent.MatchMode value
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000100;
       matchMode_ = value.getNumber();
       onChanged();
       return this;
@@ -2818,12 +2857,12 @@ public Builder setMatchMode(com.google.cloud.dialogflow.v2.Agent.MatchMode value
      * </code>
      *
      * @deprecated google.cloud.dialogflow.v2.Agent.match_mode is deprecated. See
-     *     google/cloud/dialogflow/v2/agent.proto;l=349
+     *     google/cloud/dialogflow/v2/agent.proto;l=353
      * @return This builder for chaining.
      */
     @java.lang.Deprecated
     public Builder clearMatchMode() {
-
+      bitField0_ = (bitField0_ & ~0x00000100);
       matchMode_ = 0;
       onChanged();
       return this;
@@ -2872,6 +2911,7 @@ public float getClassificationThreshold() {
     public Builder setClassificationThreshold(float value) {
 
       classificationThreshold_ = value;
+      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -2893,7 +2933,7 @@ public Builder setClassificationThreshold(float value) {
      * @return This builder for chaining.
      */
     public Builder clearClassificationThreshold() {
-
+      bitField0_ = (bitField0_ & ~0x00000200);
       classificationThreshold_ = 0F;
       onChanged();
       return this;
@@ -2938,8 +2978,8 @@ public int getApiVersionValue() {
      * @return This builder for chaining.
      */
     public Builder setApiVersionValue(int value) {
-
       apiVersion_ = value;
+      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -2961,9 +3001,8 @@ public Builder setApiVersionValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.Agent.ApiVersion getApiVersion() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.Agent.ApiVersion result =
-          com.google.cloud.dialogflow.v2.Agent.ApiVersion.valueOf(apiVersion_);
+          com.google.cloud.dialogflow.v2.Agent.ApiVersion.forNumber(apiVersion_);
       return result == null ? com.google.cloud.dialogflow.v2.Agent.ApiVersion.UNRECOGNIZED : result;
     }
     /**
@@ -2987,7 +3026,7 @@ public Builder setApiVersion(com.google.cloud.dialogflow.v2.Agent.ApiVersion val
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000400;
       apiVersion_ = value.getNumber();
       onChanged();
       return this;
@@ -3009,7 +3048,7 @@ public Builder setApiVersion(com.google.cloud.dialogflow.v2.Agent.ApiVersion val
      * @return This builder for chaining.
      */
     public Builder clearApiVersion() {
-
+      bitField0_ = (bitField0_ & ~0x00000400);
       apiVersion_ = 0;
       onChanged();
       return this;
@@ -3048,8 +3087,8 @@ public int getTierValue() {
      * @return This builder for chaining.
      */
     public Builder setTierValue(int value) {
-
       tier_ = value;
+      bitField0_ |= 0x00000800;
       onChanged();
       return this;
     }
@@ -3068,9 +3107,8 @@ public Builder setTierValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.Agent.Tier getTier() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.Agent.Tier result =
-          com.google.cloud.dialogflow.v2.Agent.Tier.valueOf(tier_);
+          com.google.cloud.dialogflow.v2.Agent.Tier.forNumber(tier_);
       return result == null ? com.google.cloud.dialogflow.v2.Agent.Tier.UNRECOGNIZED : result;
     }
     /**
@@ -3091,7 +3129,7 @@ public Builder setTier(com.google.cloud.dialogflow.v2.Agent.Tier value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000800;
       tier_ = value.getNumber();
       onChanged();
       return this;
@@ -3110,7 +3148,7 @@ public Builder setTier(com.google.cloud.dialogflow.v2.Agent.Tier value) {
      * @return This builder for chaining.
      */
     public Builder clearTier() {
-
+      bitField0_ = (bitField0_ & ~0x00000800);
       tier_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentAssistantFeedback.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentAssistantFeedback.java
index 4e9d891c495d..7ff5019bf1e8 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentAssistantFeedback.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentAssistantFeedback.java
@@ -554,8 +554,1270 @@ private DocumentEfficiency(int value) {
     // @@protoc_insertion_point(enum_scope:google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency)
   }
 
+  public interface SummarizationFeedbackOrBuilder
+      extends
+      // @@protoc_insertion_point(interface_extends:google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     *
+     *
+     * <pre>
+     * Timestamp when composing of the summary starts.
+     * </pre>
+     *
+     * <code>.google.protobuf.Timestamp start_time = 1;</code>
+     *
+     * @return Whether the startTime field is set.
+     */
+    boolean hasStartTime();
+    /**
+     *
+     *
+     * <pre>
+     * Timestamp when composing of the summary starts.
+     * </pre>
+     *
+     * <code>.google.protobuf.Timestamp start_time = 1;</code>
+     *
+     * @return The startTime.
+     */
+    com.google.protobuf.Timestamp getStartTime();
+    /**
+     *
+     *
+     * <pre>
+     * Timestamp when composing of the summary starts.
+     * </pre>
+     *
+     * <code>.google.protobuf.Timestamp start_time = 1;</code>
+     */
+    com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder();
+
+    /**
+     *
+     *
+     * <pre>
+     * Timestamp when the summary was submitted.
+     * </pre>
+     *
+     * <code>.google.protobuf.Timestamp submit_time = 2;</code>
+     *
+     * @return Whether the submitTime field is set.
+     */
+    boolean hasSubmitTime();
+    /**
+     *
+     *
+     * <pre>
+     * Timestamp when the summary was submitted.
+     * </pre>
+     *
+     * <code>.google.protobuf.Timestamp submit_time = 2;</code>
+     *
+     * @return The submitTime.
+     */
+    com.google.protobuf.Timestamp getSubmitTime();
+    /**
+     *
+     *
+     * <pre>
+     * Timestamp when the summary was submitted.
+     * </pre>
+     *
+     * <code>.google.protobuf.Timestamp submit_time = 2;</code>
+     */
+    com.google.protobuf.TimestampOrBuilder getSubmitTimeOrBuilder();
+
+    /**
+     *
+     *
+     * <pre>
+     * Text of actual submitted summary.
+     * </pre>
+     *
+     * <code>string summary_text = 3;</code>
+     *
+     * @return The summaryText.
+     */
+    java.lang.String getSummaryText();
+    /**
+     *
+     *
+     * <pre>
+     * Text of actual submitted summary.
+     * </pre>
+     *
+     * <code>string summary_text = 3;</code>
+     *
+     * @return The bytes for summaryText.
+     */
+    com.google.protobuf.ByteString getSummaryTextBytes();
+  }
+  /**
+   *
+   *
+   * <pre>
+   * Feedback for conversation summarization.
+   * </pre>
+   *
+   * Protobuf type {@code google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback}
+   */
+  public static final class SummarizationFeedback extends com.google.protobuf.GeneratedMessageV3
+      implements
+      // @@protoc_insertion_point(message_implements:google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback)
+      SummarizationFeedbackOrBuilder {
+    private static final long serialVersionUID = 0L;
+    // Use SummarizationFeedback.newBuilder() to construct.
+    private SummarizationFeedback(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+
+    private SummarizationFeedback() {
+      summaryText_ = "";
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+      return new SummarizationFeedback();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.cloud.dialogflow.v2.AnswerRecordsProto
+          .internal_static_google_cloud_dialogflow_v2_AgentAssistantFeedback_SummarizationFeedback_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.dialogflow.v2.AnswerRecordsProto
+          .internal_static_google_cloud_dialogflow_v2_AgentAssistantFeedback_SummarizationFeedback_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback.class,
+              com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback.Builder
+                  .class);
+    }
+
+    public static final int START_TIME_FIELD_NUMBER = 1;
+    private com.google.protobuf.Timestamp startTime_;
+    /**
+     *
+     *
+     * <pre>
+     * Timestamp when composing of the summary starts.
+     * </pre>
+     *
+     * <code>.google.protobuf.Timestamp start_time = 1;</code>
+     *
+     * @return Whether the startTime field is set.
+     */
+    @java.lang.Override
+    public boolean hasStartTime() {
+      return startTime_ != null;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Timestamp when composing of the summary starts.
+     * </pre>
+     *
+     * <code>.google.protobuf.Timestamp start_time = 1;</code>
+     *
+     * @return The startTime.
+     */
+    @java.lang.Override
+    public com.google.protobuf.Timestamp getStartTime() {
+      return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Timestamp when composing of the summary starts.
+     * </pre>
+     *
+     * <code>.google.protobuf.Timestamp start_time = 1;</code>
+     */
+    @java.lang.Override
+    public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
+      return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_;
+    }
+
+    public static final int SUBMIT_TIME_FIELD_NUMBER = 2;
+    private com.google.protobuf.Timestamp submitTime_;
+    /**
+     *
+     *
+     * <pre>
+     * Timestamp when the summary was submitted.
+     * </pre>
+     *
+     * <code>.google.protobuf.Timestamp submit_time = 2;</code>
+     *
+     * @return Whether the submitTime field is set.
+     */
+    @java.lang.Override
+    public boolean hasSubmitTime() {
+      return submitTime_ != null;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Timestamp when the summary was submitted.
+     * </pre>
+     *
+     * <code>.google.protobuf.Timestamp submit_time = 2;</code>
+     *
+     * @return The submitTime.
+     */
+    @java.lang.Override
+    public com.google.protobuf.Timestamp getSubmitTime() {
+      return submitTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : submitTime_;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Timestamp when the summary was submitted.
+     * </pre>
+     *
+     * <code>.google.protobuf.Timestamp submit_time = 2;</code>
+     */
+    @java.lang.Override
+    public com.google.protobuf.TimestampOrBuilder getSubmitTimeOrBuilder() {
+      return submitTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : submitTime_;
+    }
+
+    public static final int SUMMARY_TEXT_FIELD_NUMBER = 3;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object summaryText_ = "";
+    /**
+     *
+     *
+     * <pre>
+     * Text of actual submitted summary.
+     * </pre>
+     *
+     * <code>string summary_text = 3;</code>
+     *
+     * @return The summaryText.
+     */
+    @java.lang.Override
+    public java.lang.String getSummaryText() {
+      java.lang.Object ref = summaryText_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        summaryText_ = s;
+        return s;
+      }
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Text of actual submitted summary.
+     * </pre>
+     *
+     * <code>string summary_text = 3;</code>
+     *
+     * @return The bytes for summaryText.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getSummaryTextBytes() {
+      java.lang.Object ref = summaryText_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        summaryText_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    private byte memoizedIsInitialized = -1;
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+      if (startTime_ != null) {
+        output.writeMessage(1, getStartTime());
+      }
+      if (submitTime_ != null) {
+        output.writeMessage(2, getSubmitTime());
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(summaryText_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, summaryText_);
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (startTime_ != null) {
+        size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getStartTime());
+      }
+      if (submitTime_ != null) {
+        size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getSubmitTime());
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(summaryText_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, summaryText_);
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+        return true;
+      }
+      if (!(obj
+          instanceof com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback)) {
+        return super.equals(obj);
+      }
+      com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback other =
+          (com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback) obj;
+
+      if (hasStartTime() != other.hasStartTime()) return false;
+      if (hasStartTime()) {
+        if (!getStartTime().equals(other.getStartTime())) return false;
+      }
+      if (hasSubmitTime() != other.hasSubmitTime()) return false;
+      if (hasSubmitTime()) {
+        if (!getSubmitTime().equals(other.getSubmitTime())) return false;
+      }
+      if (!getSummaryText().equals(other.getSummaryText())) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasStartTime()) {
+        hash = (37 * hash) + START_TIME_FIELD_NUMBER;
+        hash = (53 * hash) + getStartTime().hashCode();
+      }
+      if (hasSubmitTime()) {
+        hash = (37 * hash) + SUBMIT_TIME_FIELD_NUMBER;
+        hash = (53 * hash) + getSubmitTime().hashCode();
+      }
+      hash = (37 * hash) + SUMMARY_TEXT_FIELD_NUMBER;
+      hash = (53 * hash) + getSummaryText().hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+        parseFrom(java.nio.ByteBuffer data)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+        parseFrom(
+            java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+        parseFrom(com.google.protobuf.ByteString data)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+        parseFrom(
+            com.google.protobuf.ByteString data,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+        parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+        parseFrom(byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+        parseFrom(java.io.InputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    }
+
+    public static com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+        parseFrom(
+            java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    }
+
+    public static com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+        parseDelimitedFrom(
+            java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+        parseFrom(com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    }
+
+    public static com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+        parseFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() {
+      return newBuilder();
+    }
+
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+
+    public static Builder newBuilder(
+        com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Feedback for conversation summarization.
+     * </pre>
+     *
+     * Protobuf type {@code google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback}
+     */
+    public static final class Builder
+        extends com.google.protobuf.GeneratedMessageV3.Builder<Builder>
+        implements
+        // @@protoc_insertion_point(builder_implements:google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback)
+        com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedbackOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+        return com.google.cloud.dialogflow.v2.AnswerRecordsProto
+            .internal_static_google_cloud_dialogflow_v2_AgentAssistantFeedback_SummarizationFeedback_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.cloud.dialogflow.v2.AnswerRecordsProto
+            .internal_static_google_cloud_dialogflow_v2_AgentAssistantFeedback_SummarizationFeedback_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback.class,
+                com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback.Builder
+                    .class);
+      }
+
+      // Construct using
+      // com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback.newBuilder()
+      private Builder() {}
+
+      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+      }
+
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        bitField0_ = 0;
+        startTime_ = null;
+        if (startTimeBuilder_ != null) {
+          startTimeBuilder_.dispose();
+          startTimeBuilder_ = null;
+        }
+        submitTime_ = null;
+        if (submitTimeBuilder_ != null) {
+          submitTimeBuilder_.dispose();
+          submitTimeBuilder_ = null;
+        }
+        summaryText_ = "";
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+        return com.google.cloud.dialogflow.v2.AnswerRecordsProto
+            .internal_static_google_cloud_dialogflow_v2_AgentAssistantFeedback_SummarizationFeedback_descriptor;
+      }
+
+      @java.lang.Override
+      public com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+          getDefaultInstanceForType() {
+        return com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+            .getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback build() {
+        com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback result =
+            buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+          buildPartial() {
+        com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback result =
+            new com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback(this);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.startTime_ = startTimeBuilder_ == null ? startTime_ : startTimeBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.submitTime_ =
+              submitTimeBuilder_ == null ? submitTime_ : submitTimeBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.summaryText_ = summaryText_;
+        }
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other
+            instanceof
+            com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback) {
+          return mergeFrom(
+              (com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback) other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(
+          com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback other) {
+        if (other
+            == com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+                .getDefaultInstance()) return this;
+        if (other.hasStartTime()) {
+          mergeStartTime(other.getStartTime());
+        }
+        if (other.hasSubmitTime()) {
+          mergeSubmitTime(other.getSubmitTime());
+        }
+        if (!other.getSummaryText().isEmpty()) {
+          summaryText_ = other.summaryText_;
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10:
+                {
+                  input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry);
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+              case 18:
+                {
+                  input.readMessage(getSubmitTimeFieldBuilder().getBuilder(), extensionRegistry);
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+              case 26:
+                {
+                  summaryText_ = input.readStringRequireUtf8();
+                  bitField0_ |= 0x00000004;
+                  break;
+                } // case 26
+              default:
+                {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.unwrapIOException();
+        } finally {
+          onChanged();
+        } // finally
+        return this;
+      }
+
+      private int bitField0_;
+
+      private com.google.protobuf.Timestamp startTime_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+              com.google.protobuf.Timestamp,
+              com.google.protobuf.Timestamp.Builder,
+              com.google.protobuf.TimestampOrBuilder>
+          startTimeBuilder_;
+      /**
+       *
+       *
+       * <pre>
+       * Timestamp when composing of the summary starts.
+       * </pre>
+       *
+       * <code>.google.protobuf.Timestamp start_time = 1;</code>
+       *
+       * @return Whether the startTime field is set.
+       */
+      public boolean hasStartTime() {
+        return ((bitField0_ & 0x00000001) != 0);
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Timestamp when composing of the summary starts.
+       * </pre>
+       *
+       * <code>.google.protobuf.Timestamp start_time = 1;</code>
+       *
+       * @return The startTime.
+       */
+      public com.google.protobuf.Timestamp getStartTime() {
+        if (startTimeBuilder_ == null) {
+          return startTime_ == null
+              ? com.google.protobuf.Timestamp.getDefaultInstance()
+              : startTime_;
+        } else {
+          return startTimeBuilder_.getMessage();
+        }
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Timestamp when composing of the summary starts.
+       * </pre>
+       *
+       * <code>.google.protobuf.Timestamp start_time = 1;</code>
+       */
+      public Builder setStartTime(com.google.protobuf.Timestamp value) {
+        if (startTimeBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          startTime_ = value;
+        } else {
+          startTimeBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Timestamp when composing of the summary starts.
+       * </pre>
+       *
+       * <code>.google.protobuf.Timestamp start_time = 1;</code>
+       */
+      public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValue) {
+        if (startTimeBuilder_ == null) {
+          startTime_ = builderForValue.build();
+        } else {
+          startTimeBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Timestamp when composing of the summary starts.
+       * </pre>
+       *
+       * <code>.google.protobuf.Timestamp start_time = 1;</code>
+       */
+      public Builder mergeStartTime(com.google.protobuf.Timestamp value) {
+        if (startTimeBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)
+              && startTime_ != null
+              && startTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+            getStartTimeBuilder().mergeFrom(value);
+          } else {
+            startTime_ = value;
+          }
+        } else {
+          startTimeBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Timestamp when composing of the summary starts.
+       * </pre>
+       *
+       * <code>.google.protobuf.Timestamp start_time = 1;</code>
+       */
+      public Builder clearStartTime() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        startTime_ = null;
+        if (startTimeBuilder_ != null) {
+          startTimeBuilder_.dispose();
+          startTimeBuilder_ = null;
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Timestamp when composing of the summary starts.
+       * </pre>
+       *
+       * <code>.google.protobuf.Timestamp start_time = 1;</code>
+       */
+      public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() {
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return getStartTimeFieldBuilder().getBuilder();
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Timestamp when composing of the summary starts.
+       * </pre>
+       *
+       * <code>.google.protobuf.Timestamp start_time = 1;</code>
+       */
+      public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
+        if (startTimeBuilder_ != null) {
+          return startTimeBuilder_.getMessageOrBuilder();
+        } else {
+          return startTime_ == null
+              ? com.google.protobuf.Timestamp.getDefaultInstance()
+              : startTime_;
+        }
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Timestamp when composing of the summary starts.
+       * </pre>
+       *
+       * <code>.google.protobuf.Timestamp start_time = 1;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+              com.google.protobuf.Timestamp,
+              com.google.protobuf.Timestamp.Builder,
+              com.google.protobuf.TimestampOrBuilder>
+          getStartTimeFieldBuilder() {
+        if (startTimeBuilder_ == null) {
+          startTimeBuilder_ =
+              new com.google.protobuf.SingleFieldBuilderV3<
+                  com.google.protobuf.Timestamp,
+                  com.google.protobuf.Timestamp.Builder,
+                  com.google.protobuf.TimestampOrBuilder>(
+                  getStartTime(), getParentForChildren(), isClean());
+          startTime_ = null;
+        }
+        return startTimeBuilder_;
+      }
+
+      private com.google.protobuf.Timestamp submitTime_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+              com.google.protobuf.Timestamp,
+              com.google.protobuf.Timestamp.Builder,
+              com.google.protobuf.TimestampOrBuilder>
+          submitTimeBuilder_;
+      /**
+       *
+       *
+       * <pre>
+       * Timestamp when the summary was submitted.
+       * </pre>
+       *
+       * <code>.google.protobuf.Timestamp submit_time = 2;</code>
+       *
+       * @return Whether the submitTime field is set.
+       */
+      public boolean hasSubmitTime() {
+        return ((bitField0_ & 0x00000002) != 0);
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Timestamp when the summary was submitted.
+       * </pre>
+       *
+       * <code>.google.protobuf.Timestamp submit_time = 2;</code>
+       *
+       * @return The submitTime.
+       */
+      public com.google.protobuf.Timestamp getSubmitTime() {
+        if (submitTimeBuilder_ == null) {
+          return submitTime_ == null
+              ? com.google.protobuf.Timestamp.getDefaultInstance()
+              : submitTime_;
+        } else {
+          return submitTimeBuilder_.getMessage();
+        }
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Timestamp when the summary was submitted.
+       * </pre>
+       *
+       * <code>.google.protobuf.Timestamp submit_time = 2;</code>
+       */
+      public Builder setSubmitTime(com.google.protobuf.Timestamp value) {
+        if (submitTimeBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          submitTime_ = value;
+        } else {
+          submitTimeBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Timestamp when the summary was submitted.
+       * </pre>
+       *
+       * <code>.google.protobuf.Timestamp submit_time = 2;</code>
+       */
+      public Builder setSubmitTime(com.google.protobuf.Timestamp.Builder builderForValue) {
+        if (submitTimeBuilder_ == null) {
+          submitTime_ = builderForValue.build();
+        } else {
+          submitTimeBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Timestamp when the summary was submitted.
+       * </pre>
+       *
+       * <code>.google.protobuf.Timestamp submit_time = 2;</code>
+       */
+      public Builder mergeSubmitTime(com.google.protobuf.Timestamp value) {
+        if (submitTimeBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) != 0)
+              && submitTime_ != null
+              && submitTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+            getSubmitTimeBuilder().mergeFrom(value);
+          } else {
+            submitTime_ = value;
+          }
+        } else {
+          submitTimeBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000002;
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Timestamp when the summary was submitted.
+       * </pre>
+       *
+       * <code>.google.protobuf.Timestamp submit_time = 2;</code>
+       */
+      public Builder clearSubmitTime() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        submitTime_ = null;
+        if (submitTimeBuilder_ != null) {
+          submitTimeBuilder_.dispose();
+          submitTimeBuilder_ = null;
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Timestamp when the summary was submitted.
+       * </pre>
+       *
+       * <code>.google.protobuf.Timestamp submit_time = 2;</code>
+       */
+      public com.google.protobuf.Timestamp.Builder getSubmitTimeBuilder() {
+        bitField0_ |= 0x00000002;
+        onChanged();
+        return getSubmitTimeFieldBuilder().getBuilder();
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Timestamp when the summary was submitted.
+       * </pre>
+       *
+       * <code>.google.protobuf.Timestamp submit_time = 2;</code>
+       */
+      public com.google.protobuf.TimestampOrBuilder getSubmitTimeOrBuilder() {
+        if (submitTimeBuilder_ != null) {
+          return submitTimeBuilder_.getMessageOrBuilder();
+        } else {
+          return submitTime_ == null
+              ? com.google.protobuf.Timestamp.getDefaultInstance()
+              : submitTime_;
+        }
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Timestamp when the summary was submitted.
+       * </pre>
+       *
+       * <code>.google.protobuf.Timestamp submit_time = 2;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+              com.google.protobuf.Timestamp,
+              com.google.protobuf.Timestamp.Builder,
+              com.google.protobuf.TimestampOrBuilder>
+          getSubmitTimeFieldBuilder() {
+        if (submitTimeBuilder_ == null) {
+          submitTimeBuilder_ =
+              new com.google.protobuf.SingleFieldBuilderV3<
+                  com.google.protobuf.Timestamp,
+                  com.google.protobuf.Timestamp.Builder,
+                  com.google.protobuf.TimestampOrBuilder>(
+                  getSubmitTime(), getParentForChildren(), isClean());
+          submitTime_ = null;
+        }
+        return submitTimeBuilder_;
+      }
+
+      private java.lang.Object summaryText_ = "";
+      /**
+       *
+       *
+       * <pre>
+       * Text of actual submitted summary.
+       * </pre>
+       *
+       * <code>string summary_text = 3;</code>
+       *
+       * @return The summaryText.
+       */
+      public java.lang.String getSummaryText() {
+        java.lang.Object ref = summaryText_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          summaryText_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Text of actual submitted summary.
+       * </pre>
+       *
+       * <code>string summary_text = 3;</code>
+       *
+       * @return The bytes for summaryText.
+       */
+      public com.google.protobuf.ByteString getSummaryTextBytes() {
+        java.lang.Object ref = summaryText_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b =
+              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+          summaryText_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Text of actual submitted summary.
+       * </pre>
+       *
+       * <code>string summary_text = 3;</code>
+       *
+       * @param value The summaryText to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSummaryText(java.lang.String value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        summaryText_ = value;
+        bitField0_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Text of actual submitted summary.
+       * </pre>
+       *
+       * <code>string summary_text = 3;</code>
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearSummaryText() {
+        summaryText_ = getDefaultInstance().getSummaryText();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Text of actual submitted summary.
+       * </pre>
+       *
+       * <code>string summary_text = 3;</code>
+       *
+       * @param value The bytes for summaryText to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSummaryTextBytes(com.google.protobuf.ByteString value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        checkByteStringIsUtf8(value);
+        summaryText_ = value;
+        bitField0_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+      // @@protoc_insertion_point(builder_scope:google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback)
+    }
+
+    // @@protoc_insertion_point(class_scope:google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback)
+    private static final com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+        DEFAULT_INSTANCE;
+
+    static {
+      DEFAULT_INSTANCE =
+          new com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback();
+    }
+
+    public static com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+        getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<SummarizationFeedback> PARSER =
+        new com.google.protobuf.AbstractParser<SummarizationFeedback>() {
+          @java.lang.Override
+          public SummarizationFeedback parsePartialFrom(
+              com.google.protobuf.CodedInputStream input,
+              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+              throws com.google.protobuf.InvalidProtocolBufferException {
+            Builder builder = newBuilder();
+            try {
+              builder.mergeFrom(input, extensionRegistry);
+            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+              throw e.setUnfinishedMessage(builder.buildPartial());
+            } catch (com.google.protobuf.UninitializedMessageException e) {
+              throw e.asInvalidProtocolBufferException()
+                  .setUnfinishedMessage(builder.buildPartial());
+            } catch (java.io.IOException e) {
+              throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                  .setUnfinishedMessage(builder.buildPartial());
+            }
+            return builder.buildPartial();
+          }
+        };
+
+    public static com.google.protobuf.Parser<SummarizationFeedback> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<SummarizationFeedback> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+        getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+  }
+
   public static final int ANSWER_RELEVANCE_FIELD_NUMBER = 1;
-  private int answerRelevance_;
+  private int answerRelevance_ = 0;
   /**
    *
    *
@@ -599,9 +1861,8 @@ public int getAnswerRelevanceValue() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.AgentAssistantFeedback.AnswerRelevance
       getAnswerRelevance() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.AgentAssistantFeedback.AnswerRelevance result =
-        com.google.cloud.dialogflow.v2.AgentAssistantFeedback.AnswerRelevance.valueOf(
+        com.google.cloud.dialogflow.v2.AgentAssistantFeedback.AnswerRelevance.forNumber(
             answerRelevance_);
     return result == null
         ? com.google.cloud.dialogflow.v2.AgentAssistantFeedback.AnswerRelevance.UNRECOGNIZED
@@ -609,7 +1870,7 @@ public int getAnswerRelevanceValue() {
   }
 
   public static final int DOCUMENT_CORRECTNESS_FIELD_NUMBER = 2;
-  private int documentCorrectness_;
+  private int documentCorrectness_ = 0;
   /**
    *
    *
@@ -655,9 +1916,8 @@ public int getDocumentCorrectnessValue() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentCorrectness
       getDocumentCorrectness() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentCorrectness result =
-        com.google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentCorrectness.valueOf(
+        com.google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentCorrectness.forNumber(
             documentCorrectness_);
     return result == null
         ? com.google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentCorrectness.UNRECOGNIZED
@@ -665,14 +1925,16 @@ public int getDocumentCorrectnessValue() {
   }
 
   public static final int DOCUMENT_EFFICIENCY_FIELD_NUMBER = 3;
-  private int documentEfficiency_;
+  private int documentEfficiency_ = 0;
   /**
    *
    *
    * <pre>
    * Optional. Whether or not the suggested document is efficient. For example,
    * if the document is poorly written, hard to understand, hard to use or
-   * too long to find useful information, [document_efficiency][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_efficiency] is
+   * too long to find useful information,
+   * [document_efficiency][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_efficiency]
+   * is
    * [DocumentEfficiency.INEFFICIENT][google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency.INEFFICIENT].
    * </pre>
    *
@@ -692,7 +1954,9 @@ public int getDocumentEfficiencyValue() {
    * <pre>
    * Optional. Whether or not the suggested document is efficient. For example,
    * if the document is poorly written, hard to understand, hard to use or
-   * too long to find useful information, [document_efficiency][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_efficiency] is
+   * too long to find useful information,
+   * [document_efficiency][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_efficiency]
+   * is
    * [DocumentEfficiency.INEFFICIENT][google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency.INEFFICIENT].
    * </pre>
    *
@@ -705,15 +1969,75 @@ public int getDocumentEfficiencyValue() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency
       getDocumentEfficiency() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency result =
-        com.google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency.valueOf(
+        com.google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency.forNumber(
             documentEfficiency_);
     return result == null
         ? com.google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency.UNRECOGNIZED
         : result;
   }
 
+  public static final int SUMMARIZATION_FEEDBACK_FIELD_NUMBER = 4;
+  private com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+      summarizationFeedback_;
+  /**
+   *
+   *
+   * <pre>
+   * Optional. Feedback for conversation summarization.
+   * </pre>
+   *
+   * <code>
+   * .google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback summarization_feedback = 4 [(.google.api.field_behavior) = OPTIONAL];
+   * </code>
+   *
+   * @return Whether the summarizationFeedback field is set.
+   */
+  @java.lang.Override
+  public boolean hasSummarizationFeedback() {
+    return summarizationFeedback_ != null;
+  }
+  /**
+   *
+   *
+   * <pre>
+   * Optional. Feedback for conversation summarization.
+   * </pre>
+   *
+   * <code>
+   * .google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback summarization_feedback = 4 [(.google.api.field_behavior) = OPTIONAL];
+   * </code>
+   *
+   * @return The summarizationFeedback.
+   */
+  @java.lang.Override
+  public com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+      getSummarizationFeedback() {
+    return summarizationFeedback_ == null
+        ? com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+            .getDefaultInstance()
+        : summarizationFeedback_;
+  }
+  /**
+   *
+   *
+   * <pre>
+   * Optional. Feedback for conversation summarization.
+   * </pre>
+   *
+   * <code>
+   * .google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback summarization_feedback = 4 [(.google.api.field_behavior) = OPTIONAL];
+   * </code>
+   */
+  @java.lang.Override
+  public com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedbackOrBuilder
+      getSummarizationFeedbackOrBuilder() {
+    return summarizationFeedback_ == null
+        ? com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+            .getDefaultInstance()
+        : summarizationFeedback_;
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -746,6 +2070,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
             .getNumber()) {
       output.writeEnum(3, documentEfficiency_);
     }
+    if (summarizationFeedback_ != null) {
+      output.writeMessage(4, getSummarizationFeedback());
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -773,6 +2100,10 @@ public int getSerializedSize() {
             .getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(3, documentEfficiency_);
     }
+    if (summarizationFeedback_ != null) {
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(4, getSummarizationFeedback());
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -792,6 +2123,10 @@ public boolean equals(final java.lang.Object obj) {
     if (answerRelevance_ != other.answerRelevance_) return false;
     if (documentCorrectness_ != other.documentCorrectness_) return false;
     if (documentEfficiency_ != other.documentEfficiency_) return false;
+    if (hasSummarizationFeedback() != other.hasSummarizationFeedback()) return false;
+    if (hasSummarizationFeedback()) {
+      if (!getSummarizationFeedback().equals(other.getSummarizationFeedback())) return false;
+    }
     if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
@@ -809,6 +2144,10 @@ public int hashCode() {
     hash = (53 * hash) + documentCorrectness_;
     hash = (37 * hash) + DOCUMENT_EFFICIENCY_FIELD_NUMBER;
     hash = (53 * hash) + documentEfficiency_;
+    if (hasSummarizationFeedback()) {
+      hash = (37 * hash) + SUMMARIZATION_FEEDBACK_FIELD_NUMBER;
+      hash = (53 * hash) + getSummarizationFeedback().hashCode();
+    }
     hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -948,12 +2287,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       answerRelevance_ = 0;
-
       documentCorrectness_ = 0;
-
       documentEfficiency_ = 0;
-
+      summarizationFeedback_ = null;
+      if (summarizationFeedbackBuilder_ != null) {
+        summarizationFeedbackBuilder_.dispose();
+        summarizationFeedbackBuilder_ = null;
+      }
       return this;
     }
 
@@ -981,13 +2323,32 @@ public com.google.cloud.dialogflow.v2.AgentAssistantFeedback build() {
     public com.google.cloud.dialogflow.v2.AgentAssistantFeedback buildPartial() {
       com.google.cloud.dialogflow.v2.AgentAssistantFeedback result =
           new com.google.cloud.dialogflow.v2.AgentAssistantFeedback(this);
-      result.answerRelevance_ = answerRelevance_;
-      result.documentCorrectness_ = documentCorrectness_;
-      result.documentEfficiency_ = documentEfficiency_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.AgentAssistantFeedback result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.answerRelevance_ = answerRelevance_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.documentCorrectness_ = documentCorrectness_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.documentEfficiency_ = documentEfficiency_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.summarizationFeedback_ =
+            summarizationFeedbackBuilder_ == null
+                ? summarizationFeedback_
+                : summarizationFeedbackBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -1043,6 +2404,9 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.AgentAssistantFeedback o
       if (other.documentEfficiency_ != 0) {
         setDocumentEfficiencyValue(other.getDocumentEfficiencyValue());
       }
+      if (other.hasSummarizationFeedback()) {
+        mergeSummarizationFeedback(other.getSummarizationFeedback());
+      }
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -1072,21 +2436,28 @@ public Builder mergeFrom(
             case 8:
               {
                 answerRelevance_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 16:
               {
                 documentCorrectness_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 24:
               {
                 documentEfficiency_ = input.readEnum();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
+            case 34:
+              {
+                input.readMessage(
+                    getSummarizationFeedbackFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 34
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -1104,6 +2475,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private int answerRelevance_ = 0;
     /**
      *
@@ -1147,8 +2520,8 @@ public int getAnswerRelevanceValue() {
      * @return This builder for chaining.
      */
     public Builder setAnswerRelevanceValue(int value) {
-
       answerRelevance_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1173,9 +2546,8 @@ public Builder setAnswerRelevanceValue(int value) {
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.AgentAssistantFeedback.AnswerRelevance
         getAnswerRelevance() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.AgentAssistantFeedback.AnswerRelevance result =
-          com.google.cloud.dialogflow.v2.AgentAssistantFeedback.AnswerRelevance.valueOf(
+          com.google.cloud.dialogflow.v2.AgentAssistantFeedback.AnswerRelevance.forNumber(
               answerRelevance_);
       return result == null
           ? com.google.cloud.dialogflow.v2.AgentAssistantFeedback.AnswerRelevance.UNRECOGNIZED
@@ -1205,7 +2577,7 @@ public Builder setAnswerRelevance(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       answerRelevance_ = value.getNumber();
       onChanged();
       return this;
@@ -1229,7 +2601,7 @@ public Builder setAnswerRelevance(
      * @return This builder for chaining.
      */
     public Builder clearAnswerRelevance() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       answerRelevance_ = 0;
       onChanged();
       return this;
@@ -1280,8 +2652,8 @@ public int getDocumentCorrectnessValue() {
      * @return This builder for chaining.
      */
     public Builder setDocumentCorrectnessValue(int value) {
-
       documentCorrectness_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1307,9 +2679,8 @@ public Builder setDocumentCorrectnessValue(int value) {
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentCorrectness
         getDocumentCorrectness() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentCorrectness result =
-          com.google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentCorrectness.valueOf(
+          com.google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentCorrectness.forNumber(
               documentCorrectness_);
       return result == null
           ? com.google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentCorrectness.UNRECOGNIZED
@@ -1340,7 +2711,7 @@ public Builder setDocumentCorrectness(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       documentCorrectness_ = value.getNumber();
       onChanged();
       return this;
@@ -1365,7 +2736,7 @@ public Builder setDocumentCorrectness(
      * @return This builder for chaining.
      */
     public Builder clearDocumentCorrectness() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       documentCorrectness_ = 0;
       onChanged();
       return this;
@@ -1378,7 +2749,9 @@ public Builder clearDocumentCorrectness() {
      * <pre>
      * Optional. Whether or not the suggested document is efficient. For example,
      * if the document is poorly written, hard to understand, hard to use or
-     * too long to find useful information, [document_efficiency][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_efficiency] is
+     * too long to find useful information,
+     * [document_efficiency][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_efficiency]
+     * is
      * [DocumentEfficiency.INEFFICIENT][google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency.INEFFICIENT].
      * </pre>
      *
@@ -1398,7 +2771,9 @@ public int getDocumentEfficiencyValue() {
      * <pre>
      * Optional. Whether or not the suggested document is efficient. For example,
      * if the document is poorly written, hard to understand, hard to use or
-     * too long to find useful information, [document_efficiency][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_efficiency] is
+     * too long to find useful information,
+     * [document_efficiency][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_efficiency]
+     * is
      * [DocumentEfficiency.INEFFICIENT][google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency.INEFFICIENT].
      * </pre>
      *
@@ -1410,8 +2785,8 @@ public int getDocumentEfficiencyValue() {
      * @return This builder for chaining.
      */
     public Builder setDocumentEfficiencyValue(int value) {
-
       documentEfficiency_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1421,7 +2796,9 @@ public Builder setDocumentEfficiencyValue(int value) {
      * <pre>
      * Optional. Whether or not the suggested document is efficient. For example,
      * if the document is poorly written, hard to understand, hard to use or
-     * too long to find useful information, [document_efficiency][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_efficiency] is
+     * too long to find useful information,
+     * [document_efficiency][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_efficiency]
+     * is
      * [DocumentEfficiency.INEFFICIENT][google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency.INEFFICIENT].
      * </pre>
      *
@@ -1434,9 +2811,8 @@ public Builder setDocumentEfficiencyValue(int value) {
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency
         getDocumentEfficiency() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency result =
-          com.google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency.valueOf(
+          com.google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency.forNumber(
               documentEfficiency_);
       return result == null
           ? com.google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency.UNRECOGNIZED
@@ -1448,7 +2824,9 @@ public Builder setDocumentEfficiencyValue(int value) {
      * <pre>
      * Optional. Whether or not the suggested document is efficient. For example,
      * if the document is poorly written, hard to understand, hard to use or
-     * too long to find useful information, [document_efficiency][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_efficiency] is
+     * too long to find useful information,
+     * [document_efficiency][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_efficiency]
+     * is
      * [DocumentEfficiency.INEFFICIENT][google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency.INEFFICIENT].
      * </pre>
      *
@@ -1464,7 +2842,7 @@ public Builder setDocumentEfficiency(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000004;
       documentEfficiency_ = value.getNumber();
       onChanged();
       return this;
@@ -1475,7 +2853,9 @@ public Builder setDocumentEfficiency(
      * <pre>
      * Optional. Whether or not the suggested document is efficient. For example,
      * if the document is poorly written, hard to understand, hard to use or
-     * too long to find useful information, [document_efficiency][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_efficiency] is
+     * too long to find useful information,
+     * [document_efficiency][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_efficiency]
+     * is
      * [DocumentEfficiency.INEFFICIENT][google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency.INEFFICIENT].
      * </pre>
      *
@@ -1486,12 +2866,226 @@ public Builder setDocumentEfficiency(
      * @return This builder for chaining.
      */
     public Builder clearDocumentEfficiency() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       documentEfficiency_ = 0;
       onChanged();
       return this;
     }
 
+    private com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+        summarizationFeedback_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback,
+            com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback.Builder,
+            com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedbackOrBuilder>
+        summarizationFeedbackBuilder_;
+    /**
+     *
+     *
+     * <pre>
+     * Optional. Feedback for conversation summarization.
+     * </pre>
+     *
+     * <code>
+     * .google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback summarization_feedback = 4 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     *
+     * @return Whether the summarizationFeedback field is set.
+     */
+    public boolean hasSummarizationFeedback() {
+      return ((bitField0_ & 0x00000008) != 0);
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. Feedback for conversation summarization.
+     * </pre>
+     *
+     * <code>
+     * .google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback summarization_feedback = 4 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     *
+     * @return The summarizationFeedback.
+     */
+    public com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+        getSummarizationFeedback() {
+      if (summarizationFeedbackBuilder_ == null) {
+        return summarizationFeedback_ == null
+            ? com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+                .getDefaultInstance()
+            : summarizationFeedback_;
+      } else {
+        return summarizationFeedbackBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. Feedback for conversation summarization.
+     * </pre>
+     *
+     * <code>
+     * .google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback summarization_feedback = 4 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     */
+    public Builder setSummarizationFeedback(
+        com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback value) {
+      if (summarizationFeedbackBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        summarizationFeedback_ = value;
+      } else {
+        summarizationFeedbackBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. Feedback for conversation summarization.
+     * </pre>
+     *
+     * <code>
+     * .google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback summarization_feedback = 4 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     */
+    public Builder setSummarizationFeedback(
+        com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback.Builder
+            builderForValue) {
+      if (summarizationFeedbackBuilder_ == null) {
+        summarizationFeedback_ = builderForValue.build();
+      } else {
+        summarizationFeedbackBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. Feedback for conversation summarization.
+     * </pre>
+     *
+     * <code>
+     * .google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback summarization_feedback = 4 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     */
+    public Builder mergeSummarizationFeedback(
+        com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback value) {
+      if (summarizationFeedbackBuilder_ == null) {
+        if (((bitField0_ & 0x00000008) != 0)
+            && summarizationFeedback_ != null
+            && summarizationFeedback_
+                != com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+                    .getDefaultInstance()) {
+          getSummarizationFeedbackBuilder().mergeFrom(value);
+        } else {
+          summarizationFeedback_ = value;
+        }
+      } else {
+        summarizationFeedbackBuilder_.mergeFrom(value);
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. Feedback for conversation summarization.
+     * </pre>
+     *
+     * <code>
+     * .google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback summarization_feedback = 4 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     */
+    public Builder clearSummarizationFeedback() {
+      bitField0_ = (bitField0_ & ~0x00000008);
+      summarizationFeedback_ = null;
+      if (summarizationFeedbackBuilder_ != null) {
+        summarizationFeedbackBuilder_.dispose();
+        summarizationFeedbackBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. Feedback for conversation summarization.
+     * </pre>
+     *
+     * <code>
+     * .google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback summarization_feedback = 4 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     */
+    public com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback.Builder
+        getSummarizationFeedbackBuilder() {
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return getSummarizationFeedbackFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. Feedback for conversation summarization.
+     * </pre>
+     *
+     * <code>
+     * .google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback summarization_feedback = 4 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     */
+    public com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedbackOrBuilder
+        getSummarizationFeedbackOrBuilder() {
+      if (summarizationFeedbackBuilder_ != null) {
+        return summarizationFeedbackBuilder_.getMessageOrBuilder();
+      } else {
+        return summarizationFeedback_ == null
+            ? com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+                .getDefaultInstance()
+            : summarizationFeedback_;
+      }
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. Feedback for conversation summarization.
+     * </pre>
+     *
+     * <code>
+     * .google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback summarization_feedback = 4 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback,
+            com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback.Builder,
+            com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedbackOrBuilder>
+        getSummarizationFeedbackFieldBuilder() {
+      if (summarizationFeedbackBuilder_ == null) {
+        summarizationFeedbackBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback,
+                com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback.Builder,
+                com.google.cloud.dialogflow.v2.AgentAssistantFeedback
+                    .SummarizationFeedbackOrBuilder>(
+                getSummarizationFeedback(), getParentForChildren(), isClean());
+        summarizationFeedback_ = null;
+      }
+      return summarizationFeedbackBuilder_;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentAssistantFeedbackOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentAssistantFeedbackOrBuilder.java
index 3ab46dbf1f3b..71459435b184 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentAssistantFeedbackOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentAssistantFeedbackOrBuilder.java
@@ -110,7 +110,9 @@ public interface AgentAssistantFeedbackOrBuilder
    * <pre>
    * Optional. Whether or not the suggested document is efficient. For example,
    * if the document is poorly written, hard to understand, hard to use or
-   * too long to find useful information, [document_efficiency][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_efficiency] is
+   * too long to find useful information,
+   * [document_efficiency][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_efficiency]
+   * is
    * [DocumentEfficiency.INEFFICIENT][google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency.INEFFICIENT].
    * </pre>
    *
@@ -127,7 +129,9 @@ public interface AgentAssistantFeedbackOrBuilder
    * <pre>
    * Optional. Whether or not the suggested document is efficient. For example,
    * if the document is poorly written, hard to understand, hard to use or
-   * too long to find useful information, [document_efficiency][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_efficiency] is
+   * too long to find useful information,
+   * [document_efficiency][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_efficiency]
+   * is
    * [DocumentEfficiency.INEFFICIENT][google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency.INEFFICIENT].
    * </pre>
    *
@@ -138,4 +142,47 @@ public interface AgentAssistantFeedbackOrBuilder
    * @return The documentEfficiency.
    */
   com.google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency getDocumentEfficiency();
+
+  /**
+   *
+   *
+   * <pre>
+   * Optional. Feedback for conversation summarization.
+   * </pre>
+   *
+   * <code>
+   * .google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback summarization_feedback = 4 [(.google.api.field_behavior) = OPTIONAL];
+   * </code>
+   *
+   * @return Whether the summarizationFeedback field is set.
+   */
+  boolean hasSummarizationFeedback();
+  /**
+   *
+   *
+   * <pre>
+   * Optional. Feedback for conversation summarization.
+   * </pre>
+   *
+   * <code>
+   * .google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback summarization_feedback = 4 [(.google.api.field_behavior) = OPTIONAL];
+   * </code>
+   *
+   * @return The summarizationFeedback.
+   */
+  com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback
+      getSummarizationFeedback();
+  /**
+   *
+   *
+   * <pre>
+   * Optional. Feedback for conversation summarization.
+   * </pre>
+   *
+   * <code>
+   * .google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedback summarization_feedback = 4 [(.google.api.field_behavior) = OPTIONAL];
+   * </code>
+   */
+  com.google.cloud.dialogflow.v2.AgentAssistantFeedback.SummarizationFeedbackOrBuilder
+      getSummarizationFeedbackOrBuilder();
 }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentAssistantRecord.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentAssistantRecord.java
index 1fad7cae247d..cbc1ccc0577b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentAssistantRecord.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentAssistantRecord.java
@@ -454,6 +454,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (articleSuggestionAnswerBuilder_ != null) {
         articleSuggestionAnswerBuilder_.clear();
       }
@@ -489,25 +490,29 @@ public com.google.cloud.dialogflow.v2.AgentAssistantRecord build() {
     public com.google.cloud.dialogflow.v2.AgentAssistantRecord buildPartial() {
       com.google.cloud.dialogflow.v2.AgentAssistantRecord result =
           new com.google.cloud.dialogflow.v2.AgentAssistantRecord(this);
-      if (answerCase_ == 5) {
-        if (articleSuggestionAnswerBuilder_ == null) {
-          result.answer_ = answer_;
-        } else {
-          result.answer_ = articleSuggestionAnswerBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (answerCase_ == 6) {
-        if (faqAnswerBuilder_ == null) {
-          result.answer_ = answer_;
-        } else {
-          result.answer_ = faqAnswerBuilder_.build();
-        }
-      }
-      result.answerCase_ = answerCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.AgentAssistantRecord result) {
+      int from_bitField0_ = bitField0_;
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2.AgentAssistantRecord result) {
+      result.answerCase_ = answerCase_;
+      result.answer_ = this.answer_;
+      if (answerCase_ == 5 && articleSuggestionAnswerBuilder_ != null) {
+        result.answer_ = articleSuggestionAnswerBuilder_.build();
+      }
+      if (answerCase_ == 6 && faqAnswerBuilder_ != null) {
+        result.answer_ = faqAnswerBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -640,6 +645,8 @@ public Builder clearAnswer() {
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.ArticleAnswer,
             com.google.cloud.dialogflow.v2.ArticleAnswer.Builder,
@@ -867,7 +874,6 @@ public Builder clearArticleSuggestionAnswer() {
       }
       answerCase_ = 5;
       onChanged();
-      ;
       return articleSuggestionAnswerBuilder_;
     }
 
@@ -1094,7 +1100,6 @@ public com.google.cloud.dialogflow.v2.FaqAnswerOrBuilder getFaqAnswerOrBuilder()
       }
       answerCase_ = 6;
       onChanged();
-      ;
       return faqAnswerBuilder_;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentOrBuilder.java
index 7d2184e38f82..be914deb10a4 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentOrBuilder.java
@@ -285,7 +285,7 @@ public interface AgentOrBuilder
    * </code>
    *
    * @deprecated google.cloud.dialogflow.v2.Agent.match_mode is deprecated. See
-   *     google/cloud/dialogflow/v2/agent.proto;l=349
+   *     google/cloud/dialogflow/v2/agent.proto;l=353
    * @return The enum numeric value on the wire for matchMode.
    */
   @java.lang.Deprecated
@@ -302,7 +302,7 @@ public interface AgentOrBuilder
    * </code>
    *
    * @deprecated google.cloud.dialogflow.v2.Agent.match_mode is deprecated. See
-   *     google/cloud/dialogflow/v2/agent.proto;l=349
+   *     google/cloud/dialogflow/v2/agent.proto;l=353
    * @return The matchMode.
    */
   @java.lang.Deprecated
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentProto.java
index f387320b412d..9be6a833c2f7 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentProto.java
@@ -200,11 +200,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "lt\032x\312A\031dialogflow.googleapis.com\322AYhttps"
           + "://www.googleapis.com/auth/cloud-platfor"
           + "m,https://www.googleapis.com/auth/dialog"
-          + "flowB\231\001\n\036com.google.cloud.dialogflow.v2B"
-          + "\nAgentProtoP\001ZDgoogle.golang.org/genprot"
-          + "o/googleapis/cloud/dialogflow/v2;dialogf"
-          + "low\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dialogflow.V2"
-          + "b\006proto3"
+          + "flowB\223\001\n\036com.google.cloud.dialogflow.v2B"
+          + "\nAgentProtoP\001Z>cloud.google.com/go/dialo"
+          + "gflow/apiv2/dialogflowpb;dialogflowpb\370\001\001"
+          + "\242\002\002DF\252\002\032Google.Cloud.Dialogflow.V2b\006prot"
+          + "o3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnalyzeContentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnalyzeContentRequest.java
index 90873397d5bb..8d91c133a283 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnalyzeContentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnalyzeContentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent].
+ * The request message for
+ * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.AnalyzeContentRequest}
@@ -116,7 +117,9 @@ public InputCase getInputCase() {
   }
 
   public static final int PARTICIPANT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object participant_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object participant_ = "";
   /**
    *
    *
@@ -331,7 +334,9 @@ public com.google.cloud.dialogflow.v2.OutputAudioConfig getReplyAudioConfig() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.OutputAudioConfigOrBuilder getReplyAudioConfigOrBuilder() {
-    return getReplyAudioConfig();
+    return replyAudioConfig_ == null
+        ? com.google.cloud.dialogflow.v2.OutputAudioConfig.getDefaultInstance()
+        : replyAudioConfig_;
   }
 
   public static final int QUERY_PARAMS_FIELD_NUMBER = 9;
@@ -379,7 +384,9 @@ public com.google.cloud.dialogflow.v2.QueryParameters getQueryParams() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.QueryParametersOrBuilder getQueryParamsOrBuilder() {
-    return getQueryParams();
+    return queryParams_ == null
+        ? com.google.cloud.dialogflow.v2.QueryParameters.getDefaultInstance()
+        : queryParams_;
   }
 
   public static final int ASSIST_QUERY_PARAMS_FIELD_NUMBER = 14;
@@ -428,7 +435,9 @@ public com.google.cloud.dialogflow.v2.AssistQueryParameters getAssistQueryParams
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.AssistQueryParametersOrBuilder
       getAssistQueryParamsOrBuilder() {
-    return getAssistQueryParams();
+    return assistQueryParams_ == null
+        ? com.google.cloud.dialogflow.v2.AssistQueryParameters.getDefaultInstance()
+        : assistQueryParams_;
   }
 
   public static final int CX_PARAMETERS_FIELD_NUMBER = 18;
@@ -486,11 +495,13 @@ public com.google.protobuf.Struct getCxParameters() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getCxParametersOrBuilder() {
-    return getCxParameters();
+    return cxParameters_ == null ? com.google.protobuf.Struct.getDefaultInstance() : cxParameters_;
   }
 
   public static final int REQUEST_ID_FIELD_NUMBER = 11;
-  private volatile java.lang.Object requestId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object requestId_ = "";
   /**
    *
    *
@@ -809,7 +820,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent].
+   * The request message for
+   * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.AnalyzeContentRequest}
@@ -843,40 +855,35 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       participant_ = "";
-
       if (textInputBuilder_ != null) {
         textInputBuilder_.clear();
       }
       if (eventInputBuilder_ != null) {
         eventInputBuilder_.clear();
       }
-      if (replyAudioConfigBuilder_ == null) {
-        replyAudioConfig_ = null;
-      } else {
-        replyAudioConfig_ = null;
+      replyAudioConfig_ = null;
+      if (replyAudioConfigBuilder_ != null) {
+        replyAudioConfigBuilder_.dispose();
         replyAudioConfigBuilder_ = null;
       }
-      if (queryParamsBuilder_ == null) {
-        queryParams_ = null;
-      } else {
-        queryParams_ = null;
+      queryParams_ = null;
+      if (queryParamsBuilder_ != null) {
+        queryParamsBuilder_.dispose();
         queryParamsBuilder_ = null;
       }
-      if (assistQueryParamsBuilder_ == null) {
-        assistQueryParams_ = null;
-      } else {
-        assistQueryParams_ = null;
+      assistQueryParams_ = null;
+      if (assistQueryParamsBuilder_ != null) {
+        assistQueryParamsBuilder_.dispose();
         assistQueryParamsBuilder_ = null;
       }
-      if (cxParametersBuilder_ == null) {
-        cxParameters_ = null;
-      } else {
-        cxParameters_ = null;
+      cxParameters_ = null;
+      if (cxParametersBuilder_ != null) {
+        cxParametersBuilder_.dispose();
         cxParametersBuilder_ = null;
       }
       requestId_ = "";
-
       inputCase_ = 0;
       input_ = null;
       return this;
@@ -906,45 +913,51 @@ public com.google.cloud.dialogflow.v2.AnalyzeContentRequest build() {
     public com.google.cloud.dialogflow.v2.AnalyzeContentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.AnalyzeContentRequest result =
           new com.google.cloud.dialogflow.v2.AnalyzeContentRequest(this);
-      result.participant_ = participant_;
-      if (inputCase_ == 6) {
-        if (textInputBuilder_ == null) {
-          result.input_ = input_;
-        } else {
-          result.input_ = textInputBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (inputCase_ == 8) {
-        if (eventInputBuilder_ == null) {
-          result.input_ = input_;
-        } else {
-          result.input_ = eventInputBuilder_.build();
-        }
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.AnalyzeContentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.participant_ = participant_;
       }
-      if (replyAudioConfigBuilder_ == null) {
-        result.replyAudioConfig_ = replyAudioConfig_;
-      } else {
-        result.replyAudioConfig_ = replyAudioConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.replyAudioConfig_ =
+            replyAudioConfigBuilder_ == null ? replyAudioConfig_ : replyAudioConfigBuilder_.build();
       }
-      if (queryParamsBuilder_ == null) {
-        result.queryParams_ = queryParams_;
-      } else {
-        result.queryParams_ = queryParamsBuilder_.build();
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.queryParams_ =
+            queryParamsBuilder_ == null ? queryParams_ : queryParamsBuilder_.build();
       }
-      if (assistQueryParamsBuilder_ == null) {
-        result.assistQueryParams_ = assistQueryParams_;
-      } else {
-        result.assistQueryParams_ = assistQueryParamsBuilder_.build();
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.assistQueryParams_ =
+            assistQueryParamsBuilder_ == null
+                ? assistQueryParams_
+                : assistQueryParamsBuilder_.build();
       }
-      if (cxParametersBuilder_ == null) {
-        result.cxParameters_ = cxParameters_;
-      } else {
-        result.cxParameters_ = cxParametersBuilder_.build();
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.cxParameters_ =
+            cxParametersBuilder_ == null ? cxParameters_ : cxParametersBuilder_.build();
       }
-      result.requestId_ = requestId_;
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.requestId_ = requestId_;
+      }
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2.AnalyzeContentRequest result) {
       result.inputCase_ = inputCase_;
-      onBuilt();
-      return result;
+      result.input_ = this.input_;
+      if (inputCase_ == 6 && textInputBuilder_ != null) {
+        result.input_ = textInputBuilder_.build();
+      }
+      if (inputCase_ == 8 && eventInputBuilder_ != null) {
+        result.input_ = eventInputBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -995,6 +1008,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.AnalyzeContentRequest ot
         return this;
       if (!other.getParticipant().isEmpty()) {
         participant_ = other.participant_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasReplyAudioConfig()) {
@@ -1011,6 +1025,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.AnalyzeContentRequest ot
       }
       if (!other.getRequestId().isEmpty()) {
         requestId_ = other.requestId_;
+        bitField0_ |= 0x00000080;
         onChanged();
       }
       switch (other.getInputCase()) {
@@ -1058,14 +1073,14 @@ public Builder mergeFrom(
             case 10:
               {
                 participant_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 42:
               {
                 input.readMessage(
                     getReplyAudioConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 42
             case 50:
@@ -1083,26 +1098,26 @@ public Builder mergeFrom(
             case 74:
               {
                 input.readMessage(getQueryParamsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 74
             case 90:
               {
                 requestId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 90
             case 114:
               {
                 input.readMessage(
                     getAssistQueryParamsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 114
             case 146:
               {
                 input.readMessage(getCxParametersFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 146
             default:
@@ -1136,6 +1151,8 @@ public Builder clearInput() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object participant_ = "";
     /**
      *
@@ -1209,8 +1226,8 @@ public Builder setParticipant(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       participant_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1230,8 +1247,8 @@ public Builder setParticipant(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParticipant() {
-
       participant_ = getDefaultInstance().getParticipant();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1256,8 +1273,8 @@ public Builder setParticipantBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       participant_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1467,7 +1484,6 @@ public com.google.cloud.dialogflow.v2.TextInputOrBuilder getTextInputOrBuilder()
       }
       inputCase_ = 6;
       onChanged();
-      ;
       return textInputBuilder_;
     }
 
@@ -1677,7 +1693,6 @@ public com.google.cloud.dialogflow.v2.EventInputOrBuilder getEventInputOrBuilder
       }
       inputCase_ = 8;
       onChanged();
-      ;
       return eventInputBuilder_;
     }
 
@@ -1703,7 +1718,7 @@ public com.google.cloud.dialogflow.v2.EventInputOrBuilder getEventInputOrBuilder
      * @return Whether the replyAudioConfig field is set.
      */
     public boolean hasReplyAudioConfig() {
-      return replyAudioConfigBuilder_ != null || replyAudioConfig_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1748,11 +1763,11 @@ public Builder setReplyAudioConfig(com.google.cloud.dialogflow.v2.OutputAudioCon
           throw new NullPointerException();
         }
         replyAudioConfig_ = value;
-        onChanged();
       } else {
         replyAudioConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1772,11 +1787,11 @@ public Builder setReplyAudioConfig(
         com.google.cloud.dialogflow.v2.OutputAudioConfig.Builder builderForValue) {
       if (replyAudioConfigBuilder_ == null) {
         replyAudioConfig_ = builderForValue.build();
-        onChanged();
       } else {
         replyAudioConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1794,19 +1809,19 @@ public Builder setReplyAudioConfig(
      */
     public Builder mergeReplyAudioConfig(com.google.cloud.dialogflow.v2.OutputAudioConfig value) {
       if (replyAudioConfigBuilder_ == null) {
-        if (replyAudioConfig_ != null) {
-          replyAudioConfig_ =
-              com.google.cloud.dialogflow.v2.OutputAudioConfig.newBuilder(replyAudioConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && replyAudioConfig_ != null
+            && replyAudioConfig_
+                != com.google.cloud.dialogflow.v2.OutputAudioConfig.getDefaultInstance()) {
+          getReplyAudioConfigBuilder().mergeFrom(value);
         } else {
           replyAudioConfig_ = value;
         }
-        onChanged();
       } else {
         replyAudioConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1823,14 +1838,13 @@ public Builder mergeReplyAudioConfig(com.google.cloud.dialogflow.v2.OutputAudioC
      * <code>.google.cloud.dialogflow.v2.OutputAudioConfig reply_audio_config = 5;</code>
      */
     public Builder clearReplyAudioConfig() {
-      if (replyAudioConfigBuilder_ == null) {
-        replyAudioConfig_ = null;
-        onChanged();
-      } else {
-        replyAudioConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      replyAudioConfig_ = null;
+      if (replyAudioConfigBuilder_ != null) {
+        replyAudioConfigBuilder_.dispose();
         replyAudioConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1847,7 +1861,7 @@ public Builder clearReplyAudioConfig() {
      * <code>.google.cloud.dialogflow.v2.OutputAudioConfig reply_audio_config = 5;</code>
      */
     public com.google.cloud.dialogflow.v2.OutputAudioConfig.Builder getReplyAudioConfigBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getReplyAudioConfigFieldBuilder().getBuilder();
     }
@@ -1922,7 +1936,7 @@ public com.google.cloud.dialogflow.v2.OutputAudioConfig.Builder getReplyAudioCon
      * @return Whether the queryParams field is set.
      */
     public boolean hasQueryParams() {
-      return queryParamsBuilder_ != null || queryParams_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -1959,11 +1973,11 @@ public Builder setQueryParams(com.google.cloud.dialogflow.v2.QueryParameters val
           throw new NullPointerException();
         }
         queryParams_ = value;
-        onChanged();
       } else {
         queryParamsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1979,11 +1993,11 @@ public Builder setQueryParams(
         com.google.cloud.dialogflow.v2.QueryParameters.Builder builderForValue) {
       if (queryParamsBuilder_ == null) {
         queryParams_ = builderForValue.build();
-        onChanged();
       } else {
         queryParamsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1997,19 +2011,19 @@ public Builder setQueryParams(
      */
     public Builder mergeQueryParams(com.google.cloud.dialogflow.v2.QueryParameters value) {
       if (queryParamsBuilder_ == null) {
-        if (queryParams_ != null) {
-          queryParams_ =
-              com.google.cloud.dialogflow.v2.QueryParameters.newBuilder(queryParams_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && queryParams_ != null
+            && queryParams_
+                != com.google.cloud.dialogflow.v2.QueryParameters.getDefaultInstance()) {
+          getQueryParamsBuilder().mergeFrom(value);
         } else {
           queryParams_ = value;
         }
-        onChanged();
       } else {
         queryParamsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2022,14 +2036,13 @@ public Builder mergeQueryParams(com.google.cloud.dialogflow.v2.QueryParameters v
      * <code>.google.cloud.dialogflow.v2.QueryParameters query_params = 9;</code>
      */
     public Builder clearQueryParams() {
-      if (queryParamsBuilder_ == null) {
-        queryParams_ = null;
-        onChanged();
-      } else {
-        queryParams_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      queryParams_ = null;
+      if (queryParamsBuilder_ != null) {
+        queryParamsBuilder_.dispose();
         queryParamsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2042,7 +2055,7 @@ public Builder clearQueryParams() {
      * <code>.google.cloud.dialogflow.v2.QueryParameters query_params = 9;</code>
      */
     public com.google.cloud.dialogflow.v2.QueryParameters.Builder getQueryParamsBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getQueryParamsFieldBuilder().getBuilder();
     }
@@ -2108,7 +2121,7 @@ public com.google.cloud.dialogflow.v2.QueryParametersOrBuilder getQueryParamsOrB
      * @return Whether the assistQueryParams field is set.
      */
     public boolean hasAssistQueryParams() {
-      return assistQueryParamsBuilder_ != null || assistQueryParams_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -2146,11 +2159,11 @@ public Builder setAssistQueryParams(
           throw new NullPointerException();
         }
         assistQueryParams_ = value;
-        onChanged();
       } else {
         assistQueryParamsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2166,11 +2179,11 @@ public Builder setAssistQueryParams(
         com.google.cloud.dialogflow.v2.AssistQueryParameters.Builder builderForValue) {
       if (assistQueryParamsBuilder_ == null) {
         assistQueryParams_ = builderForValue.build();
-        onChanged();
       } else {
         assistQueryParamsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2185,19 +2198,19 @@ public Builder setAssistQueryParams(
     public Builder mergeAssistQueryParams(
         com.google.cloud.dialogflow.v2.AssistQueryParameters value) {
       if (assistQueryParamsBuilder_ == null) {
-        if (assistQueryParams_ != null) {
-          assistQueryParams_ =
-              com.google.cloud.dialogflow.v2.AssistQueryParameters.newBuilder(assistQueryParams_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && assistQueryParams_ != null
+            && assistQueryParams_
+                != com.google.cloud.dialogflow.v2.AssistQueryParameters.getDefaultInstance()) {
+          getAssistQueryParamsBuilder().mergeFrom(value);
         } else {
           assistQueryParams_ = value;
         }
-        onChanged();
       } else {
         assistQueryParamsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2210,14 +2223,13 @@ public Builder mergeAssistQueryParams(
      * <code>.google.cloud.dialogflow.v2.AssistQueryParameters assist_query_params = 14;</code>
      */
     public Builder clearAssistQueryParams() {
-      if (assistQueryParamsBuilder_ == null) {
-        assistQueryParams_ = null;
-        onChanged();
-      } else {
-        assistQueryParams_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      assistQueryParams_ = null;
+      if (assistQueryParamsBuilder_ != null) {
+        assistQueryParamsBuilder_.dispose();
         assistQueryParamsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2231,7 +2243,7 @@ public Builder clearAssistQueryParams() {
      */
     public com.google.cloud.dialogflow.v2.AssistQueryParameters.Builder
         getAssistQueryParamsBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getAssistQueryParamsFieldBuilder().getBuilder();
     }
@@ -2302,7 +2314,7 @@ public Builder clearAssistQueryParams() {
      * @return Whether the cxParameters field is set.
      */
     public boolean hasCxParameters() {
-      return cxParametersBuilder_ != null || cxParameters_ != null;
+      return ((bitField0_ & 0x00000040) != 0);
     }
     /**
      *
@@ -2347,11 +2359,11 @@ public Builder setCxParameters(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         cxParameters_ = value;
-        onChanged();
       } else {
         cxParametersBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2370,11 +2382,11 @@ public Builder setCxParameters(com.google.protobuf.Struct value) {
     public Builder setCxParameters(com.google.protobuf.Struct.Builder builderForValue) {
       if (cxParametersBuilder_ == null) {
         cxParameters_ = builderForValue.build();
-        onChanged();
       } else {
         cxParametersBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2392,17 +2404,18 @@ public Builder setCxParameters(com.google.protobuf.Struct.Builder builderForValu
      */
     public Builder mergeCxParameters(com.google.protobuf.Struct value) {
       if (cxParametersBuilder_ == null) {
-        if (cxParameters_ != null) {
-          cxParameters_ =
-              com.google.protobuf.Struct.newBuilder(cxParameters_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000040) != 0)
+            && cxParameters_ != null
+            && cxParameters_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getCxParametersBuilder().mergeFrom(value);
         } else {
           cxParameters_ = value;
         }
-        onChanged();
       } else {
         cxParametersBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2419,14 +2432,13 @@ public Builder mergeCxParameters(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct cx_parameters = 18;</code>
      */
     public Builder clearCxParameters() {
-      if (cxParametersBuilder_ == null) {
-        cxParameters_ = null;
-        onChanged();
-      } else {
-        cxParameters_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      cxParameters_ = null;
+      if (cxParametersBuilder_ != null) {
+        cxParametersBuilder_.dispose();
         cxParametersBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2443,7 +2455,7 @@ public Builder clearCxParameters() {
      * <code>.google.protobuf.Struct cx_parameters = 18;</code>
      */
     public com.google.protobuf.Struct.Builder getCxParametersBuilder() {
-
+      bitField0_ |= 0x00000040;
       onChanged();
       return getCxParametersFieldBuilder().getBuilder();
     }
@@ -2566,8 +2578,8 @@ public Builder setRequestId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       requestId_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2585,8 +2597,8 @@ public Builder setRequestId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearRequestId() {
-
       requestId_ = getDefaultInstance().getRequestId();
+      bitField0_ = (bitField0_ & ~0x00000080);
       onChanged();
       return this;
     }
@@ -2609,8 +2621,8 @@ public Builder setRequestIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       requestId_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnalyzeContentResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnalyzeContentResponse.java
index 401a91b06285..a58c18f2d640 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnalyzeContentResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnalyzeContentResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The response message for [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent].
+ * The response message for
+ * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.AnalyzeContentResponse}
@@ -70,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int REPLY_TEXT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object replyText_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object replyText_ = "";
   /**
    *
    *
@@ -191,7 +194,9 @@ public com.google.cloud.dialogflow.v2.OutputAudio getReplyAudio() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.OutputAudioOrBuilder getReplyAudioOrBuilder() {
-    return getReplyAudio();
+    return replyAudio_ == null
+        ? com.google.cloud.dialogflow.v2.OutputAudio.getDefaultInstance()
+        : replyAudio_;
   }
 
   public static final int AUTOMATED_AGENT_REPLY_FIELD_NUMBER = 3;
@@ -203,7 +208,9 @@ public com.google.cloud.dialogflow.v2.OutputAudioOrBuilder getReplyAudioOrBuilde
    * Only set if a Dialogflow automated agent has responded.
    * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
    * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-   * are always empty, use [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio] instead.
+   * are always empty, use
+   * [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio]
+   * instead.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 3;</code>
@@ -221,7 +228,9 @@ public boolean hasAutomatedAgentReply() {
    * Only set if a Dialogflow automated agent has responded.
    * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
    * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-   * are always empty, use [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio] instead.
+   * are always empty, use
+   * [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio]
+   * instead.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 3;</code>
@@ -241,7 +250,9 @@ public com.google.cloud.dialogflow.v2.AutomatedAgentReply getAutomatedAgentReply
    * Only set if a Dialogflow automated agent has responded.
    * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
    * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-   * are always empty, use [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio] instead.
+   * are always empty, use
+   * [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio]
+   * instead.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 3;</code>
@@ -249,7 +260,9 @@ public com.google.cloud.dialogflow.v2.AutomatedAgentReply getAutomatedAgentReply
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.AutomatedAgentReplyOrBuilder
       getAutomatedAgentReplyOrBuilder() {
-    return getAutomatedAgentReply();
+    return automatedAgentReply_ == null
+        ? com.google.cloud.dialogflow.v2.AutomatedAgentReply.getDefaultInstance()
+        : automatedAgentReply_;
   }
 
   public static final int MESSAGE_FIELD_NUMBER = 5;
@@ -297,10 +310,14 @@ public com.google.cloud.dialogflow.v2.Message getMessage() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.MessageOrBuilder getMessageOrBuilder() {
-    return getMessage();
+    return message_ == null
+        ? com.google.cloud.dialogflow.v2.Message.getDefaultInstance()
+        : message_;
   }
 
   public static final int HUMAN_AGENT_SUGGESTION_RESULTS_FIELD_NUMBER = 6;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.SuggestionResult>
       humanAgentSuggestionResults_;
   /**
@@ -308,7 +325,8 @@ public com.google.cloud.dialogflow.v2.MessageOrBuilder getMessageOrBuilder() {
    *
    * <pre>
    * The suggestions for most recent human agent. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
    * Note that any failure of Agent Assist features will not lead to the overall
    * failure of an AnalyzeContent API call. Instead, the features will
@@ -329,7 +347,8 @@ public com.google.cloud.dialogflow.v2.MessageOrBuilder getMessageOrBuilder() {
    *
    * <pre>
    * The suggestions for most recent human agent. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
    * Note that any failure of Agent Assist features will not lead to the overall
    * failure of an AnalyzeContent API call. Instead, the features will
@@ -350,7 +369,8 @@ public com.google.cloud.dialogflow.v2.MessageOrBuilder getMessageOrBuilder() {
    *
    * <pre>
    * The suggestions for most recent human agent. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
    * Note that any failure of Agent Assist features will not lead to the overall
    * failure of an AnalyzeContent API call. Instead, the features will
@@ -370,7 +390,8 @@ public int getHumanAgentSuggestionResultsCount() {
    *
    * <pre>
    * The suggestions for most recent human agent. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
    * Note that any failure of Agent Assist features will not lead to the overall
    * failure of an AnalyzeContent API call. Instead, the features will
@@ -390,7 +411,8 @@ public com.google.cloud.dialogflow.v2.SuggestionResult getHumanAgentSuggestionRe
    *
    * <pre>
    * The suggestions for most recent human agent. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
    * Note that any failure of Agent Assist features will not lead to the overall
    * failure of an AnalyzeContent API call. Instead, the features will
@@ -408,13 +430,16 @@ public com.google.cloud.dialogflow.v2.SuggestionResult getHumanAgentSuggestionRe
   }
 
   public static final int END_USER_SUGGESTION_RESULTS_FIELD_NUMBER = 7;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.SuggestionResult> endUserSuggestionResults_;
   /**
    *
    *
    * <pre>
    * The suggestions for end user. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
    * Same as human_agent_suggestion_results, any failure of Agent Assist
    * features will not lead to the overall failure of an AnalyzeContent API
@@ -435,7 +460,8 @@ public com.google.cloud.dialogflow.v2.SuggestionResult getHumanAgentSuggestionRe
    *
    * <pre>
    * The suggestions for end user. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
    * Same as human_agent_suggestion_results, any failure of Agent Assist
    * features will not lead to the overall failure of an AnalyzeContent API
@@ -456,7 +482,8 @@ public com.google.cloud.dialogflow.v2.SuggestionResult getHumanAgentSuggestionRe
    *
    * <pre>
    * The suggestions for end user. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
    * Same as human_agent_suggestion_results, any failure of Agent Assist
    * features will not lead to the overall failure of an AnalyzeContent API
@@ -476,7 +503,8 @@ public int getEndUserSuggestionResultsCount() {
    *
    * <pre>
    * The suggestions for end user. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
    * Same as human_agent_suggestion_results, any failure of Agent Assist
    * features will not lead to the overall failure of an AnalyzeContent API
@@ -496,7 +524,8 @@ public com.google.cloud.dialogflow.v2.SuggestionResult getEndUserSuggestionResul
    *
    * <pre>
    * The suggestions for end user. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
    * Same as human_agent_suggestion_results, any failure of Agent Assist
    * features will not lead to the overall failure of an AnalyzeContent API
@@ -558,7 +587,9 @@ public com.google.cloud.dialogflow.v2.DtmfParameters getDtmfParameters() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.DtmfParametersOrBuilder getDtmfParametersOrBuilder() {
-    return getDtmfParameters();
+    return dtmfParameters_ == null
+        ? com.google.cloud.dialogflow.v2.DtmfParameters.getDefaultInstance()
+        : dtmfParameters_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -809,7 +840,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The response message for [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent].
+   * The response message for
+   * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.AnalyzeContentResponse}
@@ -843,24 +875,21 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       replyText_ = "";
-
-      if (replyAudioBuilder_ == null) {
-        replyAudio_ = null;
-      } else {
-        replyAudio_ = null;
+      replyAudio_ = null;
+      if (replyAudioBuilder_ != null) {
+        replyAudioBuilder_.dispose();
         replyAudioBuilder_ = null;
       }
-      if (automatedAgentReplyBuilder_ == null) {
-        automatedAgentReply_ = null;
-      } else {
-        automatedAgentReply_ = null;
+      automatedAgentReply_ = null;
+      if (automatedAgentReplyBuilder_ != null) {
+        automatedAgentReplyBuilder_.dispose();
         automatedAgentReplyBuilder_ = null;
       }
-      if (messageBuilder_ == null) {
-        message_ = null;
-      } else {
-        message_ = null;
+      message_ = null;
+      if (messageBuilder_ != null) {
+        messageBuilder_.dispose();
         messageBuilder_ = null;
       }
       if (humanAgentSuggestionResultsBuilder_ == null) {
@@ -869,18 +898,17 @@ public Builder clear() {
         humanAgentSuggestionResults_ = null;
         humanAgentSuggestionResultsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000010);
       if (endUserSuggestionResultsBuilder_ == null) {
         endUserSuggestionResults_ = java.util.Collections.emptyList();
       } else {
         endUserSuggestionResults_ = null;
         endUserSuggestionResultsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
-      if (dtmfParametersBuilder_ == null) {
-        dtmfParameters_ = null;
-      } else {
-        dtmfParameters_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      dtmfParameters_ = null;
+      if (dtmfParametersBuilder_ != null) {
+        dtmfParametersBuilder_.dispose();
         dtmfParametersBuilder_ = null;
       }
       return this;
@@ -910,50 +938,59 @@ public com.google.cloud.dialogflow.v2.AnalyzeContentResponse build() {
     public com.google.cloud.dialogflow.v2.AnalyzeContentResponse buildPartial() {
       com.google.cloud.dialogflow.v2.AnalyzeContentResponse result =
           new com.google.cloud.dialogflow.v2.AnalyzeContentResponse(this);
-      int from_bitField0_ = bitField0_;
-      result.replyText_ = replyText_;
-      if (replyAudioBuilder_ == null) {
-        result.replyAudio_ = replyAudio_;
-      } else {
-        result.replyAudio_ = replyAudioBuilder_.build();
-      }
-      if (automatedAgentReplyBuilder_ == null) {
-        result.automatedAgentReply_ = automatedAgentReply_;
-      } else {
-        result.automatedAgentReply_ = automatedAgentReplyBuilder_.build();
-      }
-      if (messageBuilder_ == null) {
-        result.message_ = message_;
-      } else {
-        result.message_ = messageBuilder_.build();
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.AnalyzeContentResponse result) {
       if (humanAgentSuggestionResultsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000010) != 0)) {
           humanAgentSuggestionResults_ =
               java.util.Collections.unmodifiableList(humanAgentSuggestionResults_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000010);
         }
         result.humanAgentSuggestionResults_ = humanAgentSuggestionResults_;
       } else {
         result.humanAgentSuggestionResults_ = humanAgentSuggestionResultsBuilder_.build();
       }
       if (endUserSuggestionResultsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000020) != 0)) {
           endUserSuggestionResults_ =
               java.util.Collections.unmodifiableList(endUserSuggestionResults_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000020);
         }
         result.endUserSuggestionResults_ = endUserSuggestionResults_;
       } else {
         result.endUserSuggestionResults_ = endUserSuggestionResultsBuilder_.build();
       }
-      if (dtmfParametersBuilder_ == null) {
-        result.dtmfParameters_ = dtmfParameters_;
-      } else {
-        result.dtmfParameters_ = dtmfParametersBuilder_.build();
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.AnalyzeContentResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.replyText_ = replyText_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.replyAudio_ = replyAudioBuilder_ == null ? replyAudio_ : replyAudioBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.automatedAgentReply_ =
+            automatedAgentReplyBuilder_ == null
+                ? automatedAgentReply_
+                : automatedAgentReplyBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.message_ = messageBuilder_ == null ? message_ : messageBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.dtmfParameters_ =
+            dtmfParametersBuilder_ == null ? dtmfParameters_ : dtmfParametersBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -1004,6 +1041,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.AnalyzeContentResponse o
         return this;
       if (!other.getReplyText().isEmpty()) {
         replyText_ = other.replyText_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasReplyAudio()) {
@@ -1019,7 +1057,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.AnalyzeContentResponse o
         if (!other.humanAgentSuggestionResults_.isEmpty()) {
           if (humanAgentSuggestionResults_.isEmpty()) {
             humanAgentSuggestionResults_ = other.humanAgentSuggestionResults_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
             ensureHumanAgentSuggestionResultsIsMutable();
             humanAgentSuggestionResults_.addAll(other.humanAgentSuggestionResults_);
@@ -1032,7 +1070,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.AnalyzeContentResponse o
             humanAgentSuggestionResultsBuilder_.dispose();
             humanAgentSuggestionResultsBuilder_ = null;
             humanAgentSuggestionResults_ = other.humanAgentSuggestionResults_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
             humanAgentSuggestionResultsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getHumanAgentSuggestionResultsFieldBuilder()
@@ -1046,7 +1084,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.AnalyzeContentResponse o
         if (!other.endUserSuggestionResults_.isEmpty()) {
           if (endUserSuggestionResults_.isEmpty()) {
             endUserSuggestionResults_ = other.endUserSuggestionResults_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000020);
           } else {
             ensureEndUserSuggestionResultsIsMutable();
             endUserSuggestionResults_.addAll(other.endUserSuggestionResults_);
@@ -1059,7 +1097,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.AnalyzeContentResponse o
             endUserSuggestionResultsBuilder_.dispose();
             endUserSuggestionResultsBuilder_ = null;
             endUserSuggestionResults_ = other.endUserSuggestionResults_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000020);
             endUserSuggestionResultsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getEndUserSuggestionResultsFieldBuilder()
@@ -1101,26 +1139,26 @@ public Builder mergeFrom(
             case 10:
               {
                 replyText_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getReplyAudioFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(
                     getAutomatedAgentReplyFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 42:
               {
                 input.readMessage(getMessageFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 42
             case 50:
@@ -1154,7 +1192,7 @@ public Builder mergeFrom(
             case 74:
               {
                 input.readMessage(getDtmfParametersFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 74
             default:
@@ -1243,8 +1281,8 @@ public Builder setReplyText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       replyText_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1262,8 +1300,8 @@ public Builder setReplyText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearReplyText() {
-
       replyText_ = getDefaultInstance().getReplyText();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1286,8 +1324,8 @@ public Builder setReplyTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       replyText_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1318,7 +1356,7 @@ public Builder setReplyTextBytes(com.google.protobuf.ByteString value) {
      * @return Whether the replyAudio field is set.
      */
     public boolean hasReplyAudio() {
-      return replyAudioBuilder_ != null || replyAudio_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -1371,11 +1409,11 @@ public Builder setReplyAudio(com.google.cloud.dialogflow.v2.OutputAudio value) {
           throw new NullPointerException();
         }
         replyAudio_ = value;
-        onChanged();
       } else {
         replyAudioBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1399,11 +1437,11 @@ public Builder setReplyAudio(
         com.google.cloud.dialogflow.v2.OutputAudio.Builder builderForValue) {
       if (replyAudioBuilder_ == null) {
         replyAudio_ = builderForValue.build();
-        onChanged();
       } else {
         replyAudioBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1425,19 +1463,18 @@ public Builder setReplyAudio(
      */
     public Builder mergeReplyAudio(com.google.cloud.dialogflow.v2.OutputAudio value) {
       if (replyAudioBuilder_ == null) {
-        if (replyAudio_ != null) {
-          replyAudio_ =
-              com.google.cloud.dialogflow.v2.OutputAudio.newBuilder(replyAudio_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && replyAudio_ != null
+            && replyAudio_ != com.google.cloud.dialogflow.v2.OutputAudio.getDefaultInstance()) {
+          getReplyAudioBuilder().mergeFrom(value);
         } else {
           replyAudio_ = value;
         }
-        onChanged();
       } else {
         replyAudioBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1458,14 +1495,13 @@ public Builder mergeReplyAudio(com.google.cloud.dialogflow.v2.OutputAudio value)
      * <code>.google.cloud.dialogflow.v2.OutputAudio reply_audio = 2;</code>
      */
     public Builder clearReplyAudio() {
-      if (replyAudioBuilder_ == null) {
-        replyAudio_ = null;
-        onChanged();
-      } else {
-        replyAudio_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      replyAudio_ = null;
+      if (replyAudioBuilder_ != null) {
+        replyAudioBuilder_.dispose();
         replyAudioBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1486,7 +1522,7 @@ public Builder clearReplyAudio() {
      * <code>.google.cloud.dialogflow.v2.OutputAudio reply_audio = 2;</code>
      */
     public com.google.cloud.dialogflow.v2.OutputAudio.Builder getReplyAudioBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getReplyAudioFieldBuilder().getBuilder();
     }
@@ -1563,7 +1599,9 @@ public com.google.cloud.dialogflow.v2.OutputAudioOrBuilder getReplyAudioOrBuilde
      * Only set if a Dialogflow automated agent has responded.
      * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
      * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-     * are always empty, use [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio] instead.
+     * are always empty, use
+     * [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio]
+     * instead.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 3;</code>
@@ -1571,7 +1609,7 @@ public com.google.cloud.dialogflow.v2.OutputAudioOrBuilder getReplyAudioOrBuilde
      * @return Whether the automatedAgentReply field is set.
      */
     public boolean hasAutomatedAgentReply() {
-      return automatedAgentReplyBuilder_ != null || automatedAgentReply_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1580,7 +1618,9 @@ public boolean hasAutomatedAgentReply() {
      * Only set if a Dialogflow automated agent has responded.
      * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
      * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-     * are always empty, use [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio] instead.
+     * are always empty, use
+     * [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio]
+     * instead.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 3;</code>
@@ -1603,7 +1643,9 @@ public com.google.cloud.dialogflow.v2.AutomatedAgentReply getAutomatedAgentReply
      * Only set if a Dialogflow automated agent has responded.
      * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
      * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-     * are always empty, use [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio] instead.
+     * are always empty, use
+     * [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio]
+     * instead.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 3;</code>
@@ -1615,11 +1657,11 @@ public Builder setAutomatedAgentReply(
           throw new NullPointerException();
         }
         automatedAgentReply_ = value;
-        onChanged();
       } else {
         automatedAgentReplyBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1629,7 +1671,9 @@ public Builder setAutomatedAgentReply(
      * Only set if a Dialogflow automated agent has responded.
      * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
      * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-     * are always empty, use [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio] instead.
+     * are always empty, use
+     * [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio]
+     * instead.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 3;</code>
@@ -1638,11 +1682,11 @@ public Builder setAutomatedAgentReply(
         com.google.cloud.dialogflow.v2.AutomatedAgentReply.Builder builderForValue) {
       if (automatedAgentReplyBuilder_ == null) {
         automatedAgentReply_ = builderForValue.build();
-        onChanged();
       } else {
         automatedAgentReplyBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1652,7 +1696,9 @@ public Builder setAutomatedAgentReply(
      * Only set if a Dialogflow automated agent has responded.
      * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
      * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-     * are always empty, use [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio] instead.
+     * are always empty, use
+     * [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio]
+     * instead.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 3;</code>
@@ -1660,19 +1706,19 @@ public Builder setAutomatedAgentReply(
     public Builder mergeAutomatedAgentReply(
         com.google.cloud.dialogflow.v2.AutomatedAgentReply value) {
       if (automatedAgentReplyBuilder_ == null) {
-        if (automatedAgentReply_ != null) {
-          automatedAgentReply_ =
-              com.google.cloud.dialogflow.v2.AutomatedAgentReply.newBuilder(automatedAgentReply_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && automatedAgentReply_ != null
+            && automatedAgentReply_
+                != com.google.cloud.dialogflow.v2.AutomatedAgentReply.getDefaultInstance()) {
+          getAutomatedAgentReplyBuilder().mergeFrom(value);
         } else {
           automatedAgentReply_ = value;
         }
-        onChanged();
       } else {
         automatedAgentReplyBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1682,20 +1728,21 @@ public Builder mergeAutomatedAgentReply(
      * Only set if a Dialogflow automated agent has responded.
      * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
      * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-     * are always empty, use [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio] instead.
+     * are always empty, use
+     * [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio]
+     * instead.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 3;</code>
      */
     public Builder clearAutomatedAgentReply() {
-      if (automatedAgentReplyBuilder_ == null) {
-        automatedAgentReply_ = null;
-        onChanged();
-      } else {
-        automatedAgentReply_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      automatedAgentReply_ = null;
+      if (automatedAgentReplyBuilder_ != null) {
+        automatedAgentReplyBuilder_.dispose();
         automatedAgentReplyBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1705,14 +1752,16 @@ public Builder clearAutomatedAgentReply() {
      * Only set if a Dialogflow automated agent has responded.
      * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
      * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-     * are always empty, use [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio] instead.
+     * are always empty, use
+     * [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio]
+     * instead.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 3;</code>
      */
     public com.google.cloud.dialogflow.v2.AutomatedAgentReply.Builder
         getAutomatedAgentReplyBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getAutomatedAgentReplyFieldBuilder().getBuilder();
     }
@@ -1723,7 +1772,9 @@ public Builder clearAutomatedAgentReply() {
      * Only set if a Dialogflow automated agent has responded.
      * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
      * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-     * are always empty, use [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio] instead.
+     * are always empty, use
+     * [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio]
+     * instead.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 3;</code>
@@ -1745,7 +1796,9 @@ public Builder clearAutomatedAgentReply() {
      * Only set if a Dialogflow automated agent has responded.
      * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
      * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-     * are always empty, use [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio] instead.
+     * are always empty, use
+     * [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio]
+     * instead.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 3;</code>
@@ -1785,7 +1838,7 @@ public Builder clearAutomatedAgentReply() {
      * @return Whether the message field is set.
      */
     public boolean hasMessage() {
-      return messageBuilder_ != null || message_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1822,11 +1875,11 @@ public Builder setMessage(com.google.cloud.dialogflow.v2.Message value) {
           throw new NullPointerException();
         }
         message_ = value;
-        onChanged();
       } else {
         messageBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1841,11 +1894,11 @@ public Builder setMessage(com.google.cloud.dialogflow.v2.Message value) {
     public Builder setMessage(com.google.cloud.dialogflow.v2.Message.Builder builderForValue) {
       if (messageBuilder_ == null) {
         message_ = builderForValue.build();
-        onChanged();
       } else {
         messageBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1859,19 +1912,18 @@ public Builder setMessage(com.google.cloud.dialogflow.v2.Message.Builder builder
      */
     public Builder mergeMessage(com.google.cloud.dialogflow.v2.Message value) {
       if (messageBuilder_ == null) {
-        if (message_ != null) {
-          message_ =
-              com.google.cloud.dialogflow.v2.Message.newBuilder(message_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && message_ != null
+            && message_ != com.google.cloud.dialogflow.v2.Message.getDefaultInstance()) {
+          getMessageBuilder().mergeFrom(value);
         } else {
           message_ = value;
         }
-        onChanged();
       } else {
         messageBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1884,14 +1936,13 @@ public Builder mergeMessage(com.google.cloud.dialogflow.v2.Message value) {
      * <code>.google.cloud.dialogflow.v2.Message message = 5;</code>
      */
     public Builder clearMessage() {
-      if (messageBuilder_ == null) {
-        message_ = null;
-        onChanged();
-      } else {
-        message_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      message_ = null;
+      if (messageBuilder_ != null) {
+        messageBuilder_.dispose();
         messageBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1904,7 +1955,7 @@ public Builder clearMessage() {
      * <code>.google.cloud.dialogflow.v2.Message message = 5;</code>
      */
     public com.google.cloud.dialogflow.v2.Message.Builder getMessageBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getMessageFieldBuilder().getBuilder();
     }
@@ -1956,11 +2007,11 @@ public com.google.cloud.dialogflow.v2.MessageOrBuilder getMessageOrBuilder() {
         humanAgentSuggestionResults_ = java.util.Collections.emptyList();
 
     private void ensureHumanAgentSuggestionResultsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         humanAgentSuggestionResults_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.SuggestionResult>(
                 humanAgentSuggestionResults_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000010;
       }
     }
 
@@ -1975,7 +2026,8 @@ private void ensureHumanAgentSuggestionResultsIsMutable() {
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * Note that any failure of Agent Assist features will not lead to the overall
      * failure of an AnalyzeContent API call. Instead, the features will
@@ -2000,7 +2052,8 @@ private void ensureHumanAgentSuggestionResultsIsMutable() {
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * Note that any failure of Agent Assist features will not lead to the overall
      * failure of an AnalyzeContent API call. Instead, the features will
@@ -2024,7 +2077,8 @@ public int getHumanAgentSuggestionResultsCount() {
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * Note that any failure of Agent Assist features will not lead to the overall
      * failure of an AnalyzeContent API call. Instead, the features will
@@ -2049,7 +2103,8 @@ public com.google.cloud.dialogflow.v2.SuggestionResult getHumanAgentSuggestionRe
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * Note that any failure of Agent Assist features will not lead to the overall
      * failure of an AnalyzeContent API call. Instead, the features will
@@ -2080,7 +2135,8 @@ public Builder setHumanAgentSuggestionResults(
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * Note that any failure of Agent Assist features will not lead to the overall
      * failure of an AnalyzeContent API call. Instead, the features will
@@ -2108,7 +2164,8 @@ public Builder setHumanAgentSuggestionResults(
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * Note that any failure of Agent Assist features will not lead to the overall
      * failure of an AnalyzeContent API call. Instead, the features will
@@ -2139,7 +2196,8 @@ public Builder addHumanAgentSuggestionResults(
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * Note that any failure of Agent Assist features will not lead to the overall
      * failure of an AnalyzeContent API call. Instead, the features will
@@ -2170,7 +2228,8 @@ public Builder addHumanAgentSuggestionResults(
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * Note that any failure of Agent Assist features will not lead to the overall
      * failure of an AnalyzeContent API call. Instead, the features will
@@ -2198,7 +2257,8 @@ public Builder addHumanAgentSuggestionResults(
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * Note that any failure of Agent Assist features will not lead to the overall
      * failure of an AnalyzeContent API call. Instead, the features will
@@ -2226,7 +2286,8 @@ public Builder addHumanAgentSuggestionResults(
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * Note that any failure of Agent Assist features will not lead to the overall
      * failure of an AnalyzeContent API call. Instead, the features will
@@ -2255,7 +2316,8 @@ public Builder addAllHumanAgentSuggestionResults(
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * Note that any failure of Agent Assist features will not lead to the overall
      * failure of an AnalyzeContent API call. Instead, the features will
@@ -2270,7 +2332,7 @@ public Builder addAllHumanAgentSuggestionResults(
     public Builder clearHumanAgentSuggestionResults() {
       if (humanAgentSuggestionResultsBuilder_ == null) {
         humanAgentSuggestionResults_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
       } else {
         humanAgentSuggestionResultsBuilder_.clear();
@@ -2282,7 +2344,8 @@ public Builder clearHumanAgentSuggestionResults() {
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * Note that any failure of Agent Assist features will not lead to the overall
      * failure of an AnalyzeContent API call. Instead, the features will
@@ -2309,7 +2372,8 @@ public Builder removeHumanAgentSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * Note that any failure of Agent Assist features will not lead to the overall
      * failure of an AnalyzeContent API call. Instead, the features will
@@ -2330,7 +2394,8 @@ public Builder removeHumanAgentSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * Note that any failure of Agent Assist features will not lead to the overall
      * failure of an AnalyzeContent API call. Instead, the features will
@@ -2355,7 +2420,8 @@ public Builder removeHumanAgentSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * Note that any failure of Agent Assist features will not lead to the overall
      * failure of an AnalyzeContent API call. Instead, the features will
@@ -2380,7 +2446,8 @@ public Builder removeHumanAgentSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * Note that any failure of Agent Assist features will not lead to the overall
      * failure of an AnalyzeContent API call. Instead, the features will
@@ -2402,7 +2469,8 @@ public Builder removeHumanAgentSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * Note that any failure of Agent Assist features will not lead to the overall
      * failure of an AnalyzeContent API call. Instead, the features will
@@ -2424,7 +2492,8 @@ public Builder removeHumanAgentSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * Note that any failure of Agent Assist features will not lead to the overall
      * failure of an AnalyzeContent API call. Instead, the features will
@@ -2453,7 +2522,7 @@ public Builder removeHumanAgentSuggestionResults(int index) {
                 com.google.cloud.dialogflow.v2.SuggestionResult.Builder,
                 com.google.cloud.dialogflow.v2.SuggestionResultOrBuilder>(
                 humanAgentSuggestionResults_,
-                ((bitField0_ & 0x00000001) != 0),
+                ((bitField0_ & 0x00000010) != 0),
                 getParentForChildren(),
                 isClean());
         humanAgentSuggestionResults_ = null;
@@ -2465,11 +2534,11 @@ public Builder removeHumanAgentSuggestionResults(int index) {
         endUserSuggestionResults_ = java.util.Collections.emptyList();
 
     private void ensureEndUserSuggestionResultsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000020) != 0)) {
         endUserSuggestionResults_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.SuggestionResult>(
                 endUserSuggestionResults_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000020;
       }
     }
 
@@ -2484,7 +2553,8 @@ private void ensureEndUserSuggestionResultsIsMutable() {
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * Same as human_agent_suggestion_results, any failure of Agent Assist
      * features will not lead to the overall failure of an AnalyzeContent API
@@ -2508,7 +2578,8 @@ private void ensureEndUserSuggestionResultsIsMutable() {
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * Same as human_agent_suggestion_results, any failure of Agent Assist
      * features will not lead to the overall failure of an AnalyzeContent API
@@ -2531,7 +2602,8 @@ public int getEndUserSuggestionResultsCount() {
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * Same as human_agent_suggestion_results, any failure of Agent Assist
      * features will not lead to the overall failure of an AnalyzeContent API
@@ -2554,7 +2626,8 @@ public com.google.cloud.dialogflow.v2.SuggestionResult getEndUserSuggestionResul
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * Same as human_agent_suggestion_results, any failure of Agent Assist
      * features will not lead to the overall failure of an AnalyzeContent API
@@ -2584,7 +2657,8 @@ public Builder setEndUserSuggestionResults(
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * Same as human_agent_suggestion_results, any failure of Agent Assist
      * features will not lead to the overall failure of an AnalyzeContent API
@@ -2611,7 +2685,8 @@ public Builder setEndUserSuggestionResults(
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * Same as human_agent_suggestion_results, any failure of Agent Assist
      * features will not lead to the overall failure of an AnalyzeContent API
@@ -2641,7 +2716,8 @@ public Builder addEndUserSuggestionResults(
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * Same as human_agent_suggestion_results, any failure of Agent Assist
      * features will not lead to the overall failure of an AnalyzeContent API
@@ -2671,7 +2747,8 @@ public Builder addEndUserSuggestionResults(
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * Same as human_agent_suggestion_results, any failure of Agent Assist
      * features will not lead to the overall failure of an AnalyzeContent API
@@ -2698,7 +2775,8 @@ public Builder addEndUserSuggestionResults(
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * Same as human_agent_suggestion_results, any failure of Agent Assist
      * features will not lead to the overall failure of an AnalyzeContent API
@@ -2725,7 +2803,8 @@ public Builder addEndUserSuggestionResults(
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * Same as human_agent_suggestion_results, any failure of Agent Assist
      * features will not lead to the overall failure of an AnalyzeContent API
@@ -2752,7 +2831,8 @@ public Builder addAllEndUserSuggestionResults(
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * Same as human_agent_suggestion_results, any failure of Agent Assist
      * features will not lead to the overall failure of an AnalyzeContent API
@@ -2766,7 +2846,7 @@ public Builder addAllEndUserSuggestionResults(
     public Builder clearEndUserSuggestionResults() {
       if (endUserSuggestionResultsBuilder_ == null) {
         endUserSuggestionResults_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000020);
         onChanged();
       } else {
         endUserSuggestionResultsBuilder_.clear();
@@ -2778,7 +2858,8 @@ public Builder clearEndUserSuggestionResults() {
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * Same as human_agent_suggestion_results, any failure of Agent Assist
      * features will not lead to the overall failure of an AnalyzeContent API
@@ -2804,7 +2885,8 @@ public Builder removeEndUserSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * Same as human_agent_suggestion_results, any failure of Agent Assist
      * features will not lead to the overall failure of an AnalyzeContent API
@@ -2824,7 +2906,8 @@ public Builder removeEndUserSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * Same as human_agent_suggestion_results, any failure of Agent Assist
      * features will not lead to the overall failure of an AnalyzeContent API
@@ -2848,7 +2931,8 @@ public Builder removeEndUserSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * Same as human_agent_suggestion_results, any failure of Agent Assist
      * features will not lead to the overall failure of an AnalyzeContent API
@@ -2872,7 +2956,8 @@ public Builder removeEndUserSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * Same as human_agent_suggestion_results, any failure of Agent Assist
      * features will not lead to the overall failure of an AnalyzeContent API
@@ -2893,7 +2978,8 @@ public Builder removeEndUserSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * Same as human_agent_suggestion_results, any failure of Agent Assist
      * features will not lead to the overall failure of an AnalyzeContent API
@@ -2914,7 +3000,8 @@ public Builder removeEndUserSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * Same as human_agent_suggestion_results, any failure of Agent Assist
      * features will not lead to the overall failure of an AnalyzeContent API
@@ -2942,7 +3029,7 @@ public Builder removeEndUserSuggestionResults(int index) {
                 com.google.cloud.dialogflow.v2.SuggestionResult.Builder,
                 com.google.cloud.dialogflow.v2.SuggestionResultOrBuilder>(
                 endUserSuggestionResults_,
-                ((bitField0_ & 0x00000002) != 0),
+                ((bitField0_ & 0x00000020) != 0),
                 getParentForChildren(),
                 isClean());
         endUserSuggestionResults_ = null;
@@ -2968,7 +3055,7 @@ public Builder removeEndUserSuggestionResults(int index) {
      * @return Whether the dtmfParameters field is set.
      */
     public boolean hasDtmfParameters() {
-      return dtmfParametersBuilder_ != null || dtmfParameters_ != null;
+      return ((bitField0_ & 0x00000040) != 0);
     }
     /**
      *
@@ -3005,11 +3092,11 @@ public Builder setDtmfParameters(com.google.cloud.dialogflow.v2.DtmfParameters v
           throw new NullPointerException();
         }
         dtmfParameters_ = value;
-        onChanged();
       } else {
         dtmfParametersBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -3025,11 +3112,11 @@ public Builder setDtmfParameters(
         com.google.cloud.dialogflow.v2.DtmfParameters.Builder builderForValue) {
       if (dtmfParametersBuilder_ == null) {
         dtmfParameters_ = builderForValue.build();
-        onChanged();
       } else {
         dtmfParametersBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -3043,19 +3130,19 @@ public Builder setDtmfParameters(
      */
     public Builder mergeDtmfParameters(com.google.cloud.dialogflow.v2.DtmfParameters value) {
       if (dtmfParametersBuilder_ == null) {
-        if (dtmfParameters_ != null) {
-          dtmfParameters_ =
-              com.google.cloud.dialogflow.v2.DtmfParameters.newBuilder(dtmfParameters_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000040) != 0)
+            && dtmfParameters_ != null
+            && dtmfParameters_
+                != com.google.cloud.dialogflow.v2.DtmfParameters.getDefaultInstance()) {
+          getDtmfParametersBuilder().mergeFrom(value);
         } else {
           dtmfParameters_ = value;
         }
-        onChanged();
       } else {
         dtmfParametersBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -3068,14 +3155,13 @@ public Builder mergeDtmfParameters(com.google.cloud.dialogflow.v2.DtmfParameters
      * <code>.google.cloud.dialogflow.v2.DtmfParameters dtmf_parameters = 9;</code>
      */
     public Builder clearDtmfParameters() {
-      if (dtmfParametersBuilder_ == null) {
-        dtmfParameters_ = null;
-        onChanged();
-      } else {
-        dtmfParameters_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      dtmfParameters_ = null;
+      if (dtmfParametersBuilder_ != null) {
+        dtmfParametersBuilder_.dispose();
         dtmfParametersBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3088,7 +3174,7 @@ public Builder clearDtmfParameters() {
      * <code>.google.cloud.dialogflow.v2.DtmfParameters dtmf_parameters = 9;</code>
      */
     public com.google.cloud.dialogflow.v2.DtmfParameters.Builder getDtmfParametersBuilder() {
-
+      bitField0_ |= 0x00000040;
       onChanged();
       return getDtmfParametersFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnalyzeContentResponseOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnalyzeContentResponseOrBuilder.java
index bf33da2ee91f..de5168f83d75 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnalyzeContentResponseOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnalyzeContentResponseOrBuilder.java
@@ -118,7 +118,9 @@ public interface AnalyzeContentResponseOrBuilder
    * Only set if a Dialogflow automated agent has responded.
    * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
    * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-   * are always empty, use [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio] instead.
+   * are always empty, use
+   * [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio]
+   * instead.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 3;</code>
@@ -133,7 +135,9 @@ public interface AnalyzeContentResponseOrBuilder
    * Only set if a Dialogflow automated agent has responded.
    * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
    * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-   * are always empty, use [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio] instead.
+   * are always empty, use
+   * [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio]
+   * instead.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 3;</code>
@@ -148,7 +152,9 @@ public interface AnalyzeContentResponseOrBuilder
    * Only set if a Dialogflow automated agent has responded.
    * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
    * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-   * are always empty, use [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio] instead.
+   * are always empty, use
+   * [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio]
+   * instead.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 3;</code>
@@ -195,7 +201,8 @@ public interface AnalyzeContentResponseOrBuilder
    *
    * <pre>
    * The suggestions for most recent human agent. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
    * Note that any failure of Agent Assist features will not lead to the overall
    * failure of an AnalyzeContent API call. Instead, the features will
@@ -213,7 +220,8 @@ public interface AnalyzeContentResponseOrBuilder
    *
    * <pre>
    * The suggestions for most recent human agent. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
    * Note that any failure of Agent Assist features will not lead to the overall
    * failure of an AnalyzeContent API call. Instead, the features will
@@ -230,7 +238,8 @@ public interface AnalyzeContentResponseOrBuilder
    *
    * <pre>
    * The suggestions for most recent human agent. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
    * Note that any failure of Agent Assist features will not lead to the overall
    * failure of an AnalyzeContent API call. Instead, the features will
@@ -247,7 +256,8 @@ public interface AnalyzeContentResponseOrBuilder
    *
    * <pre>
    * The suggestions for most recent human agent. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
    * Note that any failure of Agent Assist features will not lead to the overall
    * failure of an AnalyzeContent API call. Instead, the features will
@@ -265,7 +275,8 @@ public interface AnalyzeContentResponseOrBuilder
    *
    * <pre>
    * The suggestions for most recent human agent. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
    * Note that any failure of Agent Assist features will not lead to the overall
    * failure of an AnalyzeContent API call. Instead, the features will
@@ -284,7 +295,8 @@ com.google.cloud.dialogflow.v2.SuggestionResultOrBuilder getHumanAgentSuggestion
    *
    * <pre>
    * The suggestions for end user. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
    * Same as human_agent_suggestion_results, any failure of Agent Assist
    * features will not lead to the overall failure of an AnalyzeContent API
@@ -301,7 +313,8 @@ com.google.cloud.dialogflow.v2.SuggestionResultOrBuilder getHumanAgentSuggestion
    *
    * <pre>
    * The suggestions for end user. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
    * Same as human_agent_suggestion_results, any failure of Agent Assist
    * features will not lead to the overall failure of an AnalyzeContent API
@@ -318,7 +331,8 @@ com.google.cloud.dialogflow.v2.SuggestionResultOrBuilder getHumanAgentSuggestion
    *
    * <pre>
    * The suggestions for end user. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
    * Same as human_agent_suggestion_results, any failure of Agent Assist
    * features will not lead to the overall failure of an AnalyzeContent API
@@ -335,7 +349,8 @@ com.google.cloud.dialogflow.v2.SuggestionResultOrBuilder getHumanAgentSuggestion
    *
    * <pre>
    * The suggestions for end user. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
    * Same as human_agent_suggestion_results, any failure of Agent Assist
    * features will not lead to the overall failure of an AnalyzeContent API
@@ -353,7 +368,8 @@ com.google.cloud.dialogflow.v2.SuggestionResultOrBuilder getHumanAgentSuggestion
    *
    * <pre>
    * The suggestions for end user. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
    * Same as human_agent_suggestion_results, any failure of Agent Assist
    * features will not lead to the overall failure of an AnalyzeContent API
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnnotatedMessagePart.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnnotatedMessagePart.java
index cf9332be8abf..f04c2d4354fd 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnnotatedMessagePart.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnnotatedMessagePart.java
@@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int TEXT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object text_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object text_ = "";
   /**
    *
    *
@@ -120,7 +122,9 @@ public com.google.protobuf.ByteString getTextBytes() {
   }
 
   public static final int ENTITY_TYPE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object entityType_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object entityType_ = "";
   /**
    *
    *
@@ -246,7 +250,9 @@ public com.google.protobuf.Value getFormattedValue() {
    */
   @java.lang.Override
   public com.google.protobuf.ValueOrBuilder getFormattedValueOrBuilder() {
-    return getFormattedValue();
+    return formattedValue_ == null
+        ? com.google.protobuf.Value.getDefaultInstance()
+        : formattedValue_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -471,14 +477,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       text_ = "";
-
       entityType_ = "";
-
-      if (formattedValueBuilder_ == null) {
-        formattedValue_ = null;
-      } else {
-        formattedValue_ = null;
+      formattedValue_ = null;
+      if (formattedValueBuilder_ != null) {
+        formattedValueBuilder_.dispose();
         formattedValueBuilder_ = null;
       }
       return this;
@@ -508,17 +512,27 @@ public com.google.cloud.dialogflow.v2.AnnotatedMessagePart build() {
     public com.google.cloud.dialogflow.v2.AnnotatedMessagePart buildPartial() {
       com.google.cloud.dialogflow.v2.AnnotatedMessagePart result =
           new com.google.cloud.dialogflow.v2.AnnotatedMessagePart(this);
-      result.text_ = text_;
-      result.entityType_ = entityType_;
-      if (formattedValueBuilder_ == null) {
-        result.formattedValue_ = formattedValue_;
-      } else {
-        result.formattedValue_ = formattedValueBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.AnnotatedMessagePart result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.text_ = text_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.entityType_ = entityType_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.formattedValue_ =
+            formattedValueBuilder_ == null ? formattedValue_ : formattedValueBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -567,10 +581,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.AnnotatedMessagePart oth
         return this;
       if (!other.getText().isEmpty()) {
         text_ = other.text_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getEntityType().isEmpty()) {
         entityType_ = other.entityType_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasFormattedValue()) {
@@ -605,19 +621,19 @@ public Builder mergeFrom(
             case 10:
               {
                 text_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 entityType_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getFormattedValueFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -637,6 +653,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object text_ = "";
     /**
      *
@@ -698,8 +716,8 @@ public Builder setText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       text_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -715,8 +733,8 @@ public Builder setText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearText() {
-
       text_ = getDefaultInstance().getText();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -737,8 +755,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       text_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -813,8 +831,8 @@ public Builder setEntityType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       entityType_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -833,8 +851,8 @@ public Builder setEntityType(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearEntityType() {
-
       entityType_ = getDefaultInstance().getEntityType();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -858,8 +876,8 @@ public Builder setEntityTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       entityType_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -891,7 +909,7 @@ public Builder setEntityTypeBytes(com.google.protobuf.ByteString value) {
      * @return Whether the formattedValue field is set.
      */
     public boolean hasFormattedValue() {
-      return formattedValueBuilder_ != null || formattedValue_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -946,11 +964,11 @@ public Builder setFormattedValue(com.google.protobuf.Value value) {
           throw new NullPointerException();
         }
         formattedValue_ = value;
-        onChanged();
       } else {
         formattedValueBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -974,11 +992,11 @@ public Builder setFormattedValue(com.google.protobuf.Value value) {
     public Builder setFormattedValue(com.google.protobuf.Value.Builder builderForValue) {
       if (formattedValueBuilder_ == null) {
         formattedValue_ = builderForValue.build();
-        onChanged();
       } else {
         formattedValueBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1001,17 +1019,18 @@ public Builder setFormattedValue(com.google.protobuf.Value.Builder builderForVal
      */
     public Builder mergeFormattedValue(com.google.protobuf.Value value) {
       if (formattedValueBuilder_ == null) {
-        if (formattedValue_ != null) {
-          formattedValue_ =
-              com.google.protobuf.Value.newBuilder(formattedValue_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && formattedValue_ != null
+            && formattedValue_ != com.google.protobuf.Value.getDefaultInstance()) {
+          getFormattedValueBuilder().mergeFrom(value);
         } else {
           formattedValue_ = value;
         }
-        onChanged();
       } else {
         formattedValueBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1033,14 +1052,13 @@ public Builder mergeFormattedValue(com.google.protobuf.Value value) {
      * <code>.google.protobuf.Value formatted_value = 3;</code>
      */
     public Builder clearFormattedValue() {
-      if (formattedValueBuilder_ == null) {
-        formattedValue_ = null;
-        onChanged();
-      } else {
-        formattedValue_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      formattedValue_ = null;
+      if (formattedValueBuilder_ != null) {
+        formattedValueBuilder_.dispose();
         formattedValueBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1062,7 +1080,7 @@ public Builder clearFormattedValue() {
      * <code>.google.protobuf.Value formatted_value = 3;</code>
      */
     public com.google.protobuf.Value.Builder getFormattedValueBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getFormattedValueFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnswerFeedback.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnswerFeedback.java
index 5c4f7727ccfa..1d4b3ed3fa77 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnswerFeedback.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnswerFeedback.java
@@ -294,7 +294,7 @@ public DetailFeedbackCase getDetailFeedbackCase() {
   }
 
   public static final int CORRECTNESS_LEVEL_FIELD_NUMBER = 1;
-  private int correctnessLevel_;
+  private int correctnessLevel_ = 0;
   /**
    *
    *
@@ -323,9 +323,8 @@ public int getCorrectnessLevelValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.AnswerFeedback.CorrectnessLevel getCorrectnessLevel() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.AnswerFeedback.CorrectnessLevel result =
-        com.google.cloud.dialogflow.v2.AnswerFeedback.CorrectnessLevel.valueOf(correctnessLevel_);
+        com.google.cloud.dialogflow.v2.AnswerFeedback.CorrectnessLevel.forNumber(correctnessLevel_);
     return result == null
         ? com.google.cloud.dialogflow.v2.AnswerFeedback.CorrectnessLevel.UNRECOGNIZED
         : result;
@@ -387,7 +386,7 @@ public com.google.cloud.dialogflow.v2.AgentAssistantFeedback getAgentAssistantDe
   }
 
   public static final int CLICKED_FIELD_NUMBER = 3;
-  private boolean clicked_;
+  private boolean clicked_ = false;
   /**
    *
    *
@@ -448,11 +447,11 @@ public com.google.protobuf.Timestamp getClickTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getClickTimeOrBuilder() {
-    return getClickTime();
+    return clickTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : clickTime_;
   }
 
   public static final int DISPLAYED_FIELD_NUMBER = 4;
-  private boolean displayed_;
+  private boolean displayed_ = false;
   /**
    *
    *
@@ -513,7 +512,7 @@ public com.google.protobuf.Timestamp getDisplayTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getDisplayTimeOrBuilder() {
-    return getDisplayTime();
+    return displayTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : displayTime_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -792,25 +791,21 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       correctnessLevel_ = 0;
-
       if (agentAssistantDetailFeedbackBuilder_ != null) {
         agentAssistantDetailFeedbackBuilder_.clear();
       }
       clicked_ = false;
-
-      if (clickTimeBuilder_ == null) {
-        clickTime_ = null;
-      } else {
-        clickTime_ = null;
+      clickTime_ = null;
+      if (clickTimeBuilder_ != null) {
+        clickTimeBuilder_.dispose();
         clickTimeBuilder_ = null;
       }
       displayed_ = false;
-
-      if (displayTimeBuilder_ == null) {
-        displayTime_ = null;
-      } else {
-        displayTime_ = null;
+      displayTime_ = null;
+      if (displayTimeBuilder_ != null) {
+        displayTimeBuilder_.dispose();
         displayTimeBuilder_ = null;
       }
       detailFeedbackCase_ = 0;
@@ -842,29 +837,40 @@ public com.google.cloud.dialogflow.v2.AnswerFeedback build() {
     public com.google.cloud.dialogflow.v2.AnswerFeedback buildPartial() {
       com.google.cloud.dialogflow.v2.AnswerFeedback result =
           new com.google.cloud.dialogflow.v2.AnswerFeedback(this);
-      result.correctnessLevel_ = correctnessLevel_;
-      if (detailFeedbackCase_ == 2) {
-        if (agentAssistantDetailFeedbackBuilder_ == null) {
-          result.detailFeedback_ = detailFeedback_;
-        } else {
-          result.detailFeedback_ = agentAssistantDetailFeedbackBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.clicked_ = clicked_;
-      if (clickTimeBuilder_ == null) {
-        result.clickTime_ = clickTime_;
-      } else {
-        result.clickTime_ = clickTimeBuilder_.build();
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.AnswerFeedback result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.correctnessLevel_ = correctnessLevel_;
       }
-      result.displayed_ = displayed_;
-      if (displayTimeBuilder_ == null) {
-        result.displayTime_ = displayTime_;
-      } else {
-        result.displayTime_ = displayTimeBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.clicked_ = clicked_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.clickTime_ = clickTimeBuilder_ == null ? clickTime_ : clickTimeBuilder_.build();
       }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.displayed_ = displayed_;
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.displayTime_ =
+            displayTimeBuilder_ == null ? displayTime_ : displayTimeBuilder_.build();
+      }
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2.AnswerFeedback result) {
       result.detailFeedbackCase_ = detailFeedbackCase_;
-      onBuilt();
-      return result;
+      result.detailFeedback_ = this.detailFeedback_;
+      if (detailFeedbackCase_ == 2 && agentAssistantDetailFeedbackBuilder_ != null) {
+        result.detailFeedback_ = agentAssistantDetailFeedbackBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -967,7 +973,7 @@ public Builder mergeFrom(
             case 8:
               {
                 correctnessLevel_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 18:
@@ -980,25 +986,25 @@ public Builder mergeFrom(
             case 24:
               {
                 clicked_ = input.readBool();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 32:
               {
                 displayed_ = input.readBool();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 32
             case 42:
               {
                 input.readMessage(getClickTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 42
             case 50:
               {
                 input.readMessage(getDisplayTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 50
             default:
@@ -1032,6 +1038,8 @@ public Builder clearDetailFeedback() {
       return this;
     }
 
+    private int bitField0_;
+
     private int correctnessLevel_ = 0;
     /**
      *
@@ -1063,8 +1071,8 @@ public int getCorrectnessLevelValue() {
      * @return This builder for chaining.
      */
     public Builder setCorrectnessLevelValue(int value) {
-
       correctnessLevel_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1082,9 +1090,9 @@ public Builder setCorrectnessLevelValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.AnswerFeedback.CorrectnessLevel getCorrectnessLevel() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.AnswerFeedback.CorrectnessLevel result =
-          com.google.cloud.dialogflow.v2.AnswerFeedback.CorrectnessLevel.valueOf(correctnessLevel_);
+          com.google.cloud.dialogflow.v2.AnswerFeedback.CorrectnessLevel.forNumber(
+              correctnessLevel_);
       return result == null
           ? com.google.cloud.dialogflow.v2.AnswerFeedback.CorrectnessLevel.UNRECOGNIZED
           : result;
@@ -1107,7 +1115,7 @@ public Builder setCorrectnessLevel(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       correctnessLevel_ = value.getNumber();
       onChanged();
       return this;
@@ -1125,7 +1133,7 @@ public Builder setCorrectnessLevel(
      * @return This builder for chaining.
      */
     public Builder clearCorrectnessLevel() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       correctnessLevel_ = 0;
       onChanged();
       return this;
@@ -1352,7 +1360,6 @@ public Builder clearAgentAssistantDetailFeedback() {
       }
       detailFeedbackCase_ = 2;
       onChanged();
-      ;
       return agentAssistantDetailFeedbackBuilder_;
     }
 
@@ -1389,6 +1396,7 @@ public boolean getClicked() {
     public Builder setClicked(boolean value) {
 
       clicked_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1405,7 +1413,7 @@ public Builder setClicked(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearClicked() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       clicked_ = false;
       onChanged();
       return this;
@@ -1429,7 +1437,7 @@ public Builder clearClicked() {
      * @return Whether the clickTime field is set.
      */
     public boolean hasClickTime() {
-      return clickTimeBuilder_ != null || clickTime_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1464,11 +1472,11 @@ public Builder setClickTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         clickTime_ = value;
-        onChanged();
       } else {
         clickTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1483,11 +1491,11 @@ public Builder setClickTime(com.google.protobuf.Timestamp value) {
     public Builder setClickTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (clickTimeBuilder_ == null) {
         clickTime_ = builderForValue.build();
-        onChanged();
       } else {
         clickTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1501,17 +1509,18 @@ public Builder setClickTime(com.google.protobuf.Timestamp.Builder builderForValu
      */
     public Builder mergeClickTime(com.google.protobuf.Timestamp value) {
       if (clickTimeBuilder_ == null) {
-        if (clickTime_ != null) {
-          clickTime_ =
-              com.google.protobuf.Timestamp.newBuilder(clickTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && clickTime_ != null
+            && clickTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getClickTimeBuilder().mergeFrom(value);
         } else {
           clickTime_ = value;
         }
-        onChanged();
       } else {
         clickTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1524,14 +1533,13 @@ public Builder mergeClickTime(com.google.protobuf.Timestamp value) {
      * <code>.google.protobuf.Timestamp click_time = 5;</code>
      */
     public Builder clearClickTime() {
-      if (clickTimeBuilder_ == null) {
-        clickTime_ = null;
-        onChanged();
-      } else {
-        clickTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      clickTime_ = null;
+      if (clickTimeBuilder_ != null) {
+        clickTimeBuilder_.dispose();
         clickTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1544,7 +1552,7 @@ public Builder clearClickTime() {
      * <code>.google.protobuf.Timestamp click_time = 5;</code>
      */
     public com.google.protobuf.Timestamp.Builder getClickTimeBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getClickTimeFieldBuilder().getBuilder();
     }
@@ -1623,6 +1631,7 @@ public boolean getDisplayed() {
     public Builder setDisplayed(boolean value) {
 
       displayed_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1639,7 +1648,7 @@ public Builder setDisplayed(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayed() {
-
+      bitField0_ = (bitField0_ & ~0x00000010);
       displayed_ = false;
       onChanged();
       return this;
@@ -1663,7 +1672,7 @@ public Builder clearDisplayed() {
      * @return Whether the displayTime field is set.
      */
     public boolean hasDisplayTime() {
-      return displayTimeBuilder_ != null || displayTime_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -1700,11 +1709,11 @@ public Builder setDisplayTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         displayTime_ = value;
-        onChanged();
       } else {
         displayTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1719,11 +1728,11 @@ public Builder setDisplayTime(com.google.protobuf.Timestamp value) {
     public Builder setDisplayTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (displayTimeBuilder_ == null) {
         displayTime_ = builderForValue.build();
-        onChanged();
       } else {
         displayTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1737,19 +1746,18 @@ public Builder setDisplayTime(com.google.protobuf.Timestamp.Builder builderForVa
      */
     public Builder mergeDisplayTime(com.google.protobuf.Timestamp value) {
       if (displayTimeBuilder_ == null) {
-        if (displayTime_ != null) {
-          displayTime_ =
-              com.google.protobuf.Timestamp.newBuilder(displayTime_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && displayTime_ != null
+            && displayTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getDisplayTimeBuilder().mergeFrom(value);
         } else {
           displayTime_ = value;
         }
-        onChanged();
       } else {
         displayTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1762,14 +1770,13 @@ public Builder mergeDisplayTime(com.google.protobuf.Timestamp value) {
      * <code>.google.protobuf.Timestamp display_time = 6;</code>
      */
     public Builder clearDisplayTime() {
-      if (displayTimeBuilder_ == null) {
-        displayTime_ = null;
-        onChanged();
-      } else {
-        displayTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      displayTime_ = null;
+      if (displayTimeBuilder_ != null) {
+        displayTimeBuilder_.dispose();
         displayTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1782,7 +1789,7 @@ public Builder clearDisplayTime() {
      * <code>.google.protobuf.Timestamp display_time = 6;</code>
      */
     public com.google.protobuf.Timestamp.Builder getDisplayTimeBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getDisplayTimeFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnswerRecord.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnswerRecord.java
index 5a84ba8c6c4c..2631b85029d9 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnswerRecord.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnswerRecord.java
@@ -36,9 +36,11 @@
  * agent assistant suggestion generated.
  * A typical workflow for customers provide feedback to an answer is:
  * 1. For human agent assistant, customers get suggestion via ListSuggestions
- *    API. Together with the answers, [AnswerRecord.name][google.cloud.dialogflow.v2.AnswerRecord.name] are returned to the
- *    customers.
- * 2. The customer uses the [AnswerRecord.name][google.cloud.dialogflow.v2.AnswerRecord.name] to call the
+ *    API. Together with the answers,
+ *    [AnswerRecord.name][google.cloud.dialogflow.v2.AnswerRecord.name] are
+ *    returned to the customers.
+ * 2. The customer uses the
+ * [AnswerRecord.name][google.cloud.dialogflow.v2.AnswerRecord.name] to call the
  *    [UpdateAnswerRecord][] method to send feedback about a specific answer
  *    that they believe is wrong.
  * </pre>
@@ -130,7 +132,9 @@ public RecordCase getRecordCase() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -189,8 +193,8 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * <pre>
    * Required. The AnswerFeedback for this record. You can set this with
-   * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord] in order to give us feedback about
-   * this answer.
+   * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord]
+   * in order to give us feedback about this answer.
    * </pre>
    *
    * <code>
@@ -208,8 +212,8 @@ public boolean hasAnswerFeedback() {
    *
    * <pre>
    * Required. The AnswerFeedback for this record. You can set this with
-   * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord] in order to give us feedback about
-   * this answer.
+   * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord]
+   * in order to give us feedback about this answer.
    * </pre>
    *
    * <code>
@@ -229,8 +233,8 @@ public com.google.cloud.dialogflow.v2.AnswerFeedback getAnswerFeedback() {
    *
    * <pre>
    * Required. The AnswerFeedback for this record. You can set this with
-   * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord] in order to give us feedback about
-   * this answer.
+   * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord]
+   * in order to give us feedback about this answer.
    * </pre>
    *
    * <code>
@@ -239,7 +243,9 @@ public com.google.cloud.dialogflow.v2.AnswerFeedback getAnswerFeedback() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.AnswerFeedbackOrBuilder getAnswerFeedbackOrBuilder() {
-    return getAnswerFeedback();
+    return answerFeedback_ == null
+        ? com.google.cloud.dialogflow.v2.AnswerFeedback.getDefaultInstance()
+        : answerFeedback_;
   }
 
   public static final int AGENT_ASSISTANT_RECORD_FIELD_NUMBER = 4;
@@ -515,9 +521,11 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * agent assistant suggestion generated.
    * A typical workflow for customers provide feedback to an answer is:
    * 1. For human agent assistant, customers get suggestion via ListSuggestions
-   *    API. Together with the answers, [AnswerRecord.name][google.cloud.dialogflow.v2.AnswerRecord.name] are returned to the
-   *    customers.
-   * 2. The customer uses the [AnswerRecord.name][google.cloud.dialogflow.v2.AnswerRecord.name] to call the
+   *    API. Together with the answers,
+   *    [AnswerRecord.name][google.cloud.dialogflow.v2.AnswerRecord.name] are
+   *    returned to the customers.
+   * 2. The customer uses the
+   * [AnswerRecord.name][google.cloud.dialogflow.v2.AnswerRecord.name] to call the
    *    [UpdateAnswerRecord][] method to send feedback about a specific answer
    *    that they believe is wrong.
    * </pre>
@@ -553,12 +561,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
-      if (answerFeedbackBuilder_ == null) {
-        answerFeedback_ = null;
-      } else {
-        answerFeedback_ = null;
+      answerFeedback_ = null;
+      if (answerFeedbackBuilder_ != null) {
+        answerFeedbackBuilder_.dispose();
         answerFeedbackBuilder_ = null;
       }
       if (agentAssistantRecordBuilder_ != null) {
@@ -593,24 +600,33 @@ public com.google.cloud.dialogflow.v2.AnswerRecord build() {
     public com.google.cloud.dialogflow.v2.AnswerRecord buildPartial() {
       com.google.cloud.dialogflow.v2.AnswerRecord result =
           new com.google.cloud.dialogflow.v2.AnswerRecord(this);
-      result.name_ = name_;
-      if (answerFeedbackBuilder_ == null) {
-        result.answerFeedback_ = answerFeedback_;
-      } else {
-        result.answerFeedback_ = answerFeedbackBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (recordCase_ == 4) {
-        if (agentAssistantRecordBuilder_ == null) {
-          result.record_ = record_;
-        } else {
-          result.record_ = agentAssistantRecordBuilder_.build();
-        }
-      }
-      result.recordCase_ = recordCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.AnswerRecord result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.answerFeedback_ =
+            answerFeedbackBuilder_ == null ? answerFeedback_ : answerFeedbackBuilder_.build();
+      }
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2.AnswerRecord result) {
+      result.recordCase_ = recordCase_;
+      result.record_ = this.record_;
+      if (recordCase_ == 4 && agentAssistantRecordBuilder_ != null) {
+        result.record_ = agentAssistantRecordBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -658,6 +674,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.AnswerRecord other) {
       if (other == com.google.cloud.dialogflow.v2.AnswerRecord.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasAnswerFeedback()) {
@@ -703,13 +720,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getAnswerFeedbackFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 34:
@@ -750,6 +767,8 @@ public Builder clearRecord() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -817,8 +836,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -836,8 +855,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -860,8 +879,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -877,8 +896,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      *
      * <pre>
      * Required. The AnswerFeedback for this record. You can set this with
-     * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord] in order to give us feedback about
-     * this answer.
+     * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord]
+     * in order to give us feedback about this answer.
      * </pre>
      *
      * <code>
@@ -888,15 +907,15 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      * @return Whether the answerFeedback field is set.
      */
     public boolean hasAnswerFeedback() {
-      return answerFeedbackBuilder_ != null || answerFeedback_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
      *
      * <pre>
      * Required. The AnswerFeedback for this record. You can set this with
-     * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord] in order to give us feedback about
-     * this answer.
+     * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord]
+     * in order to give us feedback about this answer.
      * </pre>
      *
      * <code>
@@ -919,8 +938,8 @@ public com.google.cloud.dialogflow.v2.AnswerFeedback getAnswerFeedback() {
      *
      * <pre>
      * Required. The AnswerFeedback for this record. You can set this with
-     * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord] in order to give us feedback about
-     * this answer.
+     * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord]
+     * in order to give us feedback about this answer.
      * </pre>
      *
      * <code>
@@ -933,11 +952,11 @@ public Builder setAnswerFeedback(com.google.cloud.dialogflow.v2.AnswerFeedback v
           throw new NullPointerException();
         }
         answerFeedback_ = value;
-        onChanged();
       } else {
         answerFeedbackBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -945,8 +964,8 @@ public Builder setAnswerFeedback(com.google.cloud.dialogflow.v2.AnswerFeedback v
      *
      * <pre>
      * Required. The AnswerFeedback for this record. You can set this with
-     * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord] in order to give us feedback about
-     * this answer.
+     * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord]
+     * in order to give us feedback about this answer.
      * </pre>
      *
      * <code>
@@ -957,11 +976,11 @@ public Builder setAnswerFeedback(
         com.google.cloud.dialogflow.v2.AnswerFeedback.Builder builderForValue) {
       if (answerFeedbackBuilder_ == null) {
         answerFeedback_ = builderForValue.build();
-        onChanged();
       } else {
         answerFeedbackBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -969,8 +988,8 @@ public Builder setAnswerFeedback(
      *
      * <pre>
      * Required. The AnswerFeedback for this record. You can set this with
-     * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord] in order to give us feedback about
-     * this answer.
+     * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord]
+     * in order to give us feedback about this answer.
      * </pre>
      *
      * <code>
@@ -979,19 +998,19 @@ public Builder setAnswerFeedback(
      */
     public Builder mergeAnswerFeedback(com.google.cloud.dialogflow.v2.AnswerFeedback value) {
       if (answerFeedbackBuilder_ == null) {
-        if (answerFeedback_ != null) {
-          answerFeedback_ =
-              com.google.cloud.dialogflow.v2.AnswerFeedback.newBuilder(answerFeedback_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && answerFeedback_ != null
+            && answerFeedback_
+                != com.google.cloud.dialogflow.v2.AnswerFeedback.getDefaultInstance()) {
+          getAnswerFeedbackBuilder().mergeFrom(value);
         } else {
           answerFeedback_ = value;
         }
-        onChanged();
       } else {
         answerFeedbackBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -999,8 +1018,8 @@ public Builder mergeAnswerFeedback(com.google.cloud.dialogflow.v2.AnswerFeedback
      *
      * <pre>
      * Required. The AnswerFeedback for this record. You can set this with
-     * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord] in order to give us feedback about
-     * this answer.
+     * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord]
+     * in order to give us feedback about this answer.
      * </pre>
      *
      * <code>
@@ -1008,14 +1027,13 @@ public Builder mergeAnswerFeedback(com.google.cloud.dialogflow.v2.AnswerFeedback
      * </code>
      */
     public Builder clearAnswerFeedback() {
-      if (answerFeedbackBuilder_ == null) {
-        answerFeedback_ = null;
-        onChanged();
-      } else {
-        answerFeedback_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      answerFeedback_ = null;
+      if (answerFeedbackBuilder_ != null) {
+        answerFeedbackBuilder_.dispose();
         answerFeedbackBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1023,8 +1041,8 @@ public Builder clearAnswerFeedback() {
      *
      * <pre>
      * Required. The AnswerFeedback for this record. You can set this with
-     * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord] in order to give us feedback about
-     * this answer.
+     * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord]
+     * in order to give us feedback about this answer.
      * </pre>
      *
      * <code>
@@ -1032,7 +1050,7 @@ public Builder clearAnswerFeedback() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.AnswerFeedback.Builder getAnswerFeedbackBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getAnswerFeedbackFieldBuilder().getBuilder();
     }
@@ -1041,8 +1059,8 @@ public com.google.cloud.dialogflow.v2.AnswerFeedback.Builder getAnswerFeedbackBu
      *
      * <pre>
      * Required. The AnswerFeedback for this record. You can set this with
-     * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord] in order to give us feedback about
-     * this answer.
+     * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord]
+     * in order to give us feedback about this answer.
      * </pre>
      *
      * <code>
@@ -1063,8 +1081,8 @@ public com.google.cloud.dialogflow.v2.AnswerFeedbackOrBuilder getAnswerFeedbackO
      *
      * <pre>
      * Required. The AnswerFeedback for this record. You can set this with
-     * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord] in order to give us feedback about
-     * this answer.
+     * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord]
+     * in order to give us feedback about this answer.
      * </pre>
      *
      * <code>
@@ -1317,7 +1335,6 @@ public Builder clearAgentAssistantRecord() {
       }
       recordCase_ = 4;
       onChanged();
-      ;
       return agentAssistantRecordBuilder_;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnswerRecordOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnswerRecordOrBuilder.java
index 64b76c3dfbad..fefe0c13c1a1 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnswerRecordOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnswerRecordOrBuilder.java
@@ -57,8 +57,8 @@ public interface AnswerRecordOrBuilder
    *
    * <pre>
    * Required. The AnswerFeedback for this record. You can set this with
-   * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord] in order to give us feedback about
-   * this answer.
+   * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord]
+   * in order to give us feedback about this answer.
    * </pre>
    *
    * <code>
@@ -73,8 +73,8 @@ public interface AnswerRecordOrBuilder
    *
    * <pre>
    * Required. The AnswerFeedback for this record. You can set this with
-   * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord] in order to give us feedback about
-   * this answer.
+   * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord]
+   * in order to give us feedback about this answer.
    * </pre>
    *
    * <code>
@@ -89,8 +89,8 @@ public interface AnswerRecordOrBuilder
    *
    * <pre>
    * Required. The AnswerFeedback for this record. You can set this with
-   * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord] in order to give us feedback about
-   * this answer.
+   * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord]
+   * in order to give us feedback about this answer.
    * </pre>
    *
    * <code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnswerRecordsProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnswerRecordsProto.java
index 1fd691dd28af..e216d1388d31 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnswerRecordsProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AnswerRecordsProto.java
@@ -51,6 +51,10 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
       internal_static_google_cloud_dialogflow_v2_AgentAssistantFeedback_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_cloud_dialogflow_v2_AgentAssistantFeedback_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_cloud_dialogflow_v2_AgentAssistantFeedback_SummarizationFeedback_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_dialogflow_v2_AgentAssistantFeedback_SummarizationFeedback_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
       internal_static_google_cloud_dialogflow_v2_AgentAssistantRecord_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
@@ -103,7 +107,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "f.Timestamp\"p\n\020CorrectnessLevel\022!\n\035CORRE"
           + "CTNESS_LEVEL_UNSPECIFIED\020\000\022\017\n\013NOT_CORREC"
           + "T\020\001\022\025\n\021PARTIALLY_CORRECT\020\002\022\021\n\rFULLY_CORR"
-          + "ECT\020\003B\021\n\017detail_feedback\"\326\004\n\026AgentAssist"
+          + "ECT\020\003B\021\n\017detail_feedback\"\326\006\n\026AgentAssist"
           + "antFeedback\022a\n\020answer_relevance\030\001 \001(\0162B."
           + "google.cloud.dialogflow.v2.AgentAssistan"
           + "tFeedback.AnswerRelevanceB\003\340A\001\022i\n\024docume"
@@ -112,39 +116,46 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "tCorrectnessB\003\340A\001\022g\n\023document_efficiency"
           + "\030\003 \001(\0162E.google.cloud.dialogflow.v2.Agen"
           + "tAssistantFeedback.DocumentEfficiencyB\003\340"
-          + "A\001\"Q\n\017AnswerRelevance\022 \n\034ANSWER_RELEVANC"
-          + "E_UNSPECIFIED\020\000\022\016\n\nIRRELEVANT\020\001\022\014\n\010RELEV"
-          + "ANT\020\002\"W\n\023DocumentCorrectness\022$\n DOCUMENT"
-          + "_CORRECTNESS_UNSPECIFIED\020\000\022\r\n\tINCORRECT\020"
-          + "\001\022\013\n\007CORRECT\020\002\"Y\n\022DocumentEfficiency\022#\n\037"
-          + "DOCUMENT_EFFICIENCY_UNSPECIFIED\020\000\022\017\n\013INE"
-          + "FFICIENT\020\001\022\r\n\tEFFICIENT\020\002\"\267\001\n\024AgentAssis"
-          + "tantRecord\022S\n\031article_suggestion_answer\030"
-          + "\005 \001(\0132).google.cloud.dialogflow.v2.Artic"
-          + "leAnswerB\003\340A\003H\000\022@\n\nfaq_answer\030\006 \001(\0132%.go"
-          + "ogle.cloud.dialogflow.v2.FaqAnswerB\003\340A\003H"
-          + "\000B\010\n\006answer2\255\005\n\rAnswerRecords\022\355\001\n\021ListAn"
-          + "swerRecords\0224.google.cloud.dialogflow.v2"
-          + ".ListAnswerRecordsRequest\0325.google.cloud"
-          + ".dialogflow.v2.ListAnswerRecordsResponse"
-          + "\"k\202\323\344\223\002\\\022%/v2/{parent=projects/*}/answer"
-          + "RecordsZ3\0221/v2/{parent=projects/*/locati"
-          + "ons/*}/answerRecords\332A\006parent\022\261\002\n\022Update"
-          + "AnswerRecord\0225.google.cloud.dialogflow.v"
-          + "2.UpdateAnswerRecordRequest\032(.google.clo"
-          + "ud.dialogflow.v2.AnswerRecord\"\271\001\202\323\344\223\002\226\0012"
-          + "3/v2/{answer_record.name=projects/*/answ"
-          + "erRecords/*}:\ranswer_recordZP2?/v2/{answ"
-          + "er_record.name=projects/*/locations/*/an"
-          + "swerRecords/*}:\ranswer_record\332A\031answer_r"
-          + "ecord,update_mask\032x\312A\031dialogflow.googlea"
-          + "pis.com\322AYhttps://www.googleapis.com/aut"
-          + "h/cloud-platform,https://www.googleapis."
-          + "com/auth/dialogflowB\241\001\n\036com.google.cloud"
-          + ".dialogflow.v2B\022AnswerRecordsProtoP\001ZDgo"
-          + "ogle.golang.org/genproto/googleapis/clou"
-          + "d/dialogflow/v2;dialogflow\370\001\001\242\002\002DF\252\002\032Goo"
-          + "gle.Cloud.Dialogflow.V2b\006proto3"
+          + "A\001\022m\n\026summarization_feedback\030\004 \001(\0132H.goo"
+          + "gle.cloud.dialogflow.v2.AgentAssistantFe"
+          + "edback.SummarizationFeedbackB\003\340A\001\032\216\001\n\025Su"
+          + "mmarizationFeedback\022.\n\nstart_time\030\001 \001(\0132"
+          + "\032.google.protobuf.Timestamp\022/\n\013submit_ti"
+          + "me\030\002 \001(\0132\032.google.protobuf.Timestamp\022\024\n\014"
+          + "summary_text\030\003 \001(\t\"Q\n\017AnswerRelevance\022 \n"
+          + "\034ANSWER_RELEVANCE_UNSPECIFIED\020\000\022\016\n\nIRREL"
+          + "EVANT\020\001\022\014\n\010RELEVANT\020\002\"W\n\023DocumentCorrect"
+          + "ness\022$\n DOCUMENT_CORRECTNESS_UNSPECIFIED"
+          + "\020\000\022\r\n\tINCORRECT\020\001\022\013\n\007CORRECT\020\002\"Y\n\022Docume"
+          + "ntEfficiency\022#\n\037DOCUMENT_EFFICIENCY_UNSP"
+          + "ECIFIED\020\000\022\017\n\013INEFFICIENT\020\001\022\r\n\tEFFICIENT\020"
+          + "\002\"\267\001\n\024AgentAssistantRecord\022S\n\031article_su"
+          + "ggestion_answer\030\005 \001(\0132).google.cloud.dia"
+          + "logflow.v2.ArticleAnswerB\003\340A\003H\000\022@\n\nfaq_a"
+          + "nswer\030\006 \001(\0132%.google.cloud.dialogflow.v2"
+          + ".FaqAnswerB\003\340A\003H\000B\010\n\006answer2\255\005\n\rAnswerRe"
+          + "cords\022\355\001\n\021ListAnswerRecords\0224.google.clo"
+          + "ud.dialogflow.v2.ListAnswerRecordsReques"
+          + "t\0325.google.cloud.dialogflow.v2.ListAnswe"
+          + "rRecordsResponse\"k\202\323\344\223\002\\\022%/v2/{parent=pr"
+          + "ojects/*}/answerRecordsZ3\0221/v2/{parent=p"
+          + "rojects/*/locations/*}/answerRecords\332A\006p"
+          + "arent\022\261\002\n\022UpdateAnswerRecord\0225.google.cl"
+          + "oud.dialogflow.v2.UpdateAnswerRecordRequ"
+          + "est\032(.google.cloud.dialogflow.v2.AnswerR"
+          + "ecord\"\271\001\202\323\344\223\002\226\00123/v2/{answer_record.name"
+          + "=projects/*/answerRecords/*}:\ranswer_rec"
+          + "ordZP2?/v2/{answer_record.name=projects/"
+          + "*/locations/*/answerRecords/*}:\ranswer_r"
+          + "ecord\332A\031answer_record,update_mask\032x\312A\031di"
+          + "alogflow.googleapis.com\322AYhttps://www.go"
+          + "ogleapis.com/auth/cloud-platform,https:/"
+          + "/www.googleapis.com/auth/dialogflowB\233\001\n\036"
+          + "com.google.cloud.dialogflow.v2B\022AnswerRe"
+          + "cordsProtoP\001Z>cloud.google.com/go/dialog"
+          + "flow/apiv2/dialogflowpb;dialogflowpb\370\001\001\242"
+          + "\002\002DF\252\002\032Google.Cloud.Dialogflow.V2b\006proto"
+          + "3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -210,7 +221,20 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_cloud_dialogflow_v2_AgentAssistantFeedback_descriptor,
             new java.lang.String[] {
-              "AnswerRelevance", "DocumentCorrectness", "DocumentEfficiency",
+              "AnswerRelevance",
+              "DocumentCorrectness",
+              "DocumentEfficiency",
+              "SummarizationFeedback",
+            });
+    internal_static_google_cloud_dialogflow_v2_AgentAssistantFeedback_SummarizationFeedback_descriptor =
+        internal_static_google_cloud_dialogflow_v2_AgentAssistantFeedback_descriptor
+            .getNestedTypes()
+            .get(0);
+    internal_static_google_cloud_dialogflow_v2_AgentAssistantFeedback_SummarizationFeedback_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_cloud_dialogflow_v2_AgentAssistantFeedback_SummarizationFeedback_descriptor,
+            new java.lang.String[] {
+              "StartTime", "SubmitTime", "SummaryText",
             });
     internal_static_google_cloud_dialogflow_v2_AgentAssistantRecord_descriptor =
         getDescriptor().getMessageTypes().get(6);
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ArticleAnswer.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ArticleAnswer.java
index 3ca9682c22e5..a52393bb9597 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ArticleAnswer.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ArticleAnswer.java
@@ -82,7 +82,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   }
 
   public static final int TITLE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object title_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object title_ = "";
   /**
    *
    *
@@ -131,7 +133,9 @@ public com.google.protobuf.ByteString getTitleBytes() {
   }
 
   public static final int URI_FIELD_NUMBER = 2;
-  private volatile java.lang.Object uri_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object uri_ = "";
   /**
    *
    *
@@ -180,6 +184,8 @@ public com.google.protobuf.ByteString getUriBytes() {
   }
 
   public static final int SNIPPETS_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList snippets_;
   /**
    *
@@ -241,7 +247,7 @@ public com.google.protobuf.ByteString getSnippetsBytes(int index) {
   }
 
   public static final int CONFIDENCE_FIELD_NUMBER = 4;
-  private float confidence_;
+  private float confidence_ = 0F;
   /**
    *
    *
@@ -274,6 +280,7 @@ private static final class MetadataDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> metadata_;
 
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> internalGetMetadata() {
@@ -334,8 +341,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
    * <code>map&lt;string, string&gt; metadata = 5;</code>
    */
   @java.lang.Override
-  public java.lang.String getMetadataOrDefault(
-      java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getMetadataOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -365,7 +374,9 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
   }
 
   public static final int ANSWER_RECORD_FIELD_NUMBER = 6;
-  private volatile java.lang.Object answerRecord_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object answerRecord_ = "";
   /**
    *
    *
@@ -695,17 +706,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       title_ = "";
-
       uri_ = "";
-
       snippets_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000004);
       confidence_ = 0F;
-
       internalGetMutableMetadata().clear();
       answerRecord_ = "";
-
       return this;
     }
 
@@ -733,22 +741,42 @@ public com.google.cloud.dialogflow.v2.ArticleAnswer build() {
     public com.google.cloud.dialogflow.v2.ArticleAnswer buildPartial() {
       com.google.cloud.dialogflow.v2.ArticleAnswer result =
           new com.google.cloud.dialogflow.v2.ArticleAnswer(this);
-      int from_bitField0_ = bitField0_;
-      result.title_ = title_;
-      result.uri_ = uri_;
-      if (((bitField0_ & 0x00000001) != 0)) {
-        snippets_ = snippets_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000001);
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.snippets_ = snippets_;
-      result.confidence_ = confidence_;
-      result.metadata_ = internalGetMetadata();
-      result.metadata_.makeImmutable();
-      result.answerRecord_ = answerRecord_;
       onBuilt();
       return result;
     }
 
+    private void buildPartialRepeatedFields(com.google.cloud.dialogflow.v2.ArticleAnswer result) {
+      if (((bitField0_ & 0x00000004) != 0)) {
+        snippets_ = snippets_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000004);
+      }
+      result.snippets_ = snippets_;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ArticleAnswer result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.title_ = title_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.uri_ = uri_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.confidence_ = confidence_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.metadata_ = internalGetMetadata();
+        result.metadata_.makeImmutable();
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.answerRecord_ = answerRecord_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -796,16 +824,18 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ArticleAnswer other) {
       if (other == com.google.cloud.dialogflow.v2.ArticleAnswer.getDefaultInstance()) return this;
       if (!other.getTitle().isEmpty()) {
         title_ = other.title_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getUri().isEmpty()) {
         uri_ = other.uri_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.snippets_.isEmpty()) {
         if (snippets_.isEmpty()) {
           snippets_ = other.snippets_;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000004);
         } else {
           ensureSnippetsIsMutable();
           snippets_.addAll(other.snippets_);
@@ -816,8 +846,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ArticleAnswer other) {
         setConfidence(other.getConfidence());
       }
       internalGetMutableMetadata().mergeFrom(other.internalGetMetadata());
+      bitField0_ |= 0x00000010;
       if (!other.getAnswerRecord().isEmpty()) {
         answerRecord_ = other.answerRecord_;
+        bitField0_ |= 0x00000020;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -849,13 +881,13 @@ public Builder mergeFrom(
             case 10:
               {
                 title_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 uri_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
@@ -868,7 +900,7 @@ public Builder mergeFrom(
             case 37:
               {
                 confidence_ = input.readFloat();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 37
             case 42:
@@ -880,12 +912,13 @@ public Builder mergeFrom(
                 internalGetMutableMetadata()
                     .getMutableMap()
                     .put(metadata__.getKey(), metadata__.getValue());
+                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             case 50:
               {
                 answerRecord_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 50
             default:
@@ -968,8 +1001,8 @@ public Builder setTitle(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       title_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -985,8 +1018,8 @@ public Builder setTitle(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTitle() {
-
       title_ = getDefaultInstance().getTitle();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1007,8 +1040,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       title_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1074,8 +1107,8 @@ public Builder setUri(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       uri_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1091,8 +1124,8 @@ public Builder setUri(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearUri() {
-
       uri_ = getDefaultInstance().getUri();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1113,8 +1146,8 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       uri_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1123,9 +1156,9 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureSnippetsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         snippets_ = new com.google.protobuf.LazyStringArrayList(snippets_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000004;
       }
     }
     /**
@@ -1260,7 +1293,7 @@ public Builder addAllSnippets(java.lang.Iterable<java.lang.String> values) {
      */
     public Builder clearSnippets() {
       snippets_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1324,6 +1357,7 @@ public float getConfidence() {
     public Builder setConfidence(float value) {
 
       confidence_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1342,7 +1376,7 @@ public Builder setConfidence(float value) {
      * @return This builder for chaining.
      */
     public Builder clearConfidence() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       confidence_ = 0F;
       onChanged();
       return this;
@@ -1359,8 +1393,6 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
         internalGetMutableMetadata() {
-      onChanged();
-      ;
       if (metadata_ == null) {
         metadata_ =
             com.google.protobuf.MapField.newMapField(MetadataDefaultEntryHolder.defaultEntry);
@@ -1368,6 +1400,8 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
       if (!metadata_.isMutable()) {
         metadata_ = metadata_.copy();
       }
+      bitField0_ |= 0x00000010;
+      onChanged();
       return metadata_;
     }
 
@@ -1422,8 +1456,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
      * <code>map&lt;string, string&gt; metadata = 5;</code>
      */
     @java.lang.Override
-    public java.lang.String getMetadataOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getMetadataOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1453,6 +1489,7 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
     }
 
     public Builder clearMetadata() {
+      bitField0_ = (bitField0_ & ~0x00000010);
       internalGetMutableMetadata().getMutableMap().clear();
       return this;
     }
@@ -1476,6 +1513,7 @@ public Builder removeMetadata(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMutableMetadata() {
+      bitField0_ |= 0x00000010;
       return internalGetMutableMetadata().getMutableMap();
     }
     /**
@@ -1495,8 +1533,8 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableMetadata().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000010;
       return this;
     }
     /**
@@ -1511,6 +1549,7 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllMetadata(java.util.Map<java.lang.String, java.lang.String> values) {
       internalGetMutableMetadata().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000010;
       return this;
     }
 
@@ -1581,8 +1620,8 @@ public Builder setAnswerRecord(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       answerRecord_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1600,8 +1639,8 @@ public Builder setAnswerRecord(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAnswerRecord() {
-
       answerRecord_ = getDefaultInstance().getAnswerRecord();
+      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -1624,8 +1663,8 @@ public Builder setAnswerRecordBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       answerRecord_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ArticleAnswerOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ArticleAnswerOrBuilder.java
index d9f6b346fbaa..d3f30d85685d 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ArticleAnswerOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ArticleAnswerOrBuilder.java
@@ -186,7 +186,6 @@ public interface ArticleAnswerOrBuilder
    *
    * <code>map&lt;string, string&gt; metadata = 5;</code>
    */
-
   /* nullable */
   java.lang.String getMetadataOrDefault(
       java.lang.String key,
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ArticleSuggestionModelMetadata.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ArticleSuggestionModelMetadata.java
index 0ada4b5819cb..5b753fdeff4d 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ArticleSuggestionModelMetadata.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ArticleSuggestionModelMetadata.java
@@ -69,12 +69,13 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int TRAINING_MODEL_TYPE_FIELD_NUMBER = 3;
-  private int trainingModelType_;
+  private int trainingModelType_ = 0;
   /**
    *
    *
    * <pre>
-   * Optional. Type of the article suggestion model. If not provided, model_type is used.
+   * Optional. Type of the article suggestion model. If not provided, model_type
+   * is used.
    * </pre>
    *
    * <code>
@@ -91,7 +92,8 @@ public int getTrainingModelTypeValue() {
    *
    *
    * <pre>
-   * Optional. Type of the article suggestion model. If not provided, model_type is used.
+   * Optional. Type of the article suggestion model. If not provided, model_type
+   * is used.
    * </pre>
    *
    * <code>
@@ -102,9 +104,8 @@ public int getTrainingModelTypeValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.ConversationModel.ModelType getTrainingModelType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.ConversationModel.ModelType result =
-        com.google.cloud.dialogflow.v2.ConversationModel.ModelType.valueOf(trainingModelType_);
+        com.google.cloud.dialogflow.v2.ConversationModel.ModelType.forNumber(trainingModelType_);
     return result == null
         ? com.google.cloud.dialogflow.v2.ConversationModel.ModelType.UNRECOGNIZED
         : result;
@@ -312,8 +313,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       trainingModelType_ = 0;
-
       return this;
     }
 
@@ -342,11 +343,21 @@ public com.google.cloud.dialogflow.v2.ArticleSuggestionModelMetadata build() {
     public com.google.cloud.dialogflow.v2.ArticleSuggestionModelMetadata buildPartial() {
       com.google.cloud.dialogflow.v2.ArticleSuggestionModelMetadata result =
           new com.google.cloud.dialogflow.v2.ArticleSuggestionModelMetadata(this);
-      result.trainingModelType_ = trainingModelType_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.ArticleSuggestionModelMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.trainingModelType_ = trainingModelType_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -426,7 +437,7 @@ public Builder mergeFrom(
             case 24:
               {
                 trainingModelType_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 24
             default:
@@ -446,12 +457,15 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private int trainingModelType_ = 0;
     /**
      *
      *
      * <pre>
-     * Optional. Type of the article suggestion model. If not provided, model_type is used.
+     * Optional. Type of the article suggestion model. If not provided, model_type
+     * is used.
      * </pre>
      *
      * <code>
@@ -468,7 +482,8 @@ public int getTrainingModelTypeValue() {
      *
      *
      * <pre>
-     * Optional. Type of the article suggestion model. If not provided, model_type is used.
+     * Optional. Type of the article suggestion model. If not provided, model_type
+     * is used.
      * </pre>
      *
      * <code>
@@ -479,8 +494,8 @@ public int getTrainingModelTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setTrainingModelTypeValue(int value) {
-
       trainingModelType_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -488,7 +503,8 @@ public Builder setTrainingModelTypeValue(int value) {
      *
      *
      * <pre>
-     * Optional. Type of the article suggestion model. If not provided, model_type is used.
+     * Optional. Type of the article suggestion model. If not provided, model_type
+     * is used.
      * </pre>
      *
      * <code>
@@ -499,9 +515,8 @@ public Builder setTrainingModelTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.ConversationModel.ModelType getTrainingModelType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.ConversationModel.ModelType result =
-          com.google.cloud.dialogflow.v2.ConversationModel.ModelType.valueOf(trainingModelType_);
+          com.google.cloud.dialogflow.v2.ConversationModel.ModelType.forNumber(trainingModelType_);
       return result == null
           ? com.google.cloud.dialogflow.v2.ConversationModel.ModelType.UNRECOGNIZED
           : result;
@@ -510,7 +525,8 @@ public com.google.cloud.dialogflow.v2.ConversationModel.ModelType getTrainingMod
      *
      *
      * <pre>
-     * Optional. Type of the article suggestion model. If not provided, model_type is used.
+     * Optional. Type of the article suggestion model. If not provided, model_type
+     * is used.
      * </pre>
      *
      * <code>
@@ -525,7 +541,7 @@ public Builder setTrainingModelType(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       trainingModelType_ = value.getNumber();
       onChanged();
       return this;
@@ -534,7 +550,8 @@ public Builder setTrainingModelType(
      *
      *
      * <pre>
-     * Optional. Type of the article suggestion model. If not provided, model_type is used.
+     * Optional. Type of the article suggestion model. If not provided, model_type
+     * is used.
      * </pre>
      *
      * <code>
@@ -544,7 +561,7 @@ public Builder setTrainingModelType(
      * @return This builder for chaining.
      */
     public Builder clearTrainingModelType() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       trainingModelType_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ArticleSuggestionModelMetadataOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ArticleSuggestionModelMetadataOrBuilder.java
index 3777939467d7..0a3d4856d9ea 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ArticleSuggestionModelMetadataOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ArticleSuggestionModelMetadataOrBuilder.java
@@ -27,7 +27,8 @@ public interface ArticleSuggestionModelMetadataOrBuilder
    *
    *
    * <pre>
-   * Optional. Type of the article suggestion model. If not provided, model_type is used.
+   * Optional. Type of the article suggestion model. If not provided, model_type
+   * is used.
    * </pre>
    *
    * <code>
@@ -41,7 +42,8 @@ public interface ArticleSuggestionModelMetadataOrBuilder
    *
    *
    * <pre>
-   * Optional. Type of the article suggestion model. If not provided, model_type is used.
+   * Optional. Type of the article suggestion model. If not provided, model_type
+   * is used.
    * </pre>
    *
    * <code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AssistQueryParameters.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AssistQueryParameters.java
index a8b986d8d921..b6e9462e4d06 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AssistQueryParameters.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AssistQueryParameters.java
@@ -89,6 +89,7 @@ private static final class DocumentsMetadataFiltersDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.String>
       documentsMetadataFilters_;
 
@@ -110,7 +111,8 @@ public int getDocumentsMetadataFiltersCount() {
    * <pre>
    * Key-value filters on the metadata of documents returned by article
    * suggestion. If specified, article suggestion only returns suggested
-   * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+   * documents that match all filters in their
+   * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
    * values for a metadata key should be concatenated by comma. For example,
    * filters to match all documents that have 'US' or 'CA' in their market
    * metadata values and 'agent' in their user metadata values will be
@@ -147,7 +149,8 @@ public java.util.Map<java.lang.String, java.lang.String> getDocumentsMetadataFil
    * <pre>
    * Key-value filters on the metadata of documents returned by article
    * suggestion. If specified, article suggestion only returns suggested
-   * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+   * documents that match all filters in their
+   * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
    * values for a metadata key should be concatenated by comma. For example,
    * filters to match all documents that have 'US' or 'CA' in their market
    * metadata values and 'agent' in their user metadata values will be
@@ -175,7 +178,8 @@ public java.util.Map<java.lang.String, java.lang.String> getDocumentsMetadataFil
    * <pre>
    * Key-value filters on the metadata of documents returned by article
    * suggestion. If specified, article suggestion only returns suggested
-   * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+   * documents that match all filters in their
+   * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
    * values for a metadata key should be concatenated by comma. For example,
    * filters to match all documents that have 'US' or 'CA' in their market
    * metadata values and 'agent' in their user metadata values will be
@@ -194,8 +198,10 @@ public java.util.Map<java.lang.String, java.lang.String> getDocumentsMetadataFil
    * <code>map&lt;string, string&gt; documents_metadata_filters = 1;</code>
    */
   @java.lang.Override
-  public java.lang.String getDocumentsMetadataFiltersOrDefault(
-      java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getDocumentsMetadataFiltersOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -209,7 +215,8 @@ public java.lang.String getDocumentsMetadataFiltersOrDefault(
    * <pre>
    * Key-value filters on the metadata of documents returned by article
    * suggestion. If specified, article suggestion only returns suggested
-   * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+   * documents that match all filters in their
+   * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
    * values for a metadata key should be concatenated by comma. For example,
    * filters to match all documents that have 'US' or 'CA' in their market
    * metadata values and 'agent' in their user metadata values will be
@@ -470,6 +477,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       internalGetMutableDocumentsMetadataFilters().clear();
       return this;
     }
@@ -498,13 +506,21 @@ public com.google.cloud.dialogflow.v2.AssistQueryParameters build() {
     public com.google.cloud.dialogflow.v2.AssistQueryParameters buildPartial() {
       com.google.cloud.dialogflow.v2.AssistQueryParameters result =
           new com.google.cloud.dialogflow.v2.AssistQueryParameters(this);
-      int from_bitField0_ = bitField0_;
-      result.documentsMetadataFilters_ = internalGetDocumentsMetadataFilters();
-      result.documentsMetadataFilters_.makeImmutable();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.AssistQueryParameters result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.documentsMetadataFilters_ = internalGetDocumentsMetadataFilters();
+        result.documentsMetadataFilters_.makeImmutable();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -553,6 +569,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.AssistQueryParameters ot
         return this;
       internalGetMutableDocumentsMetadataFilters()
           .mergeFrom(other.internalGetDocumentsMetadataFilters());
+      bitField0_ |= 0x00000001;
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -591,6 +608,7 @@ public Builder mergeFrom(
                     .getMutableMap()
                     .put(
                         documentsMetadataFilters__.getKey(), documentsMetadataFilters__.getValue());
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -626,8 +644,6 @@ public Builder mergeFrom(
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
         internalGetMutableDocumentsMetadataFilters() {
-      onChanged();
-      ;
       if (documentsMetadataFilters_ == null) {
         documentsMetadataFilters_ =
             com.google.protobuf.MapField.newMapField(
@@ -636,6 +652,8 @@ public Builder mergeFrom(
       if (!documentsMetadataFilters_.isMutable()) {
         documentsMetadataFilters_ = documentsMetadataFilters_.copy();
       }
+      bitField0_ |= 0x00000001;
+      onChanged();
       return documentsMetadataFilters_;
     }
 
@@ -648,7 +666,8 @@ public int getDocumentsMetadataFiltersCount() {
      * <pre>
      * Key-value filters on the metadata of documents returned by article
      * suggestion. If specified, article suggestion only returns suggested
-     * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+     * documents that match all filters in their
+     * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
      * values for a metadata key should be concatenated by comma. For example,
      * filters to match all documents that have 'US' or 'CA' in their market
      * metadata values and 'agent' in their user metadata values will be
@@ -685,7 +704,8 @@ public java.util.Map<java.lang.String, java.lang.String> getDocumentsMetadataFil
      * <pre>
      * Key-value filters on the metadata of documents returned by article
      * suggestion. If specified, article suggestion only returns suggested
-     * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+     * documents that match all filters in their
+     * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
      * values for a metadata key should be concatenated by comma. For example,
      * filters to match all documents that have 'US' or 'CA' in their market
      * metadata values and 'agent' in their user metadata values will be
@@ -713,7 +733,8 @@ public java.util.Map<java.lang.String, java.lang.String> getDocumentsMetadataFil
      * <pre>
      * Key-value filters on the metadata of documents returned by article
      * suggestion. If specified, article suggestion only returns suggested
-     * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+     * documents that match all filters in their
+     * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
      * values for a metadata key should be concatenated by comma. For example,
      * filters to match all documents that have 'US' or 'CA' in their market
      * metadata values and 'agent' in their user metadata values will be
@@ -732,8 +753,10 @@ public java.util.Map<java.lang.String, java.lang.String> getDocumentsMetadataFil
      * <code>map&lt;string, string&gt; documents_metadata_filters = 1;</code>
      */
     @java.lang.Override
-    public java.lang.String getDocumentsMetadataFiltersOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getDocumentsMetadataFiltersOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -747,7 +770,8 @@ public java.lang.String getDocumentsMetadataFiltersOrDefault(
      * <pre>
      * Key-value filters on the metadata of documents returned by article
      * suggestion. If specified, article suggestion only returns suggested
-     * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+     * documents that match all filters in their
+     * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
      * values for a metadata key should be concatenated by comma. For example,
      * filters to match all documents that have 'US' or 'CA' in their market
      * metadata values and 'agent' in their user metadata values will be
@@ -779,6 +803,7 @@ public java.lang.String getDocumentsMetadataFiltersOrThrow(java.lang.String key)
     }
 
     public Builder clearDocumentsMetadataFilters() {
+      bitField0_ = (bitField0_ & ~0x00000001);
       internalGetMutableDocumentsMetadataFilters().getMutableMap().clear();
       return this;
     }
@@ -788,7 +813,8 @@ public Builder clearDocumentsMetadataFilters() {
      * <pre>
      * Key-value filters on the metadata of documents returned by article
      * suggestion. If specified, article suggestion only returns suggested
-     * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+     * documents that match all filters in their
+     * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
      * values for a metadata key should be concatenated by comma. For example,
      * filters to match all documents that have 'US' or 'CA' in their market
      * metadata values and 'agent' in their user metadata values will be
@@ -816,6 +842,7 @@ public Builder removeDocumentsMetadataFilters(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMutableDocumentsMetadataFilters() {
+      bitField0_ |= 0x00000001;
       return internalGetMutableDocumentsMetadataFilters().getMutableMap();
     }
     /**
@@ -824,7 +851,8 @@ public java.util.Map<java.lang.String, java.lang.String> getMutableDocumentsMeta
      * <pre>
      * Key-value filters on the metadata of documents returned by article
      * suggestion. If specified, article suggestion only returns suggested
-     * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+     * documents that match all filters in their
+     * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
      * values for a metadata key should be concatenated by comma. For example,
      * filters to match all documents that have 'US' or 'CA' in their market
      * metadata values and 'agent' in their user metadata values will be
@@ -849,8 +877,8 @@ public Builder putDocumentsMetadataFilters(java.lang.String key, java.lang.Strin
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableDocumentsMetadataFilters().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000001;
       return this;
     }
     /**
@@ -859,7 +887,8 @@ public Builder putDocumentsMetadataFilters(java.lang.String key, java.lang.Strin
      * <pre>
      * Key-value filters on the metadata of documents returned by article
      * suggestion. If specified, article suggestion only returns suggested
-     * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+     * documents that match all filters in their
+     * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
      * values for a metadata key should be concatenated by comma. For example,
      * filters to match all documents that have 'US' or 'CA' in their market
      * metadata values and 'agent' in their user metadata values will be
@@ -880,6 +909,7 @@ public Builder putDocumentsMetadataFilters(java.lang.String key, java.lang.Strin
     public Builder putAllDocumentsMetadataFilters(
         java.util.Map<java.lang.String, java.lang.String> values) {
       internalGetMutableDocumentsMetadataFilters().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000001;
       return this;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AssistQueryParametersOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AssistQueryParametersOrBuilder.java
index d64efa4d7722..09ac1ff2706f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AssistQueryParametersOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AssistQueryParametersOrBuilder.java
@@ -29,7 +29,8 @@ public interface AssistQueryParametersOrBuilder
    * <pre>
    * Key-value filters on the metadata of documents returned by article
    * suggestion. If specified, article suggestion only returns suggested
-   * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+   * documents that match all filters in their
+   * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
    * values for a metadata key should be concatenated by comma. For example,
    * filters to match all documents that have 'US' or 'CA' in their market
    * metadata values and 'agent' in their user metadata values will be
@@ -54,7 +55,8 @@ public interface AssistQueryParametersOrBuilder
    * <pre>
    * Key-value filters on the metadata of documents returned by article
    * suggestion. If specified, article suggestion only returns suggested
-   * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+   * documents that match all filters in their
+   * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
    * values for a metadata key should be concatenated by comma. For example,
    * filters to match all documents that have 'US' or 'CA' in their market
    * metadata values and 'agent' in their user metadata values will be
@@ -82,7 +84,8 @@ public interface AssistQueryParametersOrBuilder
    * <pre>
    * Key-value filters on the metadata of documents returned by article
    * suggestion. If specified, article suggestion only returns suggested
-   * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+   * documents that match all filters in their
+   * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
    * values for a metadata key should be concatenated by comma. For example,
    * filters to match all documents that have 'US' or 'CA' in their market
    * metadata values and 'agent' in their user metadata values will be
@@ -107,7 +110,8 @@ public interface AssistQueryParametersOrBuilder
    * <pre>
    * Key-value filters on the metadata of documents returned by article
    * suggestion. If specified, article suggestion only returns suggested
-   * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+   * documents that match all filters in their
+   * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
    * values for a metadata key should be concatenated by comma. For example,
    * filters to match all documents that have 'US' or 'CA' in their market
    * metadata values and 'agent' in their user metadata values will be
@@ -125,7 +129,6 @@ public interface AssistQueryParametersOrBuilder
    *
    * <code>map&lt;string, string&gt; documents_metadata_filters = 1;</code>
    */
-
   /* nullable */
   java.lang.String getDocumentsMetadataFiltersOrDefault(
       java.lang.String key,
@@ -137,7 +140,8 @@ java.lang.String getDocumentsMetadataFiltersOrDefault(
    * <pre>
    * Key-value filters on the metadata of documents returned by article
    * suggestion. If specified, article suggestion only returns suggested
-   * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+   * documents that match all filters in their
+   * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
    * values for a metadata key should be concatenated by comma. For example,
    * filters to match all documents that have 'US' or 'CA' in their market
    * metadata values and 'agent' in their user metadata values will be
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AudioConfigProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AudioConfigProto.java
index 03d876799d59..e79dc778d9d6 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AudioConfigProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AudioConfigProto.java
@@ -130,16 +130,16 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\005\022\014\n\010DTMF_SIX\020\006\022\016\n\nDTMF_SEVEN\020\007\022\016\n\nDTMF_"
           + "EIGHT\020\010\022\r\n\tDTMF_NINE\020\t\022\r\n\tDTMF_ZERO\020\n\022\n\n"
           + "\006DTMF_A\020\013\022\n\n\006DTMF_B\020\014\022\n\n\006DTMF_C\020\r\022\n\n\006DTM"
-          + "F_D\020\016\022\r\n\tDTMF_STAR\020\017\022\016\n\nDTMF_POUND\020\020B\334\002\n"
+          + "F_D\020\016\022\r\n\tDTMF_STAR\020\017\022\016\n\nDTMF_POUND\020\020B\326\002\n"
           + "\036com.google.cloud.dialogflow.v2B\020AudioCo"
-          + "nfigProtoP\001ZDgoogle.golang.org/genproto/"
-          + "googleapis/cloud/dialogflow/v2;dialogflo"
-          + "w\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dialogflow.V2\352A"
-          + "U\n\033automl.googleapis.com/Model\0226projects"
-          + "/{project}/locations/{location}/models/{"
-          + "model}\352Ab\n\037speech.googleapis.com/PhraseS"
-          + "et\022?projects/{project}/locations/{locati"
-          + "on}/phraseSets/{phrase_set}b\006proto3"
+          + "nfigProtoP\001Z>cloud.google.com/go/dialogf"
+          + "low/apiv2/dialogflowpb;dialogflowpb\370\001\001\242\002"
+          + "\002DF\252\002\032Google.Cloud.Dialogflow.V2\352AU\n\033aut"
+          + "oml.googleapis.com/Model\0226projects/{proj"
+          + "ect}/locations/{location}/models/{model}"
+          + "\352Ab\n\037speech.googleapis.com/PhraseSet\022?pr"
+          + "ojects/{project}/locations/{location}/ph"
+          + "raseSets/{phrase_set}b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AutomatedAgentConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AutomatedAgentConfig.java
index 3beee3ee5e67..19570895014b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AutomatedAgentConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AutomatedAgentConfig.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int AGENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object agent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object agent_ = "";
   /**
    *
    *
@@ -343,8 +345,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       agent_ = "";
-
       return this;
     }
 
@@ -372,11 +374,20 @@ public com.google.cloud.dialogflow.v2.AutomatedAgentConfig build() {
     public com.google.cloud.dialogflow.v2.AutomatedAgentConfig buildPartial() {
       com.google.cloud.dialogflow.v2.AutomatedAgentConfig result =
           new com.google.cloud.dialogflow.v2.AutomatedAgentConfig(this);
-      result.agent_ = agent_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.AutomatedAgentConfig result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.agent_ = agent_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -425,6 +436,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.AutomatedAgentConfig oth
         return this;
       if (!other.getAgent().isEmpty()) {
         agent_ = other.agent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -456,7 +468,7 @@ public Builder mergeFrom(
             case 10:
               {
                 agent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -476,6 +488,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object agent_ = "";
     /**
      *
@@ -582,8 +596,8 @@ public Builder setAgent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       agent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -614,8 +628,8 @@ public Builder setAgent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAgent() {
-
       agent_ = getDefaultInstance().getAgent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -651,8 +665,8 @@ public Builder setAgentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       agent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AutomatedAgentReply.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AutomatedAgentReply.java
index 44a19ff51835..8a9d3f5c541b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AutomatedAgentReply.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AutomatedAgentReply.java
@@ -240,7 +240,9 @@ private AutomatedAgentReplyType(int value) {
    *
    *
    * <pre>
-   * Response of the Dialogflow [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] call.
+   * Response of the Dialogflow
+   * [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent]
+   * call.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.DetectIntentResponse detect_intent_response = 1;</code>
@@ -255,7 +257,9 @@ public boolean hasDetectIntentResponse() {
    *
    *
    * <pre>
-   * Response of the Dialogflow [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] call.
+   * Response of the Dialogflow
+   * [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent]
+   * call.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.DetectIntentResponse detect_intent_response = 1;</code>
@@ -272,7 +276,9 @@ public com.google.cloud.dialogflow.v2.DetectIntentResponse getDetectIntentRespon
    *
    *
    * <pre>
-   * Response of the Dialogflow [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] call.
+   * Response of the Dialogflow
+   * [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent]
+   * call.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.DetectIntentResponse detect_intent_response = 1;</code>
@@ -280,11 +286,13 @@ public com.google.cloud.dialogflow.v2.DetectIntentResponse getDetectIntentRespon
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.DetectIntentResponseOrBuilder
       getDetectIntentResponseOrBuilder() {
-    return getDetectIntentResponse();
+    return detectIntentResponse_ == null
+        ? com.google.cloud.dialogflow.v2.DetectIntentResponse.getDefaultInstance()
+        : detectIntentResponse_;
   }
 
   public static final int AUTOMATED_AGENT_REPLY_TYPE_FIELD_NUMBER = 7;
-  private int automatedAgentReplyType_;
+  private int automatedAgentReplyType_ = 0;
   /**
    *
    *
@@ -318,9 +326,8 @@ public int getAutomatedAgentReplyTypeValue() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.AutomatedAgentReply.AutomatedAgentReplyType
       getAutomatedAgentReplyType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.AutomatedAgentReply.AutomatedAgentReplyType result =
-        com.google.cloud.dialogflow.v2.AutomatedAgentReply.AutomatedAgentReplyType.valueOf(
+        com.google.cloud.dialogflow.v2.AutomatedAgentReply.AutomatedAgentReplyType.forNumber(
             automatedAgentReplyType_);
     return result == null
         ? com.google.cloud.dialogflow.v2.AutomatedAgentReply.AutomatedAgentReplyType.UNRECOGNIZED
@@ -328,7 +335,7 @@ public int getAutomatedAgentReplyTypeValue() {
   }
 
   public static final int ALLOW_CANCELLATION_FIELD_NUMBER = 8;
-  private boolean allowCancellation_;
+  private boolean allowCancellation_ = false;
   /**
    *
    *
@@ -348,7 +355,9 @@ public boolean getAllowCancellation() {
   }
 
   public static final int CX_CURRENT_PAGE_FIELD_NUMBER = 11;
-  private volatile java.lang.Object cxCurrentPage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object cxCurrentPage_ = "";
   /**
    *
    *
@@ -636,18 +645,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (detectIntentResponseBuilder_ == null) {
-        detectIntentResponse_ = null;
-      } else {
-        detectIntentResponse_ = null;
+      bitField0_ = 0;
+      detectIntentResponse_ = null;
+      if (detectIntentResponseBuilder_ != null) {
+        detectIntentResponseBuilder_.dispose();
         detectIntentResponseBuilder_ = null;
       }
       automatedAgentReplyType_ = 0;
-
       allowCancellation_ = false;
-
       cxCurrentPage_ = "";
-
       return this;
     }
 
@@ -675,18 +681,32 @@ public com.google.cloud.dialogflow.v2.AutomatedAgentReply build() {
     public com.google.cloud.dialogflow.v2.AutomatedAgentReply buildPartial() {
       com.google.cloud.dialogflow.v2.AutomatedAgentReply result =
           new com.google.cloud.dialogflow.v2.AutomatedAgentReply(this);
-      if (detectIntentResponseBuilder_ == null) {
-        result.detectIntentResponse_ = detectIntentResponse_;
-      } else {
-        result.detectIntentResponse_ = detectIntentResponseBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.automatedAgentReplyType_ = automatedAgentReplyType_;
-      result.allowCancellation_ = allowCancellation_;
-      result.cxCurrentPage_ = cxCurrentPage_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.AutomatedAgentReply result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.detectIntentResponse_ =
+            detectIntentResponseBuilder_ == null
+                ? detectIntentResponse_
+                : detectIntentResponseBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.automatedAgentReplyType_ = automatedAgentReplyType_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.allowCancellation_ = allowCancellation_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.cxCurrentPage_ = cxCurrentPage_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -744,6 +764,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.AutomatedAgentReply othe
       }
       if (!other.getCxCurrentPage().isEmpty()) {
         cxCurrentPage_ = other.cxCurrentPage_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -776,25 +797,25 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getDetectIntentResponseFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 56:
               {
                 automatedAgentReplyType_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 56
             case 64:
               {
                 allowCancellation_ = input.readBool();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 64
             case 90:
               {
                 cxCurrentPage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 90
             default:
@@ -814,6 +835,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2.DetectIntentResponse detectIntentResponse_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.DetectIntentResponse,
@@ -824,7 +847,9 @@ public Builder mergeFrom(
      *
      *
      * <pre>
-     * Response of the Dialogflow [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] call.
+     * Response of the Dialogflow
+     * [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent]
+     * call.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.DetectIntentResponse detect_intent_response = 1;</code>
@@ -832,13 +857,15 @@ public Builder mergeFrom(
      * @return Whether the detectIntentResponse field is set.
      */
     public boolean hasDetectIntentResponse() {
-      return detectIntentResponseBuilder_ != null || detectIntentResponse_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
      *
      * <pre>
-     * Response of the Dialogflow [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] call.
+     * Response of the Dialogflow
+     * [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent]
+     * call.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.DetectIntentResponse detect_intent_response = 1;</code>
@@ -858,7 +885,9 @@ public com.google.cloud.dialogflow.v2.DetectIntentResponse getDetectIntentRespon
      *
      *
      * <pre>
-     * Response of the Dialogflow [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] call.
+     * Response of the Dialogflow
+     * [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent]
+     * call.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.DetectIntentResponse detect_intent_response = 1;</code>
@@ -870,18 +899,20 @@ public Builder setDetectIntentResponse(
           throw new NullPointerException();
         }
         detectIntentResponse_ = value;
-        onChanged();
       } else {
         detectIntentResponseBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Response of the Dialogflow [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] call.
+     * Response of the Dialogflow
+     * [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent]
+     * call.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.DetectIntentResponse detect_intent_response = 1;</code>
@@ -890,18 +921,20 @@ public Builder setDetectIntentResponse(
         com.google.cloud.dialogflow.v2.DetectIntentResponse.Builder builderForValue) {
       if (detectIntentResponseBuilder_ == null) {
         detectIntentResponse_ = builderForValue.build();
-        onChanged();
       } else {
         detectIntentResponseBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Response of the Dialogflow [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] call.
+     * Response of the Dialogflow
+     * [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent]
+     * call.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.DetectIntentResponse detect_intent_response = 1;</code>
@@ -909,53 +942,56 @@ public Builder setDetectIntentResponse(
     public Builder mergeDetectIntentResponse(
         com.google.cloud.dialogflow.v2.DetectIntentResponse value) {
       if (detectIntentResponseBuilder_ == null) {
-        if (detectIntentResponse_ != null) {
-          detectIntentResponse_ =
-              com.google.cloud.dialogflow.v2.DetectIntentResponse.newBuilder(detectIntentResponse_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && detectIntentResponse_ != null
+            && detectIntentResponse_
+                != com.google.cloud.dialogflow.v2.DetectIntentResponse.getDefaultInstance()) {
+          getDetectIntentResponseBuilder().mergeFrom(value);
         } else {
           detectIntentResponse_ = value;
         }
-        onChanged();
       } else {
         detectIntentResponseBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Response of the Dialogflow [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] call.
+     * Response of the Dialogflow
+     * [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent]
+     * call.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.DetectIntentResponse detect_intent_response = 1;</code>
      */
     public Builder clearDetectIntentResponse() {
-      if (detectIntentResponseBuilder_ == null) {
-        detectIntentResponse_ = null;
-        onChanged();
-      } else {
-        detectIntentResponse_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      detectIntentResponse_ = null;
+      if (detectIntentResponseBuilder_ != null) {
+        detectIntentResponseBuilder_.dispose();
         detectIntentResponseBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Response of the Dialogflow [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] call.
+     * Response of the Dialogflow
+     * [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent]
+     * call.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.DetectIntentResponse detect_intent_response = 1;</code>
      */
     public com.google.cloud.dialogflow.v2.DetectIntentResponse.Builder
         getDetectIntentResponseBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getDetectIntentResponseFieldBuilder().getBuilder();
     }
@@ -963,7 +999,9 @@ public Builder clearDetectIntentResponse() {
      *
      *
      * <pre>
-     * Response of the Dialogflow [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] call.
+     * Response of the Dialogflow
+     * [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent]
+     * call.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.DetectIntentResponse detect_intent_response = 1;</code>
@@ -982,7 +1020,9 @@ public Builder clearDetectIntentResponse() {
      *
      *
      * <pre>
-     * Response of the Dialogflow [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] call.
+     * Response of the Dialogflow
+     * [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent]
+     * call.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.DetectIntentResponse detect_intent_response = 1;</code>
@@ -1037,8 +1077,8 @@ public int getAutomatedAgentReplyTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setAutomatedAgentReplyTypeValue(int value) {
-
       automatedAgentReplyType_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1058,9 +1098,8 @@ public Builder setAutomatedAgentReplyTypeValue(int value) {
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.AutomatedAgentReply.AutomatedAgentReplyType
         getAutomatedAgentReplyType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.AutomatedAgentReply.AutomatedAgentReplyType result =
-          com.google.cloud.dialogflow.v2.AutomatedAgentReply.AutomatedAgentReplyType.valueOf(
+          com.google.cloud.dialogflow.v2.AutomatedAgentReply.AutomatedAgentReplyType.forNumber(
               automatedAgentReplyType_);
       return result == null
           ? com.google.cloud.dialogflow.v2.AutomatedAgentReply.AutomatedAgentReplyType.UNRECOGNIZED
@@ -1085,7 +1124,7 @@ public Builder setAutomatedAgentReplyType(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       automatedAgentReplyType_ = value.getNumber();
       onChanged();
       return this;
@@ -1104,7 +1143,7 @@ public Builder setAutomatedAgentReplyType(
      * @return This builder for chaining.
      */
     public Builder clearAutomatedAgentReplyType() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       automatedAgentReplyType_ = 0;
       onChanged();
       return this;
@@ -1145,6 +1184,7 @@ public boolean getAllowCancellation() {
     public Builder setAllowCancellation(boolean value) {
 
       allowCancellation_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1162,7 +1202,7 @@ public Builder setAllowCancellation(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearAllowCancellation() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       allowCancellation_ = false;
       onChanged();
       return this;
@@ -1235,8 +1275,8 @@ public Builder setCxCurrentPage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       cxCurrentPage_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1254,8 +1294,8 @@ public Builder setCxCurrentPage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearCxCurrentPage() {
-
       cxCurrentPage_ = getDefaultInstance().getCxCurrentPage();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1278,8 +1318,8 @@ public Builder setCxCurrentPageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       cxCurrentPage_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AutomatedAgentReplyOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AutomatedAgentReplyOrBuilder.java
index ba7428339fa3..617df49c0234 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AutomatedAgentReplyOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AutomatedAgentReplyOrBuilder.java
@@ -27,7 +27,9 @@ public interface AutomatedAgentReplyOrBuilder
    *
    *
    * <pre>
-   * Response of the Dialogflow [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] call.
+   * Response of the Dialogflow
+   * [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent]
+   * call.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.DetectIntentResponse detect_intent_response = 1;</code>
@@ -39,7 +41,9 @@ public interface AutomatedAgentReplyOrBuilder
    *
    *
    * <pre>
-   * Response of the Dialogflow [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] call.
+   * Response of the Dialogflow
+   * [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent]
+   * call.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.DetectIntentResponse detect_intent_response = 1;</code>
@@ -51,7 +55,9 @@ public interface AutomatedAgentReplyOrBuilder
    *
    *
    * <pre>
-   * Response of the Dialogflow [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] call.
+   * Response of the Dialogflow
+   * [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent]
+   * call.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.DetectIntentResponse detect_intent_response = 1;</code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchCreateEntitiesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchCreateEntitiesRequest.java
index a1c594449241..350f50a5b19b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchCreateEntitiesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchCreateEntitiesRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [EntityTypes.BatchCreateEntities][google.cloud.dialogflow.v2.EntityTypes.BatchCreateEntities].
+ * The request message for
+ * [EntityTypes.BatchCreateEntities][google.cloud.dialogflow.v2.EntityTypes.BatchCreateEntities].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.BatchCreateEntitiesRequest}
@@ -70,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -125,6 +128,8 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int ENTITIES_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.EntityType.Entity> entities_;
   /**
    *
@@ -204,7 +209,9 @@ public com.google.cloud.dialogflow.v2.EntityType.EntityOrBuilder getEntitiesOrBu
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -444,7 +451,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [EntityTypes.BatchCreateEntities][google.cloud.dialogflow.v2.EntityTypes.BatchCreateEntities].
+   * The request message for
+   * [EntityTypes.BatchCreateEntities][google.cloud.dialogflow.v2.EntityTypes.BatchCreateEntities].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.BatchCreateEntitiesRequest}
@@ -478,17 +486,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       if (entitiesBuilder_ == null) {
         entities_ = java.util.Collections.emptyList();
       } else {
         entities_ = null;
         entitiesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       languageCode_ = "";
-
       return this;
     }
 
@@ -516,20 +523,35 @@ public com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest build() {
     public com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest buildPartial() {
       com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest result =
           new com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest(this);
-      int from_bitField0_ = bitField0_;
-      result.parent_ = parent_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest result) {
       if (entitiesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           entities_ = java.util.Collections.unmodifiableList(entities_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.entities_ = entities_;
       } else {
         result.entities_ = entitiesBuilder_.build();
       }
-      result.languageCode_ = languageCode_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
     }
 
     @java.lang.Override
@@ -580,13 +602,14 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchCreateEntitiesReque
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (entitiesBuilder_ == null) {
         if (!other.entities_.isEmpty()) {
           if (entities_.isEmpty()) {
             entities_ = other.entities_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureEntitiesIsMutable();
             entities_.addAll(other.entities_);
@@ -599,7 +622,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchCreateEntitiesReque
             entitiesBuilder_.dispose();
             entitiesBuilder_ = null;
             entities_ = other.entities_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             entitiesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getEntitiesFieldBuilder()
@@ -611,6 +634,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchCreateEntitiesReque
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -642,7 +666,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -662,7 +686,7 @@ public Builder mergeFrom(
             case 26:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -754,8 +778,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -774,8 +798,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -799,8 +823,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -809,10 +833,10 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureEntitiesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         entities_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.EntityType.Entity>(entities_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -1050,7 +1074,7 @@ public Builder addAllEntities(
     public Builder clearEntities() {
       if (entitiesBuilder_ == null) {
         entities_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         entitiesBuilder_.clear();
@@ -1187,7 +1211,7 @@ public com.google.cloud.dialogflow.v2.EntityType.Entity.Builder addEntitiesBuild
                 com.google.cloud.dialogflow.v2.EntityType.Entity,
                 com.google.cloud.dialogflow.v2.EntityType.Entity.Builder,
                 com.google.cloud.dialogflow.v2.EntityType.EntityOrBuilder>(
-                entities_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                entities_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         entities_ = null;
       }
       return entitiesBuilder_;
@@ -1266,8 +1290,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1287,8 +1311,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1313,8 +1337,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntitiesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntitiesRequest.java
index 9d04c09a8fdd..78149e32cd5f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntitiesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntitiesRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [EntityTypes.BatchDeleteEntities][google.cloud.dialogflow.v2.EntityTypes.BatchDeleteEntities].
+ * The request message for
+ * [EntityTypes.BatchDeleteEntities][google.cloud.dialogflow.v2.EntityTypes.BatchDeleteEntities].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest}
@@ -70,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -125,6 +128,8 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int ENTITY_VALUES_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList entityValues_;
   /**
    *
@@ -194,7 +199,9 @@ public com.google.protobuf.ByteString getEntityValuesBytes(int index) {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -439,7 +446,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [EntityTypes.BatchDeleteEntities][google.cloud.dialogflow.v2.EntityTypes.BatchDeleteEntities].
+   * The request message for
+   * [EntityTypes.BatchDeleteEntities][google.cloud.dialogflow.v2.EntityTypes.BatchDeleteEntities].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest}
@@ -473,12 +481,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       entityValues_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       languageCode_ = "";
-
       return this;
     }
 
@@ -506,18 +513,33 @@ public com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest build() {
     public com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest buildPartial() {
       com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest result =
           new com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest(this);
-      int from_bitField0_ = bitField0_;
-      result.parent_ = parent_;
-      if (((bitField0_ & 0x00000001) != 0)) {
-        entityValues_ = entityValues_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000001);
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.entityValues_ = entityValues_;
-      result.languageCode_ = languageCode_;
       onBuilt();
       return result;
     }
 
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest result) {
+      if (((bitField0_ & 0x00000002) != 0)) {
+        entityValues_ = entityValues_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000002);
+      }
+      result.entityValues_ = entityValues_;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -566,12 +588,13 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchDeleteEntitiesReque
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.entityValues_.isEmpty()) {
         if (entityValues_.isEmpty()) {
           entityValues_ = other.entityValues_;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureEntityValuesIsMutable();
           entityValues_.addAll(other.entityValues_);
@@ -580,6 +603,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchDeleteEntitiesReque
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -611,7 +635,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -624,7 +648,7 @@ public Builder mergeFrom(
             case 26:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -716,8 +740,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -736,8 +760,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -761,8 +785,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -771,9 +795,9 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureEntityValuesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         entityValues_ = new com.google.protobuf.LazyStringArrayList(entityValues_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
     /**
@@ -924,7 +948,7 @@ public Builder addAllEntityValues(java.lang.Iterable<java.lang.String> values) {
      */
     public Builder clearEntityValues() {
       entityValues_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1026,8 +1050,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1047,8 +1071,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1073,8 +1097,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntityTypesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntityTypesRequest.java
index 5c4375ad7c19..5fd489f932c3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntityTypesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntityTypesRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [EntityTypes.BatchDeleteEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchDeleteEntityTypes].
+ * The request message for
+ * [EntityTypes.BatchDeleteEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchDeleteEntityTypes].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest}
@@ -69,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -124,6 +127,8 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int ENTITY_TYPE_NAMES_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList entityTypeNames_;
   /**
    *
@@ -368,7 +373,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [EntityTypes.BatchDeleteEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchDeleteEntityTypes].
+   * The request message for
+   * [EntityTypes.BatchDeleteEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchDeleteEntityTypes].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest}
@@ -402,10 +408,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       entityTypeNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -434,17 +440,31 @@ public com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest build() {
     public com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest buildPartial() {
       com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest result =
           new com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest(this);
-      int from_bitField0_ = bitField0_;
-      result.parent_ = parent_;
-      if (((bitField0_ & 0x00000001) != 0)) {
-        entityTypeNames_ = entityTypeNames_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000001);
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.entityTypeNames_ = entityTypeNames_;
       onBuilt();
       return result;
     }
 
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest result) {
+      if (((bitField0_ & 0x00000002) != 0)) {
+        entityTypeNames_ = entityTypeNames_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000002);
+      }
+      result.entityTypeNames_ = entityTypeNames_;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -494,12 +514,13 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRe
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.entityTypeNames_.isEmpty()) {
         if (entityTypeNames_.isEmpty()) {
           entityTypeNames_ = other.entityTypeNames_;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureEntityTypeNamesIsMutable();
           entityTypeNames_.addAll(other.entityTypeNames_);
@@ -535,7 +556,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -634,8 +655,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -654,8 +675,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -679,8 +700,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -689,9 +710,9 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureEntityTypeNamesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         entityTypeNames_ = new com.google.protobuf.LazyStringArrayList(entityTypeNames_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
     /**
@@ -834,7 +855,7 @@ public Builder addAllEntityTypeNames(java.lang.Iterable<java.lang.String> values
      */
     public Builder clearEntityTypeNames() {
       entityTypeNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteIntentsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteIntentsRequest.java
index 0fe90b7286c4..dff7d15abde6 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteIntentsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteIntentsRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Intents.BatchDeleteIntents][google.cloud.dialogflow.v2.Intents.BatchDeleteIntents].
+ * The request message for
+ * [Intents.BatchDeleteIntents][google.cloud.dialogflow.v2.Intents.BatchDeleteIntents].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.BatchDeleteIntentsRequest}
@@ -69,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -124,6 +127,8 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int INTENTS_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Intent> intents_;
   /**
    *
@@ -382,7 +387,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Intents.BatchDeleteIntents][google.cloud.dialogflow.v2.Intents.BatchDeleteIntents].
+   * The request message for
+   * [Intents.BatchDeleteIntents][google.cloud.dialogflow.v2.Intents.BatchDeleteIntents].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.BatchDeleteIntentsRequest}
@@ -416,15 +422,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       if (intentsBuilder_ == null) {
         intents_ = java.util.Collections.emptyList();
       } else {
         intents_ = null;
         intentsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -452,19 +458,32 @@ public com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest build() {
     public com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest buildPartial() {
       com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest result =
           new com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest(this);
-      int from_bitField0_ = bitField0_;
-      result.parent_ = parent_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest result) {
       if (intentsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           intents_ = java.util.Collections.unmodifiableList(intents_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.intents_ = intents_;
       } else {
         result.intents_ = intentsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
     }
 
     @java.lang.Override
@@ -515,13 +534,14 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchDeleteIntentsReques
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (intentsBuilder_ == null) {
         if (!other.intents_.isEmpty()) {
           if (intents_.isEmpty()) {
             intents_ = other.intents_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureIntentsIsMutable();
             intents_.addAll(other.intents_);
@@ -534,7 +554,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchDeleteIntentsReques
             intentsBuilder_.dispose();
             intentsBuilder_ = null;
             intents_ = other.intents_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             intentsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getIntentsFieldBuilder()
@@ -573,7 +593,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -678,8 +698,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -698,8 +718,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -723,8 +743,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -733,9 +753,9 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureIntentsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         intents_ = new java.util.ArrayList<com.google.cloud.dialogflow.v2.Intent>(intents_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -983,7 +1003,7 @@ public Builder addAllIntents(
     public Builder clearIntents() {
       if (intentsBuilder_ == null) {
         intents_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         intentsBuilder_.clear();
@@ -1125,7 +1145,7 @@ public java.util.List<com.google.cloud.dialogflow.v2.Intent.Builder> getIntentsB
                 com.google.cloud.dialogflow.v2.Intent,
                 com.google.cloud.dialogflow.v2.Intent.Builder,
                 com.google.cloud.dialogflow.v2.IntentOrBuilder>(
-                intents_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                intents_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         intents_ = null;
       }
       return intentsBuilder_;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntitiesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntitiesRequest.java
index 9fb622aca86e..76596ebcd648 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntitiesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntitiesRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [EntityTypes.BatchUpdateEntities][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntities].
+ * The request message for
+ * [EntityTypes.BatchUpdateEntities][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntities].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest}
@@ -70,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -125,6 +128,8 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int ENTITIES_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.EntityType.Entity> entities_;
   /**
    *
@@ -204,7 +209,9 @@ public com.google.cloud.dialogflow.v2.EntityType.EntityOrBuilder getEntitiesOrBu
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -306,7 +313,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -507,7 +514,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [EntityTypes.BatchUpdateEntities][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntities].
+   * The request message for
+   * [EntityTypes.BatchUpdateEntities][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntities].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest}
@@ -541,21 +549,19 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       if (entitiesBuilder_ == null) {
         entities_ = java.util.Collections.emptyList();
       } else {
         entities_ = null;
         entitiesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       languageCode_ = "";
-
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -585,25 +591,38 @@ public com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest build() {
     public com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest buildPartial() {
       com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest result =
           new com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest(this);
-      int from_bitField0_ = bitField0_;
-      result.parent_ = parent_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest result) {
       if (entitiesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           entities_ = java.util.Collections.unmodifiableList(entities_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.entities_ = entities_;
       } else {
         result.entities_ = entitiesBuilder_.build();
       }
-      result.languageCode_ = languageCode_;
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -654,13 +673,14 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchUpdateEntitiesReque
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (entitiesBuilder_ == null) {
         if (!other.entities_.isEmpty()) {
           if (entities_.isEmpty()) {
             entities_ = other.entities_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureEntitiesIsMutable();
             entities_.addAll(other.entities_);
@@ -673,7 +693,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchUpdateEntitiesReque
             entitiesBuilder_.dispose();
             entitiesBuilder_ = null;
             entities_ = other.entities_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             entitiesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getEntitiesFieldBuilder()
@@ -685,6 +705,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchUpdateEntitiesReque
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.hasUpdateMask()) {
@@ -719,7 +740,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -739,13 +760,13 @@ public Builder mergeFrom(
             case 26:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -837,8 +858,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -857,8 +878,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -882,8 +903,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -892,10 +913,10 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureEntitiesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         entities_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.EntityType.Entity>(entities_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -1133,7 +1154,7 @@ public Builder addAllEntities(
     public Builder clearEntities() {
       if (entitiesBuilder_ == null) {
         entities_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         entitiesBuilder_.clear();
@@ -1270,7 +1291,7 @@ public com.google.cloud.dialogflow.v2.EntityType.Entity.Builder addEntitiesBuild
                 com.google.cloud.dialogflow.v2.EntityType.Entity,
                 com.google.cloud.dialogflow.v2.EntityType.Entity.Builder,
                 com.google.cloud.dialogflow.v2.EntityType.EntityOrBuilder>(
-                entities_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                entities_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         entities_ = null;
       }
       return entitiesBuilder_;
@@ -1349,8 +1370,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1370,8 +1391,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1396,8 +1417,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1421,7 +1442,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1460,11 +1481,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1480,11 +1501,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1499,17 +1520,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1523,14 +1545,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1544,7 +1565,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesRequest.java
index 4bb64e6c459d..08ad4ff2c665 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes].
+ * The request message for
+ * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest}
@@ -116,7 +117,9 @@ public EntityTypeBatchCase getEntityTypeBatchCase() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -302,7 +305,9 @@ public com.google.cloud.dialogflow.v2.EntityTypeBatch getEntityTypeBatchInline()
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 4;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -404,7 +409,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -631,7 +636,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes].
+   * The request message for
+   * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest}
@@ -665,17 +671,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       if (entityTypeBatchInlineBuilder_ != null) {
         entityTypeBatchInlineBuilder_.clear();
       }
       languageCode_ = "";
-
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       entityTypeBatchCase_ = 0;
@@ -708,26 +712,35 @@ public com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest build() {
     public com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest buildPartial() {
       com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest result =
           new com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest(this);
-      result.parent_ = parent_;
-      if (entityTypeBatchCase_ == 2) {
-        result.entityTypeBatch_ = entityTypeBatch_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (entityTypeBatchCase_ == 3) {
-        if (entityTypeBatchInlineBuilder_ == null) {
-          result.entityTypeBatch_ = entityTypeBatch_;
-        } else {
-          result.entityTypeBatch_ = entityTypeBatchInlineBuilder_.build();
-        }
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
       }
-      result.languageCode_ = languageCode_;
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
       }
+    }
+
+    private void buildPartialOneofs(
+        com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest result) {
       result.entityTypeBatchCase_ = entityTypeBatchCase_;
-      onBuilt();
-      return result;
+      result.entityTypeBatch_ = this.entityTypeBatch_;
+      if (entityTypeBatchCase_ == 3 && entityTypeBatchInlineBuilder_ != null) {
+        result.entityTypeBatch_ = entityTypeBatchInlineBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -779,10 +792,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRe
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (other.hasUpdateMask()) {
@@ -835,7 +850,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -855,13 +870,13 @@ public Builder mergeFrom(
             case 34:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 42:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             default:
@@ -895,6 +910,8 @@ public Builder clearEntityTypeBatch() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -965,8 +982,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -985,8 +1002,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1010,8 +1027,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1378,7 +1395,6 @@ public Builder clearEntityTypeBatchInline() {
       }
       entityTypeBatchCase_ = 3;
       onChanged();
-      ;
       return entityTypeBatchInlineBuilder_;
     }
 
@@ -1455,8 +1471,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1476,8 +1492,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1502,8 +1518,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1527,7 +1543,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -1566,11 +1582,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1586,11 +1602,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1605,17 +1621,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1629,14 +1646,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1650,7 +1666,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesResponse.java
index 152cd630aa02..b349c2afd4e0 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The response message for [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes].
+ * The response message for
+ * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse}
@@ -69,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ENTITY_TYPES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.EntityType> entityTypes_;
   /**
    *
@@ -303,7 +306,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The response message for [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes].
+   * The response message for
+   * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse}
@@ -337,6 +341,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (entityTypesBuilder_ == null) {
         entityTypes_ = java.util.Collections.emptyList();
       } else {
@@ -372,7 +377,16 @@ public com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse build() {
     public com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse buildPartial() {
       com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse result =
           new com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse result) {
       if (entityTypesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           entityTypes_ = java.util.Collections.unmodifiableList(entityTypes_);
@@ -382,8 +396,11 @@ public com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse buildPartia
       } else {
         result.entityTypes_ = entityTypesBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsRequest.java
index 0e3ae7c69655..6fb990bea0af 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsRequest.java
@@ -109,7 +109,9 @@ public IntentBatchCase getIntentBatchCase() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -291,7 +293,9 @@ public com.google.cloud.dialogflow.v2.IntentBatchOrBuilder getIntentBatchInlineO
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 4;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -393,11 +397,11 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   public static final int INTENT_VIEW_FIELD_NUMBER = 6;
-  private int intentView_;
+  private int intentView_ = 0;
   /**
    *
    *
@@ -430,9 +434,8 @@ public int getIntentViewValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.IntentView getIntentView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.IntentView result =
-        com.google.cloud.dialogflow.v2.IntentView.valueOf(intentView_);
+        com.google.cloud.dialogflow.v2.IntentView.forNumber(intentView_);
     return result == null ? com.google.cloud.dialogflow.v2.IntentView.UNRECOGNIZED : result;
   }
 
@@ -697,21 +700,18 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       if (intentBatchInlineBuilder_ != null) {
         intentBatchInlineBuilder_.clear();
       }
       languageCode_ = "";
-
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       intentView_ = 0;
-
       intentBatchCase_ = 0;
       intentBatch_ = null;
       return this;
@@ -741,27 +741,37 @@ public com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest build() {
     public com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest buildPartial() {
       com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest result =
           new com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest(this);
-      result.parent_ = parent_;
-      if (intentBatchCase_ == 2) {
-        result.intentBatch_ = intentBatch_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (intentBatchCase_ == 3) {
-        if (intentBatchInlineBuilder_ == null) {
-          result.intentBatch_ = intentBatch_;
-        } else {
-          result.intentBatch_ = intentBatchInlineBuilder_.build();
-        }
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
       }
-      result.languageCode_ = languageCode_;
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
       }
-      result.intentView_ = intentView_;
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.intentView_ = intentView_;
+      }
+    }
+
+    private void buildPartialOneofs(
+        com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest result) {
       result.intentBatchCase_ = intentBatchCase_;
-      onBuilt();
-      return result;
+      result.intentBatch_ = this.intentBatch_;
+      if (intentBatchCase_ == 3 && intentBatchInlineBuilder_ != null) {
+        result.intentBatch_ = intentBatchInlineBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -812,10 +822,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchUpdateIntentsReques
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (other.hasUpdateMask()) {
@@ -871,7 +883,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -891,19 +903,19 @@ public Builder mergeFrom(
             case 34:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 42:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             case 48:
               {
                 intentView_ = input.readEnum();
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 48
             default:
@@ -937,6 +949,8 @@ public Builder clearIntentBatch() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -1007,8 +1021,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1027,8 +1041,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1052,8 +1066,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1410,7 +1424,6 @@ public com.google.cloud.dialogflow.v2.IntentBatchOrBuilder getIntentBatchInlineO
       }
       intentBatchCase_ = 3;
       onChanged();
-      ;
       return intentBatchInlineBuilder_;
     }
 
@@ -1487,8 +1500,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1508,8 +1521,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1534,8 +1547,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1559,7 +1572,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -1598,11 +1611,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1618,11 +1631,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1637,17 +1650,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1661,14 +1675,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1682,7 +1695,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
@@ -1765,8 +1778,8 @@ public int getIntentViewValue() {
      * @return This builder for chaining.
      */
     public Builder setIntentViewValue(int value) {
-
       intentView_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1785,9 +1798,8 @@ public Builder setIntentViewValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.IntentView getIntentView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.IntentView result =
-          com.google.cloud.dialogflow.v2.IntentView.valueOf(intentView_);
+          com.google.cloud.dialogflow.v2.IntentView.forNumber(intentView_);
       return result == null ? com.google.cloud.dialogflow.v2.IntentView.UNRECOGNIZED : result;
     }
     /**
@@ -1808,7 +1820,7 @@ public Builder setIntentView(com.google.cloud.dialogflow.v2.IntentView value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000020;
       intentView_ = value.getNumber();
       onChanged();
       return this;
@@ -1827,7 +1839,7 @@ public Builder setIntentView(com.google.cloud.dialogflow.v2.IntentView value) {
      * @return This builder for chaining.
      */
     public Builder clearIntentView() {
-
+      bitField0_ = (bitField0_ & ~0x00000020);
       intentView_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsResponse.java
index 8f02fff2dfea..b98f8ab90d74 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The response message for [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents].
+ * The response message for
+ * [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.BatchUpdateIntentsResponse}
@@ -68,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int INTENTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Intent> intents_;
   /**
    *
@@ -302,7 +305,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The response message for [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents].
+   * The response message for
+   * [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.BatchUpdateIntentsResponse}
@@ -336,6 +340,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (intentsBuilder_ == null) {
         intents_ = java.util.Collections.emptyList();
       } else {
@@ -370,7 +375,16 @@ public com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse build() {
     public com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse buildPartial() {
       com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse result =
           new com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse result) {
       if (intentsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           intents_ = java.util.Collections.unmodifiableList(intents_);
@@ -380,8 +394,10 @@ public com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse buildPartial()
       } else {
         result.intents_ = intentsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ClearSuggestionFeatureConfigOperationMetadata.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ClearSuggestionFeatureConfigOperationMetadata.java
index 201f386082f2..4603e47ac287 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ClearSuggestionFeatureConfigOperationMetadata.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ClearSuggestionFeatureConfigOperationMetadata.java
@@ -74,7 +74,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_PROFILE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object conversationProfile_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversationProfile_ = "";
   /**
    *
    *
@@ -127,7 +129,7 @@ public com.google.protobuf.ByteString getConversationProfileBytes() {
   }
 
   public static final int PARTICIPANT_ROLE_FIELD_NUMBER = 2;
-  private int participantRole_;
+  private int participantRole_ = 0;
   /**
    *
    *
@@ -162,14 +164,13 @@ public int getParticipantRoleValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.Participant.Role getParticipantRole() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.Participant.Role result =
-        com.google.cloud.dialogflow.v2.Participant.Role.valueOf(participantRole_);
+        com.google.cloud.dialogflow.v2.Participant.Role.forNumber(participantRole_);
     return result == null ? com.google.cloud.dialogflow.v2.Participant.Role.UNRECOGNIZED : result;
   }
 
   public static final int SUGGESTION_FEATURE_TYPE_FIELD_NUMBER = 3;
-  private int suggestionFeatureType_;
+  private int suggestionFeatureType_ = 0;
   /**
    *
    *
@@ -202,9 +203,8 @@ public int getSuggestionFeatureTypeValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.SuggestionFeature.Type getSuggestionFeatureType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.SuggestionFeature.Type result =
-        com.google.cloud.dialogflow.v2.SuggestionFeature.Type.valueOf(suggestionFeatureType_);
+        com.google.cloud.dialogflow.v2.SuggestionFeature.Type.forNumber(suggestionFeatureType_);
     return result == null
         ? com.google.cloud.dialogflow.v2.SuggestionFeature.Type.UNRECOGNIZED
         : result;
@@ -253,7 +253,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -500,16 +500,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       conversationProfile_ = "";
-
       participantRole_ = 0;
-
       suggestionFeatureType_ = 0;
-
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
       return this;
@@ -543,18 +540,30 @@ public com.google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetad
         buildPartial() {
       com.google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetadata result =
           new com.google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetadata(this);
-      result.conversationProfile_ = conversationProfile_;
-      result.participantRole_ = participantRole_;
-      result.suggestionFeatureType_ = suggestionFeatureType_;
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversationProfile_ = conversationProfile_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.participantRole_ = participantRole_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.suggestionFeatureType_ = suggestionFeatureType_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -607,6 +616,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getConversationProfile().isEmpty()) {
         conversationProfile_ = other.conversationProfile_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.participantRole_ != 0) {
@@ -647,25 +657,25 @@ public Builder mergeFrom(
             case 10:
               {
                 conversationProfile_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 participantRole_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 24:
               {
                 suggestionFeatureType_ = input.readEnum();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 34:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -685,6 +695,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object conversationProfile_ = "";
     /**
      *
@@ -752,8 +764,8 @@ public Builder setConversationProfile(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversationProfile_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -771,8 +783,8 @@ public Builder setConversationProfile(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationProfile() {
-
       conversationProfile_ = getDefaultInstance().getConversationProfile();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -795,8 +807,8 @@ public Builder setConversationProfileBytes(com.google.protobuf.ByteString value)
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversationProfile_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -836,8 +848,8 @@ public int getParticipantRoleValue() {
      * @return This builder for chaining.
      */
     public Builder setParticipantRoleValue(int value) {
-
       participantRole_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -857,9 +869,8 @@ public Builder setParticipantRoleValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.Participant.Role getParticipantRole() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.Participant.Role result =
-          com.google.cloud.dialogflow.v2.Participant.Role.valueOf(participantRole_);
+          com.google.cloud.dialogflow.v2.Participant.Role.forNumber(participantRole_);
       return result == null ? com.google.cloud.dialogflow.v2.Participant.Role.UNRECOGNIZED : result;
     }
     /**
@@ -881,7 +892,7 @@ public Builder setParticipantRole(com.google.cloud.dialogflow.v2.Participant.Rol
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       participantRole_ = value.getNumber();
       onChanged();
       return this;
@@ -901,7 +912,7 @@ public Builder setParticipantRole(com.google.cloud.dialogflow.v2.Participant.Rol
      * @return This builder for chaining.
      */
     public Builder clearParticipantRole() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       participantRole_ = 0;
       onChanged();
       return this;
@@ -940,8 +951,8 @@ public int getSuggestionFeatureTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setSuggestionFeatureTypeValue(int value) {
-
       suggestionFeatureType_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -960,9 +971,8 @@ public Builder setSuggestionFeatureTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.SuggestionFeature.Type getSuggestionFeatureType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.SuggestionFeature.Type result =
-          com.google.cloud.dialogflow.v2.SuggestionFeature.Type.valueOf(suggestionFeatureType_);
+          com.google.cloud.dialogflow.v2.SuggestionFeature.Type.forNumber(suggestionFeatureType_);
       return result == null
           ? com.google.cloud.dialogflow.v2.SuggestionFeature.Type.UNRECOGNIZED
           : result;
@@ -986,7 +996,7 @@ public Builder setSuggestionFeatureType(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000004;
       suggestionFeatureType_ = value.getNumber();
       onChanged();
       return this;
@@ -1005,7 +1015,7 @@ public Builder setSuggestionFeatureType(
      * @return This builder for chaining.
      */
     public Builder clearSuggestionFeatureType() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       suggestionFeatureType_ = 0;
       onChanged();
       return this;
@@ -1029,7 +1039,7 @@ public Builder clearSuggestionFeatureType() {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1066,11 +1076,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1085,11 +1095,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1103,17 +1113,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
         } else {
           createTime_ = value;
         }
-        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1126,14 +1137,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * <code>.google.protobuf.Timestamp create_time = 4;</code>
      */
     public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1146,7 +1156,7 @@ public Builder clearCreateTime() {
      * <code>.google.protobuf.Timestamp create_time = 4;</code>
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ClearSuggestionFeatureConfigRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ClearSuggestionFeatureConfigRequest.java
index a9ddbf928831..01711efca91a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ClearSuggestionFeatureConfigRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ClearSuggestionFeatureConfigRequest.java
@@ -72,7 +72,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_PROFILE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object conversationProfile_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversationProfile_ = "";
   /**
    *
    *
@@ -125,7 +127,7 @@ public com.google.protobuf.ByteString getConversationProfileBytes() {
   }
 
   public static final int PARTICIPANT_ROLE_FIELD_NUMBER = 2;
-  private int participantRole_;
+  private int participantRole_ = 0;
   /**
    *
    *
@@ -160,14 +162,13 @@ public int getParticipantRoleValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.Participant.Role getParticipantRole() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.Participant.Role result =
-        com.google.cloud.dialogflow.v2.Participant.Role.valueOf(participantRole_);
+        com.google.cloud.dialogflow.v2.Participant.Role.forNumber(participantRole_);
     return result == null ? com.google.cloud.dialogflow.v2.Participant.Role.UNRECOGNIZED : result;
   }
 
   public static final int SUGGESTION_FEATURE_TYPE_FIELD_NUMBER = 3;
-  private int suggestionFeatureType_;
+  private int suggestionFeatureType_ = 0;
   /**
    *
    *
@@ -200,9 +201,8 @@ public int getSuggestionFeatureTypeValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.SuggestionFeature.Type getSuggestionFeatureType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.SuggestionFeature.Type result =
-        com.google.cloud.dialogflow.v2.SuggestionFeature.Type.valueOf(suggestionFeatureType_);
+        com.google.cloud.dialogflow.v2.SuggestionFeature.Type.forNumber(suggestionFeatureType_);
     return result == null
         ? com.google.cloud.dialogflow.v2.SuggestionFeature.Type.UNRECOGNIZED
         : result;
@@ -430,12 +430,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       conversationProfile_ = "";
-
       participantRole_ = 0;
-
       suggestionFeatureType_ = 0;
-
       return this;
     }
 
@@ -465,13 +463,27 @@ public com.google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigRequest build(
     public com.google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigRequest result =
           new com.google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigRequest(this);
-      result.conversationProfile_ = conversationProfile_;
-      result.participantRole_ = participantRole_;
-      result.suggestionFeatureType_ = suggestionFeatureType_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversationProfile_ = conversationProfile_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.participantRole_ = participantRole_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.suggestionFeatureType_ = suggestionFeatureType_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -523,6 +535,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getConversationProfile().isEmpty()) {
         conversationProfile_ = other.conversationProfile_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.participantRole_ != 0) {
@@ -560,19 +573,19 @@ public Builder mergeFrom(
             case 10:
               {
                 conversationProfile_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 participantRole_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 24:
               {
                 suggestionFeatureType_ = input.readEnum();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             default:
@@ -592,6 +605,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object conversationProfile_ = "";
     /**
      *
@@ -659,8 +674,8 @@ public Builder setConversationProfile(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversationProfile_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -678,8 +693,8 @@ public Builder setConversationProfile(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationProfile() {
-
       conversationProfile_ = getDefaultInstance().getConversationProfile();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -702,8 +717,8 @@ public Builder setConversationProfileBytes(com.google.protobuf.ByteString value)
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversationProfile_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -743,8 +758,8 @@ public int getParticipantRoleValue() {
      * @return This builder for chaining.
      */
     public Builder setParticipantRoleValue(int value) {
-
       participantRole_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -764,9 +779,8 @@ public Builder setParticipantRoleValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.Participant.Role getParticipantRole() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.Participant.Role result =
-          com.google.cloud.dialogflow.v2.Participant.Role.valueOf(participantRole_);
+          com.google.cloud.dialogflow.v2.Participant.Role.forNumber(participantRole_);
       return result == null ? com.google.cloud.dialogflow.v2.Participant.Role.UNRECOGNIZED : result;
     }
     /**
@@ -788,7 +802,7 @@ public Builder setParticipantRole(com.google.cloud.dialogflow.v2.Participant.Rol
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       participantRole_ = value.getNumber();
       onChanged();
       return this;
@@ -808,7 +822,7 @@ public Builder setParticipantRole(com.google.cloud.dialogflow.v2.Participant.Rol
      * @return This builder for chaining.
      */
     public Builder clearParticipantRole() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       participantRole_ = 0;
       onChanged();
       return this;
@@ -847,8 +861,8 @@ public int getSuggestionFeatureTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setSuggestionFeatureTypeValue(int value) {
-
       suggestionFeatureType_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -867,9 +881,8 @@ public Builder setSuggestionFeatureTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.SuggestionFeature.Type getSuggestionFeatureType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.SuggestionFeature.Type result =
-          com.google.cloud.dialogflow.v2.SuggestionFeature.Type.valueOf(suggestionFeatureType_);
+          com.google.cloud.dialogflow.v2.SuggestionFeature.Type.forNumber(suggestionFeatureType_);
       return result == null
           ? com.google.cloud.dialogflow.v2.SuggestionFeature.Type.UNRECOGNIZED
           : result;
@@ -893,7 +906,7 @@ public Builder setSuggestionFeatureType(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000004;
       suggestionFeatureType_ = value.getNumber();
       onChanged();
       return this;
@@ -912,7 +925,7 @@ public Builder setSuggestionFeatureType(
      * @return This builder for chaining.
      */
     public Builder clearSuggestionFeatureType() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       suggestionFeatureType_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CompleteConversationRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CompleteConversationRequest.java
index c63e0ca3a942..b306e853a1a3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CompleteConversationRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CompleteConversationRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Conversations.CompleteConversation][google.cloud.dialogflow.v2.Conversations.CompleteConversation].
+ * The request message for
+ * [Conversations.CompleteConversation][google.cloud.dialogflow.v2.Conversations.CompleteConversation].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.CompleteConversationRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -288,7 +291,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Conversations.CompleteConversation][google.cloud.dialogflow.v2.Conversations.CompleteConversation].
+   * The request message for
+   * [Conversations.CompleteConversation][google.cloud.dialogflow.v2.Conversations.CompleteConversation].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.CompleteConversationRequest}
@@ -322,8 +326,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -351,11 +355,20 @@ public com.google.cloud.dialogflow.v2.CompleteConversationRequest build() {
     public com.google.cloud.dialogflow.v2.CompleteConversationRequest buildPartial() {
       com.google.cloud.dialogflow.v2.CompleteConversationRequest result =
           new com.google.cloud.dialogflow.v2.CompleteConversationRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.CompleteConversationRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -404,6 +417,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.CompleteConversationRequ
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -435,7 +449,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -455,6 +469,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -528,8 +544,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -549,8 +565,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -575,8 +591,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Context.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Context.java
index 97df77e10dd6..771f5daacce1 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Context.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Context.java
@@ -80,7 +80,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -153,7 +155,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int LIFESPAN_COUNT_FIELD_NUMBER = 2;
-  private int lifespanCount_;
+  private int lifespanCount_ = 0;
   /**
    *
    *
@@ -255,7 +257,7 @@ public com.google.protobuf.Struct getParameters() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getParametersOrBuilder() {
-    return getParameters();
+    return parameters_ == null ? com.google.protobuf.Struct.getDefaultInstance() : parameters_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -489,14 +491,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       lifespanCount_ = 0;
-
-      if (parametersBuilder_ == null) {
-        parameters_ = null;
-      } else {
-        parameters_ = null;
+      parameters_ = null;
+      if (parametersBuilder_ != null) {
+        parametersBuilder_.dispose();
         parametersBuilder_ = null;
       }
       return this;
@@ -526,17 +526,26 @@ public com.google.cloud.dialogflow.v2.Context build() {
     public com.google.cloud.dialogflow.v2.Context buildPartial() {
       com.google.cloud.dialogflow.v2.Context result =
           new com.google.cloud.dialogflow.v2.Context(this);
-      result.name_ = name_;
-      result.lifespanCount_ = lifespanCount_;
-      if (parametersBuilder_ == null) {
-        result.parameters_ = parameters_;
-      } else {
-        result.parameters_ = parametersBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.Context result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.lifespanCount_ = lifespanCount_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.parameters_ = parametersBuilder_ == null ? parameters_ : parametersBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -584,6 +593,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Context other) {
       if (other == com.google.cloud.dialogflow.v2.Context.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getLifespanCount() != 0) {
@@ -621,19 +631,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 lifespanCount_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 input.readMessage(getParametersFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -653,6 +663,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -750,8 +762,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -779,8 +791,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -813,8 +825,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -856,6 +868,7 @@ public int getLifespanCount() {
     public Builder setLifespanCount(int value) {
 
       lifespanCount_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -874,7 +887,7 @@ public Builder setLifespanCount(int value) {
      * @return This builder for chaining.
      */
     public Builder clearLifespanCount() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       lifespanCount_ = 0;
       onChanged();
       return this;
@@ -912,7 +925,7 @@ public Builder clearLifespanCount() {
      * @return Whether the parameters field is set.
      */
     public boolean hasParameters() {
-      return parametersBuilder_ != null || parameters_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -975,11 +988,11 @@ public Builder setParameters(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         parameters_ = value;
-        onChanged();
       } else {
         parametersBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1008,11 +1021,11 @@ public Builder setParameters(com.google.protobuf.Struct value) {
     public Builder setParameters(com.google.protobuf.Struct.Builder builderForValue) {
       if (parametersBuilder_ == null) {
         parameters_ = builderForValue.build();
-        onChanged();
       } else {
         parametersBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1040,17 +1053,18 @@ public Builder setParameters(com.google.protobuf.Struct.Builder builderForValue)
      */
     public Builder mergeParameters(com.google.protobuf.Struct value) {
       if (parametersBuilder_ == null) {
-        if (parameters_ != null) {
-          parameters_ =
-              com.google.protobuf.Struct.newBuilder(parameters_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && parameters_ != null
+            && parameters_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getParametersBuilder().mergeFrom(value);
         } else {
           parameters_ = value;
         }
-        onChanged();
       } else {
         parametersBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1077,14 +1091,13 @@ public Builder mergeParameters(com.google.protobuf.Struct value) {
      * </code>
      */
     public Builder clearParameters() {
-      if (parametersBuilder_ == null) {
-        parameters_ = null;
-        onChanged();
-      } else {
-        parameters_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      parameters_ = null;
+      if (parametersBuilder_ != null) {
+        parametersBuilder_.dispose();
         parametersBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1111,7 +1124,7 @@ public Builder clearParameters() {
      * </code>
      */
     public com.google.protobuf.Struct.Builder getParametersBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getParametersFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ContextProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ContextProto.java
index 51aec17ba6fb..6844740e70d5 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ContextProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ContextProto.java
@@ -173,12 +173,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "sers/*/sessions/*}/contexts\332A\006parent\032x\312A"
           + "\031dialogflow.googleapis.com\322AYhttps://www"
           + ".googleapis.com/auth/cloud-platform,http"
-          + "s://www.googleapis.com/auth/dialogflowB\233"
+          + "s://www.googleapis.com/auth/dialogflowB\225"
           + "\001\n\036com.google.cloud.dialogflow.v2B\014Conte"
-          + "xtProtoP\001ZDgoogle.golang.org/genproto/go"
-          + "ogleapis/cloud/dialogflow/v2;dialogflow\370"
-          + "\001\001\242\002\002DF\252\002\032Google.Cloud.Dialogflow.V2b\006pr"
-          + "oto3"
+          + "xtProtoP\001Z>cloud.google.com/go/dialogflo"
+          + "w/apiv2/dialogflowpb;dialogflowpb\370\001\001\242\002\002D"
+          + "F\252\002\032Google.Cloud.Dialogflow.V2b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Conversation.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Conversation.java
index a6e9411b595c..cdfa82a997a9 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Conversation.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Conversation.java
@@ -399,7 +399,9 @@ private ConversationStage(int value) {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -452,7 +454,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int LIFECYCLE_STATE_FIELD_NUMBER = 2;
-  private int lifecycleState_;
+  private int lifecycleState_ = 0;
   /**
    *
    *
@@ -485,16 +487,17 @@ public int getLifecycleStateValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.Conversation.LifecycleState getLifecycleState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.Conversation.LifecycleState result =
-        com.google.cloud.dialogflow.v2.Conversation.LifecycleState.valueOf(lifecycleState_);
+        com.google.cloud.dialogflow.v2.Conversation.LifecycleState.forNumber(lifecycleState_);
     return result == null
         ? com.google.cloud.dialogflow.v2.Conversation.LifecycleState.UNRECOGNIZED
         : result;
   }
 
   public static final int CONVERSATION_PROFILE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object conversationProfile_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversationProfile_ = "";
   /**
    *
    *
@@ -558,8 +561,8 @@ public com.google.protobuf.ByteString getConversationProfileBytes() {
    *
    *
    * <pre>
-   * Output only. It will not be empty if the conversation is to be connected over
-   * telephony.
+   * Output only. It will not be empty if the conversation is to be connected
+   * over telephony.
    * </pre>
    *
    * <code>
@@ -576,8 +579,8 @@ public boolean hasPhoneNumber() {
    *
    *
    * <pre>
-   * Output only. It will not be empty if the conversation is to be connected over
-   * telephony.
+   * Output only. It will not be empty if the conversation is to be connected
+   * over telephony.
    * </pre>
    *
    * <code>
@@ -596,8 +599,8 @@ public com.google.cloud.dialogflow.v2.ConversationPhoneNumber getPhoneNumber() {
    *
    *
    * <pre>
-   * Output only. It will not be empty if the conversation is to be connected over
-   * telephony.
+   * Output only. It will not be empty if the conversation is to be connected
+   * over telephony.
    * </pre>
    *
    * <code>
@@ -606,7 +609,9 @@ public com.google.cloud.dialogflow.v2.ConversationPhoneNumber getPhoneNumber() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.ConversationPhoneNumberOrBuilder getPhoneNumberOrBuilder() {
-    return getPhoneNumber();
+    return phoneNumber_ == null
+        ? com.google.cloud.dialogflow.v2.ConversationPhoneNumber.getDefaultInstance()
+        : phoneNumber_;
   }
 
   public static final int START_TIME_FIELD_NUMBER = 5;
@@ -655,7 +660,7 @@ public com.google.protobuf.Timestamp getStartTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
-    return getStartTime();
+    return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_;
   }
 
   public static final int END_TIME_FIELD_NUMBER = 6;
@@ -704,11 +709,11 @@ public com.google.protobuf.Timestamp getEndTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
-    return getEndTime();
+    return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_;
   }
 
   public static final int CONVERSATION_STAGE_FIELD_NUMBER = 7;
-  private int conversationStage_;
+  private int conversationStage_ = 0;
   /**
    *
    *
@@ -717,12 +722,15 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
    * human agent is handling the conversation.
    * If the conversation is created with the conversation profile that has
    * Dialogflow config set, defaults to
-   * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE]; Otherwise, defaults to
+   * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE];
+   * Otherwise, defaults to
    * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE].
    * If the conversation is created with the conversation profile that has
    * Dialogflow config set but explicitly sets conversation_stage to
-   * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE], it skips
-   * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE] stage and directly goes to
+   * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE],
+   * it skips
+   * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE]
+   * stage and directly goes to
    * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE].
    * </pre>
    *
@@ -742,12 +750,15 @@ public int getConversationStageValue() {
    * human agent is handling the conversation.
    * If the conversation is created with the conversation profile that has
    * Dialogflow config set, defaults to
-   * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE]; Otherwise, defaults to
+   * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE];
+   * Otherwise, defaults to
    * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE].
    * If the conversation is created with the conversation profile that has
    * Dialogflow config set but explicitly sets conversation_stage to
-   * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE], it skips
-   * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE] stage and directly goes to
+   * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE],
+   * it skips
+   * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE]
+   * stage and directly goes to
    * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE].
    * </pre>
    *
@@ -757,9 +768,8 @@ public int getConversationStageValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.Conversation.ConversationStage getConversationStage() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.Conversation.ConversationStage result =
-        com.google.cloud.dialogflow.v2.Conversation.ConversationStage.valueOf(conversationStage_);
+        com.google.cloud.dialogflow.v2.Conversation.ConversationStage.forNumber(conversationStage_);
     return result == null
         ? com.google.cloud.dialogflow.v2.Conversation.ConversationStage.UNRECOGNIZED
         : result;
@@ -1044,32 +1054,26 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       lifecycleState_ = 0;
-
       conversationProfile_ = "";
-
-      if (phoneNumberBuilder_ == null) {
-        phoneNumber_ = null;
-      } else {
-        phoneNumber_ = null;
+      phoneNumber_ = null;
+      if (phoneNumberBuilder_ != null) {
+        phoneNumberBuilder_.dispose();
         phoneNumberBuilder_ = null;
       }
-      if (startTimeBuilder_ == null) {
-        startTime_ = null;
-      } else {
-        startTime_ = null;
+      startTime_ = null;
+      if (startTimeBuilder_ != null) {
+        startTimeBuilder_.dispose();
         startTimeBuilder_ = null;
       }
-      if (endTimeBuilder_ == null) {
-        endTime_ = null;
-      } else {
-        endTime_ = null;
+      endTime_ = null;
+      if (endTimeBuilder_ != null) {
+        endTimeBuilder_.dispose();
         endTimeBuilder_ = null;
       }
       conversationStage_ = 0;
-
       return this;
     }
 
@@ -1097,29 +1101,39 @@ public com.google.cloud.dialogflow.v2.Conversation build() {
     public com.google.cloud.dialogflow.v2.Conversation buildPartial() {
       com.google.cloud.dialogflow.v2.Conversation result =
           new com.google.cloud.dialogflow.v2.Conversation(this);
-      result.name_ = name_;
-      result.lifecycleState_ = lifecycleState_;
-      result.conversationProfile_ = conversationProfile_;
-      if (phoneNumberBuilder_ == null) {
-        result.phoneNumber_ = phoneNumber_;
-      } else {
-        result.phoneNumber_ = phoneNumberBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (startTimeBuilder_ == null) {
-        result.startTime_ = startTime_;
-      } else {
-        result.startTime_ = startTimeBuilder_.build();
-      }
-      if (endTimeBuilder_ == null) {
-        result.endTime_ = endTime_;
-      } else {
-        result.endTime_ = endTimeBuilder_.build();
-      }
-      result.conversationStage_ = conversationStage_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.Conversation result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.lifecycleState_ = lifecycleState_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.conversationProfile_ = conversationProfile_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.phoneNumber_ =
+            phoneNumberBuilder_ == null ? phoneNumber_ : phoneNumberBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.startTime_ = startTimeBuilder_ == null ? startTime_ : startTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.endTime_ = endTimeBuilder_ == null ? endTime_ : endTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.conversationStage_ = conversationStage_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -1167,6 +1181,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Conversation other) {
       if (other == com.google.cloud.dialogflow.v2.Conversation.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.lifecycleState_ != 0) {
@@ -1174,6 +1189,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Conversation other) {
       }
       if (!other.getConversationProfile().isEmpty()) {
         conversationProfile_ = other.conversationProfile_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.hasPhoneNumber()) {
@@ -1217,43 +1233,43 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 lifecycleState_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 conversationProfile_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(getPhoneNumberFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 42:
               {
                 input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             case 50:
               {
                 input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 50
             case 56:
               {
                 conversationStage_ = input.readEnum();
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 56
             default:
@@ -1273,6 +1289,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -1340,8 +1358,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1359,8 +1377,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1383,8 +1401,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1422,8 +1440,8 @@ public int getLifecycleStateValue() {
      * @return This builder for chaining.
      */
     public Builder setLifecycleStateValue(int value) {
-
       lifecycleState_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1442,9 +1460,8 @@ public Builder setLifecycleStateValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.Conversation.LifecycleState getLifecycleState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.Conversation.LifecycleState result =
-          com.google.cloud.dialogflow.v2.Conversation.LifecycleState.valueOf(lifecycleState_);
+          com.google.cloud.dialogflow.v2.Conversation.LifecycleState.forNumber(lifecycleState_);
       return result == null
           ? com.google.cloud.dialogflow.v2.Conversation.LifecycleState.UNRECOGNIZED
           : result;
@@ -1468,7 +1485,7 @@ public Builder setLifecycleState(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       lifecycleState_ = value.getNumber();
       onChanged();
       return this;
@@ -1487,7 +1504,7 @@ public Builder setLifecycleState(
      * @return This builder for chaining.
      */
     public Builder clearLifecycleState() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       lifecycleState_ = 0;
       onChanged();
       return this;
@@ -1569,8 +1586,8 @@ public Builder setConversationProfile(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversationProfile_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1591,8 +1608,8 @@ public Builder setConversationProfile(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationProfile() {
-
       conversationProfile_ = getDefaultInstance().getConversationProfile();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1618,8 +1635,8 @@ public Builder setConversationProfileBytes(com.google.protobuf.ByteString value)
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversationProfile_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1634,8 +1651,8 @@ public Builder setConversationProfileBytes(com.google.protobuf.ByteString value)
      *
      *
      * <pre>
-     * Output only. It will not be empty if the conversation is to be connected over
-     * telephony.
+     * Output only. It will not be empty if the conversation is to be connected
+     * over telephony.
      * </pre>
      *
      * <code>
@@ -1645,14 +1662,14 @@ public Builder setConversationProfileBytes(com.google.protobuf.ByteString value)
      * @return Whether the phoneNumber field is set.
      */
     public boolean hasPhoneNumber() {
-      return phoneNumberBuilder_ != null || phoneNumber_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
      *
      * <pre>
-     * Output only. It will not be empty if the conversation is to be connected over
-     * telephony.
+     * Output only. It will not be empty if the conversation is to be connected
+     * over telephony.
      * </pre>
      *
      * <code>
@@ -1674,8 +1691,8 @@ public com.google.cloud.dialogflow.v2.ConversationPhoneNumber getPhoneNumber() {
      *
      *
      * <pre>
-     * Output only. It will not be empty if the conversation is to be connected over
-     * telephony.
+     * Output only. It will not be empty if the conversation is to be connected
+     * over telephony.
      * </pre>
      *
      * <code>
@@ -1688,19 +1705,19 @@ public Builder setPhoneNumber(com.google.cloud.dialogflow.v2.ConversationPhoneNu
           throw new NullPointerException();
         }
         phoneNumber_ = value;
-        onChanged();
       } else {
         phoneNumberBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Output only. It will not be empty if the conversation is to be connected over
-     * telephony.
+     * Output only. It will not be empty if the conversation is to be connected
+     * over telephony.
      * </pre>
      *
      * <code>
@@ -1711,19 +1728,19 @@ public Builder setPhoneNumber(
         com.google.cloud.dialogflow.v2.ConversationPhoneNumber.Builder builderForValue) {
       if (phoneNumberBuilder_ == null) {
         phoneNumber_ = builderForValue.build();
-        onChanged();
       } else {
         phoneNumberBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Output only. It will not be empty if the conversation is to be connected over
-     * telephony.
+     * Output only. It will not be empty if the conversation is to be connected
+     * over telephony.
      * </pre>
      *
      * <code>
@@ -1732,27 +1749,27 @@ public Builder setPhoneNumber(
      */
     public Builder mergePhoneNumber(com.google.cloud.dialogflow.v2.ConversationPhoneNumber value) {
       if (phoneNumberBuilder_ == null) {
-        if (phoneNumber_ != null) {
-          phoneNumber_ =
-              com.google.cloud.dialogflow.v2.ConversationPhoneNumber.newBuilder(phoneNumber_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && phoneNumber_ != null
+            && phoneNumber_
+                != com.google.cloud.dialogflow.v2.ConversationPhoneNumber.getDefaultInstance()) {
+          getPhoneNumberBuilder().mergeFrom(value);
         } else {
           phoneNumber_ = value;
         }
-        onChanged();
       } else {
         phoneNumberBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Output only. It will not be empty if the conversation is to be connected over
-     * telephony.
+     * Output only. It will not be empty if the conversation is to be connected
+     * over telephony.
      * </pre>
      *
      * <code>
@@ -1760,22 +1777,21 @@ public Builder mergePhoneNumber(com.google.cloud.dialogflow.v2.ConversationPhone
      * </code>
      */
     public Builder clearPhoneNumber() {
-      if (phoneNumberBuilder_ == null) {
-        phoneNumber_ = null;
-        onChanged();
-      } else {
-        phoneNumber_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      phoneNumber_ = null;
+      if (phoneNumberBuilder_ != null) {
+        phoneNumberBuilder_.dispose();
         phoneNumberBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Output only. It will not be empty if the conversation is to be connected over
-     * telephony.
+     * Output only. It will not be empty if the conversation is to be connected
+     * over telephony.
      * </pre>
      *
      * <code>
@@ -1783,7 +1799,7 @@ public Builder clearPhoneNumber() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.ConversationPhoneNumber.Builder getPhoneNumberBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getPhoneNumberFieldBuilder().getBuilder();
     }
@@ -1791,8 +1807,8 @@ public com.google.cloud.dialogflow.v2.ConversationPhoneNumber.Builder getPhoneNu
      *
      *
      * <pre>
-     * Output only. It will not be empty if the conversation is to be connected over
-     * telephony.
+     * Output only. It will not be empty if the conversation is to be connected
+     * over telephony.
      * </pre>
      *
      * <code>
@@ -1813,8 +1829,8 @@ public com.google.cloud.dialogflow.v2.ConversationPhoneNumber.Builder getPhoneNu
      *
      *
      * <pre>
-     * Output only. It will not be empty if the conversation is to be connected over
-     * telephony.
+     * Output only. It will not be empty if the conversation is to be connected
+     * over telephony.
      * </pre>
      *
      * <code>
@@ -1857,7 +1873,7 @@ public com.google.cloud.dialogflow.v2.ConversationPhoneNumber.Builder getPhoneNu
      * @return Whether the startTime field is set.
      */
     public boolean hasStartTime() {
-      return startTimeBuilder_ != null || startTime_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -1894,11 +1910,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         startTime_ = value;
-        onChanged();
       } else {
         startTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1914,11 +1930,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) {
     public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (startTimeBuilder_ == null) {
         startTime_ = builderForValue.build();
-        onChanged();
       } else {
         startTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1933,17 +1949,18 @@ public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValu
      */
     public Builder mergeStartTime(com.google.protobuf.Timestamp value) {
       if (startTimeBuilder_ == null) {
-        if (startTime_ != null) {
-          startTime_ =
-              com.google.protobuf.Timestamp.newBuilder(startTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && startTime_ != null
+            && startTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getStartTimeBuilder().mergeFrom(value);
         } else {
           startTime_ = value;
         }
-        onChanged();
       } else {
         startTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1957,14 +1974,13 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) {
      * </code>
      */
     public Builder clearStartTime() {
-      if (startTimeBuilder_ == null) {
-        startTime_ = null;
-        onChanged();
-      } else {
-        startTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      startTime_ = null;
+      if (startTimeBuilder_ != null) {
+        startTimeBuilder_.dispose();
         startTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1978,7 +1994,7 @@ public Builder clearStartTime() {
      * </code>
      */
     public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getStartTimeFieldBuilder().getBuilder();
     }
@@ -2045,7 +2061,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
      * @return Whether the endTime field is set.
      */
     public boolean hasEndTime() {
-      return endTimeBuilder_ != null || endTime_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -2082,11 +2098,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         endTime_ = value;
-        onChanged();
       } else {
         endTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2102,11 +2118,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) {
     public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (endTimeBuilder_ == null) {
         endTime_ = builderForValue.build();
-        onChanged();
       } else {
         endTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2121,17 +2137,18 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue)
      */
     public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
       if (endTimeBuilder_ == null) {
-        if (endTime_ != null) {
-          endTime_ =
-              com.google.protobuf.Timestamp.newBuilder(endTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && endTime_ != null
+            && endTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getEndTimeBuilder().mergeFrom(value);
         } else {
           endTime_ = value;
         }
-        onChanged();
       } else {
         endTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2145,14 +2162,13 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
      * </code>
      */
     public Builder clearEndTime() {
-      if (endTimeBuilder_ == null) {
-        endTime_ = null;
-        onChanged();
-      } else {
-        endTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      endTime_ = null;
+      if (endTimeBuilder_ != null) {
+        endTimeBuilder_.dispose();
         endTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2166,7 +2182,7 @@ public Builder clearEndTime() {
      * </code>
      */
     public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getEndTimeFieldBuilder().getBuilder();
     }
@@ -2223,12 +2239,15 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
      * human agent is handling the conversation.
      * If the conversation is created with the conversation profile that has
      * Dialogflow config set, defaults to
-     * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE]; Otherwise, defaults to
+     * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE];
+     * Otherwise, defaults to
      * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE].
      * If the conversation is created with the conversation profile that has
      * Dialogflow config set but explicitly sets conversation_stage to
-     * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE], it skips
-     * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE] stage and directly goes to
+     * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE],
+     * it skips
+     * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE]
+     * stage and directly goes to
      * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE].
      * </pre>
      *
@@ -2249,12 +2268,15 @@ public int getConversationStageValue() {
      * human agent is handling the conversation.
      * If the conversation is created with the conversation profile that has
      * Dialogflow config set, defaults to
-     * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE]; Otherwise, defaults to
+     * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE];
+     * Otherwise, defaults to
      * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE].
      * If the conversation is created with the conversation profile that has
      * Dialogflow config set but explicitly sets conversation_stage to
-     * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE], it skips
-     * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE] stage and directly goes to
+     * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE],
+     * it skips
+     * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE]
+     * stage and directly goes to
      * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE].
      * </pre>
      *
@@ -2265,8 +2287,8 @@ public int getConversationStageValue() {
      * @return This builder for chaining.
      */
     public Builder setConversationStageValue(int value) {
-
       conversationStage_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2278,12 +2300,15 @@ public Builder setConversationStageValue(int value) {
      * human agent is handling the conversation.
      * If the conversation is created with the conversation profile that has
      * Dialogflow config set, defaults to
-     * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE]; Otherwise, defaults to
+     * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE];
+     * Otherwise, defaults to
      * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE].
      * If the conversation is created with the conversation profile that has
      * Dialogflow config set but explicitly sets conversation_stage to
-     * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE], it skips
-     * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE] stage and directly goes to
+     * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE],
+     * it skips
+     * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE]
+     * stage and directly goes to
      * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE].
      * </pre>
      *
@@ -2294,9 +2319,9 @@ public Builder setConversationStageValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.Conversation.ConversationStage getConversationStage() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.Conversation.ConversationStage result =
-          com.google.cloud.dialogflow.v2.Conversation.ConversationStage.valueOf(conversationStage_);
+          com.google.cloud.dialogflow.v2.Conversation.ConversationStage.forNumber(
+              conversationStage_);
       return result == null
           ? com.google.cloud.dialogflow.v2.Conversation.ConversationStage.UNRECOGNIZED
           : result;
@@ -2309,12 +2334,15 @@ public com.google.cloud.dialogflow.v2.Conversation.ConversationStage getConversa
      * human agent is handling the conversation.
      * If the conversation is created with the conversation profile that has
      * Dialogflow config set, defaults to
-     * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE]; Otherwise, defaults to
+     * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE];
+     * Otherwise, defaults to
      * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE].
      * If the conversation is created with the conversation profile that has
      * Dialogflow config set but explicitly sets conversation_stage to
-     * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE], it skips
-     * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE] stage and directly goes to
+     * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE],
+     * it skips
+     * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE]
+     * stage and directly goes to
      * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE].
      * </pre>
      *
@@ -2329,7 +2357,7 @@ public Builder setConversationStage(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000040;
       conversationStage_ = value.getNumber();
       onChanged();
       return this;
@@ -2342,12 +2370,15 @@ public Builder setConversationStage(
      * human agent is handling the conversation.
      * If the conversation is created with the conversation profile that has
      * Dialogflow config set, defaults to
-     * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE]; Otherwise, defaults to
+     * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE];
+     * Otherwise, defaults to
      * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE].
      * If the conversation is created with the conversation profile that has
      * Dialogflow config set but explicitly sets conversation_stage to
-     * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE], it skips
-     * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE] stage and directly goes to
+     * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE],
+     * it skips
+     * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE]
+     * stage and directly goes to
      * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE].
      * </pre>
      *
@@ -2357,7 +2388,7 @@ public Builder setConversationStage(
      * @return This builder for chaining.
      */
     public Builder clearConversationStage() {
-
+      bitField0_ = (bitField0_ & ~0x00000040);
       conversationStage_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationDataset.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationDataset.java
index 04b68a812000..67df0d1503b0 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationDataset.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationDataset.java
@@ -73,7 +73,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -126,7 +128,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
@@ -175,7 +179,9 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 3;
-  private volatile java.lang.Object description_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object description_ = "";
   /**
    *
    *
@@ -269,7 +275,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
 
   public static final int INPUT_CONFIG_FIELD_NUMBER = 5;
@@ -323,7 +329,9 @@ public com.google.cloud.dialogflow.v2.InputConfig getInputConfig() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.InputConfigOrBuilder getInputConfigOrBuilder() {
-    return getInputConfig();
+    return inputConfig_ == null
+        ? com.google.cloud.dialogflow.v2.InputConfig.getDefaultInstance()
+        : inputConfig_;
   }
 
   public static final int CONVERSATION_INFO_FIELD_NUMBER = 6;
@@ -377,16 +385,19 @@ public com.google.cloud.dialogflow.v2.ConversationInfo getConversationInfo() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.ConversationInfoOrBuilder getConversationInfoOrBuilder() {
-    return getConversationInfo();
+    return conversationInfo_ == null
+        ? com.google.cloud.dialogflow.v2.ConversationInfo.getDefaultInstance()
+        : conversationInfo_;
   }
 
   public static final int CONVERSATION_COUNT_FIELD_NUMBER = 7;
-  private long conversationCount_;
+  private long conversationCount_ = 0L;
   /**
    *
    *
    * <pre>
-   * Output only. The number of conversations this conversation dataset contains.
+   * Output only. The number of conversations this conversation dataset
+   * contains.
    * </pre>
    *
    * <code>int64 conversation_count = 7 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -667,32 +678,26 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       displayName_ = "";
-
       description_ = "";
-
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-      if (inputConfigBuilder_ == null) {
-        inputConfig_ = null;
-      } else {
-        inputConfig_ = null;
+      inputConfig_ = null;
+      if (inputConfigBuilder_ != null) {
+        inputConfigBuilder_.dispose();
         inputConfigBuilder_ = null;
       }
-      if (conversationInfoBuilder_ == null) {
-        conversationInfo_ = null;
-      } else {
-        conversationInfo_ = null;
+      conversationInfo_ = null;
+      if (conversationInfoBuilder_ != null) {
+        conversationInfoBuilder_.dispose();
         conversationInfoBuilder_ = null;
       }
       conversationCount_ = 0L;
-
       return this;
     }
 
@@ -720,29 +725,40 @@ public com.google.cloud.dialogflow.v2.ConversationDataset build() {
     public com.google.cloud.dialogflow.v2.ConversationDataset buildPartial() {
       com.google.cloud.dialogflow.v2.ConversationDataset result =
           new com.google.cloud.dialogflow.v2.ConversationDataset(this);
-      result.name_ = name_;
-      result.displayName_ = displayName_;
-      result.description_ = description_;
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
-      }
-      if (inputConfigBuilder_ == null) {
-        result.inputConfig_ = inputConfig_;
-      } else {
-        result.inputConfig_ = inputConfigBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (conversationInfoBuilder_ == null) {
-        result.conversationInfo_ = conversationInfo_;
-      } else {
-        result.conversationInfo_ = conversationInfoBuilder_.build();
-      }
-      result.conversationCount_ = conversationCount_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ConversationDataset result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.displayName_ = displayName_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.description_ = description_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.inputConfig_ =
+            inputConfigBuilder_ == null ? inputConfig_ : inputConfigBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.conversationInfo_ =
+            conversationInfoBuilder_ == null ? conversationInfo_ : conversationInfoBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.conversationCount_ = conversationCount_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -791,14 +807,17 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ConversationDataset othe
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.hasCreateTime()) {
@@ -842,44 +861,44 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 displayName_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 description_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 42:
               {
                 input.readMessage(getInputConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             case 50:
               {
                 input.readMessage(
                     getConversationInfoFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 50
             case 56:
               {
                 conversationCount_ = input.readInt64();
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 56
             default:
@@ -899,6 +918,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -966,8 +987,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -985,8 +1006,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1009,8 +1030,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1076,8 +1097,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1093,8 +1114,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
-
       displayName_ = getDefaultInstance().getDisplayName();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1115,8 +1136,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1182,8 +1203,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       description_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1199,8 +1220,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
-
       description_ = getDefaultInstance().getDescription();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1221,8 +1242,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       description_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1247,7 +1268,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1288,11 +1309,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1309,11 +1330,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1329,17 +1350,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
         } else {
           createTime_ = value;
         }
-        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1354,14 +1376,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * </code>
      */
     public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1376,7 +1397,7 @@ public Builder clearCreateTime() {
      * </code>
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
@@ -1448,7 +1469,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
      * @return Whether the inputConfig field is set.
      */
     public boolean hasInputConfig() {
-      return inputConfigBuilder_ != null || inputConfig_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -1489,11 +1510,11 @@ public Builder setInputConfig(com.google.cloud.dialogflow.v2.InputConfig value)
           throw new NullPointerException();
         }
         inputConfig_ = value;
-        onChanged();
       } else {
         inputConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1511,11 +1532,11 @@ public Builder setInputConfig(
         com.google.cloud.dialogflow.v2.InputConfig.Builder builderForValue) {
       if (inputConfigBuilder_ == null) {
         inputConfig_ = builderForValue.build();
-        onChanged();
       } else {
         inputConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1531,19 +1552,18 @@ public Builder setInputConfig(
      */
     public Builder mergeInputConfig(com.google.cloud.dialogflow.v2.InputConfig value) {
       if (inputConfigBuilder_ == null) {
-        if (inputConfig_ != null) {
-          inputConfig_ =
-              com.google.cloud.dialogflow.v2.InputConfig.newBuilder(inputConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && inputConfig_ != null
+            && inputConfig_ != com.google.cloud.dialogflow.v2.InputConfig.getDefaultInstance()) {
+          getInputConfigBuilder().mergeFrom(value);
         } else {
           inputConfig_ = value;
         }
-        onChanged();
       } else {
         inputConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1558,14 +1578,13 @@ public Builder mergeInputConfig(com.google.cloud.dialogflow.v2.InputConfig value
      * </code>
      */
     public Builder clearInputConfig() {
-      if (inputConfigBuilder_ == null) {
-        inputConfig_ = null;
-        onChanged();
-      } else {
-        inputConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      inputConfig_ = null;
+      if (inputConfigBuilder_ != null) {
+        inputConfigBuilder_.dispose();
         inputConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1580,7 +1599,7 @@ public Builder clearInputConfig() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.InputConfig.Builder getInputConfigBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getInputConfigFieldBuilder().getBuilder();
     }
@@ -1652,7 +1671,7 @@ public com.google.cloud.dialogflow.v2.InputConfigOrBuilder getInputConfigOrBuild
      * @return Whether the conversationInfo field is set.
      */
     public boolean hasConversationInfo() {
-      return conversationInfoBuilder_ != null || conversationInfo_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -1693,11 +1712,11 @@ public Builder setConversationInfo(com.google.cloud.dialogflow.v2.ConversationIn
           throw new NullPointerException();
         }
         conversationInfo_ = value;
-        onChanged();
       } else {
         conversationInfoBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1715,11 +1734,11 @@ public Builder setConversationInfo(
         com.google.cloud.dialogflow.v2.ConversationInfo.Builder builderForValue) {
       if (conversationInfoBuilder_ == null) {
         conversationInfo_ = builderForValue.build();
-        onChanged();
       } else {
         conversationInfoBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1735,19 +1754,19 @@ public Builder setConversationInfo(
      */
     public Builder mergeConversationInfo(com.google.cloud.dialogflow.v2.ConversationInfo value) {
       if (conversationInfoBuilder_ == null) {
-        if (conversationInfo_ != null) {
-          conversationInfo_ =
-              com.google.cloud.dialogflow.v2.ConversationInfo.newBuilder(conversationInfo_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && conversationInfo_ != null
+            && conversationInfo_
+                != com.google.cloud.dialogflow.v2.ConversationInfo.getDefaultInstance()) {
+          getConversationInfoBuilder().mergeFrom(value);
         } else {
           conversationInfo_ = value;
         }
-        onChanged();
       } else {
         conversationInfoBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1762,14 +1781,13 @@ public Builder mergeConversationInfo(com.google.cloud.dialogflow.v2.Conversation
      * </code>
      */
     public Builder clearConversationInfo() {
-      if (conversationInfoBuilder_ == null) {
-        conversationInfo_ = null;
-        onChanged();
-      } else {
-        conversationInfo_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      conversationInfo_ = null;
+      if (conversationInfoBuilder_ != null) {
+        conversationInfoBuilder_.dispose();
         conversationInfoBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1784,7 +1802,7 @@ public Builder clearConversationInfo() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.ConversationInfo.Builder getConversationInfoBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getConversationInfoFieldBuilder().getBuilder();
     }
@@ -1841,7 +1859,8 @@ public com.google.cloud.dialogflow.v2.ConversationInfoOrBuilder getConversationI
      *
      *
      * <pre>
-     * Output only. The number of conversations this conversation dataset contains.
+     * Output only. The number of conversations this conversation dataset
+     * contains.
      * </pre>
      *
      * <code>int64 conversation_count = 7 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1856,7 +1875,8 @@ public long getConversationCount() {
      *
      *
      * <pre>
-     * Output only. The number of conversations this conversation dataset contains.
+     * Output only. The number of conversations this conversation dataset
+     * contains.
      * </pre>
      *
      * <code>int64 conversation_count = 7 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1867,6 +1887,7 @@ public long getConversationCount() {
     public Builder setConversationCount(long value) {
 
       conversationCount_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -1874,7 +1895,8 @@ public Builder setConversationCount(long value) {
      *
      *
      * <pre>
-     * Output only. The number of conversations this conversation dataset contains.
+     * Output only. The number of conversations this conversation dataset
+     * contains.
      * </pre>
      *
      * <code>int64 conversation_count = 7 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1882,7 +1904,7 @@ public Builder setConversationCount(long value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationCount() {
-
+      bitField0_ = (bitField0_ & ~0x00000040);
       conversationCount_ = 0L;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationDatasetOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationDatasetOrBuilder.java
index 5848c5cafcca..92aa6bdf522d 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationDatasetOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationDatasetOrBuilder.java
@@ -226,7 +226,8 @@ public interface ConversationDatasetOrBuilder
    *
    *
    * <pre>
-   * Output only. The number of conversations this conversation dataset contains.
+   * Output only. The number of conversations this conversation dataset
+   * contains.
    * </pre>
    *
    * <code>int64 conversation_count = 7 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationDatasetProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationDatasetProto.java
index 5992eb4ffc81..be9141646de1 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationDatasetProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationDatasetProto.java
@@ -186,11 +186,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\312A\031dialogflow.googleapis.com\322AYhttps://w"
           + "ww.googleapis.com/auth/cloud-platform,ht"
           + "tps://www.googleapis.com/auth/dialogflow"
-          + "B\247\001\n\036com.google.cloud.dialogflow.v2B\030Con"
-          + "versationDatasetProtoP\001ZDgoogle.golang.o"
-          + "rg/genproto/googleapis/cloud/dialogflow/"
-          + "v2;dialogflow\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dia"
-          + "logflow.V2b\006proto3"
+          + "B\241\001\n\036com.google.cloud.dialogflow.v2B\030Con"
+          + "versationDatasetProtoP\001Z>cloud.google.co"
+          + "m/go/dialogflow/apiv2/dialogflowpb;dialo"
+          + "gflowpb\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dialogflo"
+          + "w.V2b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationEvent.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationEvent.java
index 5fb980df496d..7f5d9aefe725 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationEvent.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationEvent.java
@@ -359,7 +359,9 @@ public PayloadCase getPayloadCase() {
   }
 
   public static final int CONVERSATION_FIELD_NUMBER = 1;
-  private volatile java.lang.Object conversation_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversation_ = "";
   /**
    *
    *
@@ -412,7 +414,7 @@ public com.google.protobuf.ByteString getConversationBytes() {
   }
 
   public static final int TYPE_FIELD_NUMBER = 2;
-  private int type_;
+  private int type_ = 0;
   /**
    *
    *
@@ -441,9 +443,8 @@ public int getTypeValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.ConversationEvent.Type getType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.ConversationEvent.Type result =
-        com.google.cloud.dialogflow.v2.ConversationEvent.Type.valueOf(type_);
+        com.google.cloud.dialogflow.v2.ConversationEvent.Type.forNumber(type_);
     return result == null
         ? com.google.cloud.dialogflow.v2.ConversationEvent.Type.UNRECOGNIZED
         : result;
@@ -495,7 +496,7 @@ public com.google.rpc.Status getErrorStatus() {
    */
   @java.lang.Override
   public com.google.rpc.StatusOrBuilder getErrorStatusOrBuilder() {
-    return getErrorStatus();
+    return errorStatus_ == null ? com.google.rpc.Status.getDefaultInstance() : errorStatus_;
   }
 
   public static final int NEW_MESSAGE_PAYLOAD_FIELD_NUMBER = 4;
@@ -796,14 +797,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       conversation_ = "";
-
       type_ = 0;
-
-      if (errorStatusBuilder_ == null) {
-        errorStatus_ = null;
-      } else {
-        errorStatus_ = null;
+      errorStatus_ = null;
+      if (errorStatusBuilder_ != null) {
+        errorStatusBuilder_.dispose();
         errorStatusBuilder_ = null;
       }
       if (newMessagePayloadBuilder_ != null) {
@@ -838,25 +837,36 @@ public com.google.cloud.dialogflow.v2.ConversationEvent build() {
     public com.google.cloud.dialogflow.v2.ConversationEvent buildPartial() {
       com.google.cloud.dialogflow.v2.ConversationEvent result =
           new com.google.cloud.dialogflow.v2.ConversationEvent(this);
-      result.conversation_ = conversation_;
-      result.type_ = type_;
-      if (errorStatusBuilder_ == null) {
-        result.errorStatus_ = errorStatus_;
-      } else {
-        result.errorStatus_ = errorStatusBuilder_.build();
-      }
-      if (payloadCase_ == 4) {
-        if (newMessagePayloadBuilder_ == null) {
-          result.payload_ = payload_;
-        } else {
-          result.payload_ = newMessagePayloadBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.payloadCase_ = payloadCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ConversationEvent result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversation_ = conversation_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.type_ = type_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.errorStatus_ =
+            errorStatusBuilder_ == null ? errorStatus_ : errorStatusBuilder_.build();
+      }
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2.ConversationEvent result) {
+      result.payloadCase_ = payloadCase_;
+      result.payload_ = this.payload_;
+      if (payloadCase_ == 4 && newMessagePayloadBuilder_ != null) {
+        result.payload_ = newMessagePayloadBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -905,6 +915,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ConversationEvent other)
         return this;
       if (!other.getConversation().isEmpty()) {
         conversation_ = other.conversation_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.type_ != 0) {
@@ -953,19 +964,19 @@ public Builder mergeFrom(
             case 10:
               {
                 conversation_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 type_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 input.readMessage(getErrorStatusFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
@@ -1006,6 +1017,8 @@ public Builder clearPayload() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object conversation_ = "";
     /**
      *
@@ -1073,8 +1086,8 @@ public Builder setConversation(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversation_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1092,8 +1105,8 @@ public Builder setConversation(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversation() {
-
       conversation_ = getDefaultInstance().getConversation();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1116,8 +1129,8 @@ public Builder setConversationBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversation_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1151,8 +1164,8 @@ public int getTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setTypeValue(int value) {
-
       type_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1169,9 +1182,8 @@ public Builder setTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.ConversationEvent.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.ConversationEvent.Type result =
-          com.google.cloud.dialogflow.v2.ConversationEvent.Type.valueOf(type_);
+          com.google.cloud.dialogflow.v2.ConversationEvent.Type.forNumber(type_);
       return result == null
           ? com.google.cloud.dialogflow.v2.ConversationEvent.Type.UNRECOGNIZED
           : result;
@@ -1192,7 +1204,7 @@ public Builder setType(com.google.cloud.dialogflow.v2.ConversationEvent.Type val
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       type_ = value.getNumber();
       onChanged();
       return this;
@@ -1209,7 +1221,7 @@ public Builder setType(com.google.cloud.dialogflow.v2.ConversationEvent.Type val
      * @return This builder for chaining.
      */
     public Builder clearType() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       type_ = 0;
       onChanged();
       return this;
@@ -1232,7 +1244,7 @@ public Builder clearType() {
      * @return Whether the errorStatus field is set.
      */
     public boolean hasErrorStatus() {
-      return errorStatusBuilder_ != null || errorStatus_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1269,11 +1281,11 @@ public Builder setErrorStatus(com.google.rpc.Status value) {
           throw new NullPointerException();
         }
         errorStatus_ = value;
-        onChanged();
       } else {
         errorStatusBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1289,11 +1301,11 @@ public Builder setErrorStatus(com.google.rpc.Status value) {
     public Builder setErrorStatus(com.google.rpc.Status.Builder builderForValue) {
       if (errorStatusBuilder_ == null) {
         errorStatus_ = builderForValue.build();
-        onChanged();
       } else {
         errorStatusBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1308,17 +1320,18 @@ public Builder setErrorStatus(com.google.rpc.Status.Builder builderForValue) {
      */
     public Builder mergeErrorStatus(com.google.rpc.Status value) {
       if (errorStatusBuilder_ == null) {
-        if (errorStatus_ != null) {
-          errorStatus_ =
-              com.google.rpc.Status.newBuilder(errorStatus_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && errorStatus_ != null
+            && errorStatus_ != com.google.rpc.Status.getDefaultInstance()) {
+          getErrorStatusBuilder().mergeFrom(value);
         } else {
           errorStatus_ = value;
         }
-        onChanged();
       } else {
         errorStatusBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1332,14 +1345,13 @@ public Builder mergeErrorStatus(com.google.rpc.Status value) {
      * <code>.google.rpc.Status error_status = 3;</code>
      */
     public Builder clearErrorStatus() {
-      if (errorStatusBuilder_ == null) {
-        errorStatus_ = null;
-        onChanged();
-      } else {
-        errorStatus_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      errorStatus_ = null;
+      if (errorStatusBuilder_ != null) {
+        errorStatusBuilder_.dispose();
         errorStatusBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1353,7 +1365,7 @@ public Builder clearErrorStatus() {
      * <code>.google.rpc.Status error_status = 3;</code>
      */
     public com.google.rpc.Status.Builder getErrorStatusBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getErrorStatusFieldBuilder().getBuilder();
     }
@@ -1605,7 +1617,6 @@ public com.google.cloud.dialogflow.v2.MessageOrBuilder getNewMessagePayloadOrBui
       }
       payloadCase_ = 4;
       onChanged();
-      ;
       return newMessagePayloadBuilder_;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationEventProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationEventProto.java
index b373ce04d4b6..b09f5977c8a4 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationEventProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationEventProto.java
@@ -53,11 +53,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "D\020\000\022\030\n\024CONVERSATION_STARTED\020\001\022\031\n\025CONVERS"
           + "ATION_FINISHED\020\002\022\035\n\031HUMAN_INTERVENTION_N"
           + "EEDED\020\003\022\017\n\013NEW_MESSAGE\020\005\022\027\n\023UNRECOVERABL"
-          + "E_ERROR\020\004B\t\n\007payloadB\245\001\n\036com.google.clou"
+          + "E_ERROR\020\004B\t\n\007payloadB\237\001\n\036com.google.clou"
           + "d.dialogflow.v2B\026ConversationEventProtoP"
-          + "\001ZDgoogle.golang.org/genproto/googleapis"
-          + "/cloud/dialogflow/v2;dialogflow\370\001\001\242\002\002DF\252"
-          + "\002\032Google.Cloud.Dialogflow.V2b\006proto3"
+          + "\001Z>cloud.google.com/go/dialogflow/apiv2/"
+          + "dialogflowpb;dialogflowpb\370\001\001\242\002\002DF\252\002\032Goog"
+          + "le.Cloud.Dialogflow.V2b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationInfo.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationInfo.java
index bc4c708af0a3..02a4e46b213d 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationInfo.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationInfo.java
@@ -68,14 +68,16 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
    * <pre>
-   * Optional. The language code of the conversation data within this dataset. See
-   * https://cloud.google.com/apis/design/standard_fields for more information.
-   * Supports all UTF-8 languages.
+   * Optional. The language code of the conversation data within this dataset.
+   * See https://cloud.google.com/apis/design/standard_fields for more
+   * information. Supports all UTF-8 languages.
    * </pre>
    *
    * <code>string language_code = 1 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -98,9 +100,9 @@ public java.lang.String getLanguageCode() {
    *
    *
    * <pre>
-   * Optional. The language code of the conversation data within this dataset. See
-   * https://cloud.google.com/apis/design/standard_fields for more information.
-   * Supports all UTF-8 languages.
+   * Optional. The language code of the conversation data within this dataset.
+   * See https://cloud.google.com/apis/design/standard_fields for more
+   * information. Supports all UTF-8 languages.
    * </pre>
    *
    * <code>string language_code = 1 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -317,8 +319,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       languageCode_ = "";
-
       return this;
     }
 
@@ -346,11 +348,20 @@ public com.google.cloud.dialogflow.v2.ConversationInfo build() {
     public com.google.cloud.dialogflow.v2.ConversationInfo buildPartial() {
       com.google.cloud.dialogflow.v2.ConversationInfo result =
           new com.google.cloud.dialogflow.v2.ConversationInfo(this);
-      result.languageCode_ = languageCode_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ConversationInfo result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -399,6 +410,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ConversationInfo other)
         return this;
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -430,7 +442,7 @@ public Builder mergeFrom(
             case 10:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -450,14 +462,16 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object languageCode_ = "";
     /**
      *
      *
      * <pre>
-     * Optional. The language code of the conversation data within this dataset. See
-     * https://cloud.google.com/apis/design/standard_fields for more information.
-     * Supports all UTF-8 languages.
+     * Optional. The language code of the conversation data within this dataset.
+     * See https://cloud.google.com/apis/design/standard_fields for more
+     * information. Supports all UTF-8 languages.
      * </pre>
      *
      * <code>string language_code = 1 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -479,9 +493,9 @@ public java.lang.String getLanguageCode() {
      *
      *
      * <pre>
-     * Optional. The language code of the conversation data within this dataset. See
-     * https://cloud.google.com/apis/design/standard_fields for more information.
-     * Supports all UTF-8 languages.
+     * Optional. The language code of the conversation data within this dataset.
+     * See https://cloud.google.com/apis/design/standard_fields for more
+     * information. Supports all UTF-8 languages.
      * </pre>
      *
      * <code>string language_code = 1 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -503,9 +517,9 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
      *
      *
      * <pre>
-     * Optional. The language code of the conversation data within this dataset. See
-     * https://cloud.google.com/apis/design/standard_fields for more information.
-     * Supports all UTF-8 languages.
+     * Optional. The language code of the conversation data within this dataset.
+     * See https://cloud.google.com/apis/design/standard_fields for more
+     * information. Supports all UTF-8 languages.
      * </pre>
      *
      * <code>string language_code = 1 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -517,8 +531,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -526,9 +540,9 @@ public Builder setLanguageCode(java.lang.String value) {
      *
      *
      * <pre>
-     * Optional. The language code of the conversation data within this dataset. See
-     * https://cloud.google.com/apis/design/standard_fields for more information.
-     * Supports all UTF-8 languages.
+     * Optional. The language code of the conversation data within this dataset.
+     * See https://cloud.google.com/apis/design/standard_fields for more
+     * information. Supports all UTF-8 languages.
      * </pre>
      *
      * <code>string language_code = 1 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -536,8 +550,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -545,9 +559,9 @@ public Builder clearLanguageCode() {
      *
      *
      * <pre>
-     * Optional. The language code of the conversation data within this dataset. See
-     * https://cloud.google.com/apis/design/standard_fields for more information.
-     * Supports all UTF-8 languages.
+     * Optional. The language code of the conversation data within this dataset.
+     * See https://cloud.google.com/apis/design/standard_fields for more
+     * information. Supports all UTF-8 languages.
      * </pre>
      *
      * <code>string language_code = 1 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -560,8 +574,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationInfoOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationInfoOrBuilder.java
index 7275494c87ed..fb3ffbce2455 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationInfoOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationInfoOrBuilder.java
@@ -27,9 +27,9 @@ public interface ConversationInfoOrBuilder
    *
    *
    * <pre>
-   * Optional. The language code of the conversation data within this dataset. See
-   * https://cloud.google.com/apis/design/standard_fields for more information.
-   * Supports all UTF-8 languages.
+   * Optional. The language code of the conversation data within this dataset.
+   * See https://cloud.google.com/apis/design/standard_fields for more
+   * information. Supports all UTF-8 languages.
    * </pre>
    *
    * <code>string language_code = 1 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -41,9 +41,9 @@ public interface ConversationInfoOrBuilder
    *
    *
    * <pre>
-   * Optional. The language code of the conversation data within this dataset. See
-   * https://cloud.google.com/apis/design/standard_fields for more information.
-   * Supports all UTF-8 languages.
+   * Optional. The language code of the conversation data within this dataset.
+   * See https://cloud.google.com/apis/design/standard_fields for more
+   * information. Supports all UTF-8 languages.
    * </pre>
    *
    * <code>string language_code = 1 [(.google.api.field_behavior) = OPTIONAL];</code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationModel.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationModel.java
index 00bf0aa5e9e5..b9e04c513874 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationModel.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationModel.java
@@ -569,7 +569,9 @@ public ModelMetadataCase getModelMetadataCase() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -620,7 +622,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
@@ -714,10 +718,12 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
 
   public static final int DATASETS_FIELD_NUMBER = 4;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.InputDataset> datasets_;
   /**
    *
@@ -797,7 +803,7 @@ public com.google.cloud.dialogflow.v2.InputDatasetOrBuilder getDatasetsOrBuilder
   }
 
   public static final int STATE_FIELD_NUMBER = 7;
-  private int state_;
+  private int state_ = 0;
   /**
    *
    *
@@ -832,16 +838,17 @@ public int getStateValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.ConversationModel.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.ConversationModel.State result =
-        com.google.cloud.dialogflow.v2.ConversationModel.State.valueOf(state_);
+        com.google.cloud.dialogflow.v2.ConversationModel.State.forNumber(state_);
     return result == null
         ? com.google.cloud.dialogflow.v2.ConversationModel.State.UNRECOGNIZED
         : result;
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 19;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -1304,14 +1311,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       displayName_ = "";
-
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
       if (datasetsBuilder_ == null) {
@@ -1320,11 +1325,9 @@ public Builder clear() {
         datasets_ = null;
         datasetsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000008);
       state_ = 0;
-
       languageCode_ = "";
-
       if (articleSuggestionModelMetadataBuilder_ != null) {
         articleSuggestionModelMetadataBuilder_.clear();
       }
@@ -1360,42 +1363,56 @@ public com.google.cloud.dialogflow.v2.ConversationModel build() {
     public com.google.cloud.dialogflow.v2.ConversationModel buildPartial() {
       com.google.cloud.dialogflow.v2.ConversationModel result =
           new com.google.cloud.dialogflow.v2.ConversationModel(this);
-      int from_bitField0_ = bitField0_;
-      result.name_ = name_;
-      result.displayName_ = displayName_;
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.ConversationModel result) {
       if (datasetsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000008) != 0)) {
           datasets_ = java.util.Collections.unmodifiableList(datasets_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000008);
         }
         result.datasets_ = datasets_;
       } else {
         result.datasets_ = datasetsBuilder_.build();
       }
-      result.state_ = state_;
-      result.languageCode_ = languageCode_;
-      if (modelMetadataCase_ == 8) {
-        if (articleSuggestionModelMetadataBuilder_ == null) {
-          result.modelMetadata_ = modelMetadata_;
-        } else {
-          result.modelMetadata_ = articleSuggestionModelMetadataBuilder_.build();
-        }
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ConversationModel result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
       }
-      if (modelMetadataCase_ == 9) {
-        if (smartReplyModelMetadataBuilder_ == null) {
-          result.modelMetadata_ = modelMetadata_;
-        } else {
-          result.modelMetadata_ = smartReplyModelMetadataBuilder_.build();
-        }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.displayName_ = displayName_;
       }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.state_ = state_;
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2.ConversationModel result) {
       result.modelMetadataCase_ = modelMetadataCase_;
-      onBuilt();
-      return result;
+      result.modelMetadata_ = this.modelMetadata_;
+      if (modelMetadataCase_ == 8 && articleSuggestionModelMetadataBuilder_ != null) {
+        result.modelMetadata_ = articleSuggestionModelMetadataBuilder_.build();
+      }
+      if (modelMetadataCase_ == 9 && smartReplyModelMetadataBuilder_ != null) {
+        result.modelMetadata_ = smartReplyModelMetadataBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -1446,10 +1463,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ConversationModel other)
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasCreateTime()) {
@@ -1459,7 +1478,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ConversationModel other)
         if (!other.datasets_.isEmpty()) {
           if (datasets_.isEmpty()) {
             datasets_ = other.datasets_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000008);
           } else {
             ensureDatasetsIsMutable();
             datasets_.addAll(other.datasets_);
@@ -1472,7 +1491,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ConversationModel other)
             datasetsBuilder_.dispose();
             datasetsBuilder_ = null;
             datasets_ = other.datasets_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000008);
             datasetsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getDatasetsFieldBuilder()
@@ -1487,6 +1506,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ConversationModel other)
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000020;
         onChanged();
       }
       switch (other.getModelMetadataCase()) {
@@ -1534,19 +1554,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 displayName_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
@@ -1565,7 +1585,7 @@ public Builder mergeFrom(
             case 56:
               {
                 state_ = input.readEnum();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 56
             case 66:
@@ -1586,7 +1606,7 @@ public Builder mergeFrom(
             case 154:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 154
             default:
@@ -1686,8 +1706,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1704,8 +1724,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1727,8 +1747,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1794,8 +1814,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1811,8 +1831,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
-
       displayName_ = getDefaultInstance().getDisplayName();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1833,8 +1853,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1859,7 +1879,7 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1900,11 +1920,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1921,11 +1941,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1941,17 +1961,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
         } else {
           createTime_ = value;
         }
-        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1966,14 +1987,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * </code>
      */
     public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1988,7 +2008,7 @@ public Builder clearCreateTime() {
      * </code>
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
@@ -2044,9 +2064,9 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
         java.util.Collections.emptyList();
 
     private void ensureDatasetsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         datasets_ = new java.util.ArrayList<com.google.cloud.dialogflow.v2.InputDataset>(datasets_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000008;
       }
     }
 
@@ -2284,7 +2304,7 @@ public Builder addAllDatasets(
     public Builder clearDatasets() {
       if (datasetsBuilder_ == null) {
         datasets_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
       } else {
         datasetsBuilder_.clear();
@@ -2420,7 +2440,7 @@ public com.google.cloud.dialogflow.v2.InputDataset.Builder addDatasetsBuilder(in
                 com.google.cloud.dialogflow.v2.InputDataset,
                 com.google.cloud.dialogflow.v2.InputDataset.Builder,
                 com.google.cloud.dialogflow.v2.InputDatasetOrBuilder>(
-                datasets_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                datasets_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
         datasets_ = null;
       }
       return datasetsBuilder_;
@@ -2461,8 +2481,8 @@ public int getStateValue() {
      * @return This builder for chaining.
      */
     public Builder setStateValue(int value) {
-
       state_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2482,9 +2502,8 @@ public Builder setStateValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.ConversationModel.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.ConversationModel.State result =
-          com.google.cloud.dialogflow.v2.ConversationModel.State.valueOf(state_);
+          com.google.cloud.dialogflow.v2.ConversationModel.State.forNumber(state_);
       return result == null
           ? com.google.cloud.dialogflow.v2.ConversationModel.State.UNRECOGNIZED
           : result;
@@ -2508,7 +2527,7 @@ public Builder setState(com.google.cloud.dialogflow.v2.ConversationModel.State v
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000010;
       state_ = value.getNumber();
       onChanged();
       return this;
@@ -2528,7 +2547,7 @@ public Builder setState(com.google.cloud.dialogflow.v2.ConversationModel.State v
      * @return This builder for chaining.
      */
     public Builder clearState() {
-
+      bitField0_ = (bitField0_ & ~0x00000010);
       state_ = 0;
       onChanged();
       return this;
@@ -2607,8 +2626,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2628,8 +2647,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -2654,8 +2673,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2893,7 +2912,6 @@ public Builder clearArticleSuggestionModelMetadata() {
       }
       modelMetadataCase_ = 8;
       onChanged();
-      ;
       return articleSuggestionModelMetadataBuilder_;
     }
 
@@ -3118,7 +3136,6 @@ public Builder clearSmartReplyModelMetadata() {
       }
       modelMetadataCase_ = 9;
       onChanged();
-      ;
       return smartReplyModelMetadataBuilder_;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationModelEvaluation.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationModelEvaluation.java
index 1066dc67c022..a9d3d66ce04a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationModelEvaluation.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationModelEvaluation.java
@@ -40,6 +40,7 @@ private ConversationModelEvaluation(com.google.protobuf.GeneratedMessageV3.Build
   private ConversationModelEvaluation() {
     name_ = "";
     displayName_ = "";
+    rawHumanEvalTemplateCsv_ = "";
   }
 
   @java.lang.Override
@@ -113,7 +114,9 @@ public MetricsCase getMetricsCase() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -166,7 +169,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
@@ -265,7 +270,9 @@ public com.google.cloud.dialogflow.v2.EvaluationConfig getEvaluationConfig() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.EvaluationConfigOrBuilder getEvaluationConfigOrBuilder() {
-    return getEvaluationConfig();
+    return evaluationConfig_ == null
+        ? com.google.cloud.dialogflow.v2.EvaluationConfig.getDefaultInstance()
+        : evaluationConfig_;
   }
 
   public static final int CREATE_TIME_FIELD_NUMBER = 3;
@@ -314,7 +321,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
 
   public static final int SMART_REPLY_METRICS_FIELD_NUMBER = 5;
@@ -374,6 +381,87 @@ public com.google.cloud.dialogflow.v2.SmartReplyMetricsOrBuilder getSmartReplyMe
     return com.google.cloud.dialogflow.v2.SmartReplyMetrics.getDefaultInstance();
   }
 
+  public static final int RAW_HUMAN_EVAL_TEMPLATE_CSV_FIELD_NUMBER = 8;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object rawHumanEvalTemplateCsv_ = "";
+  /**
+   *
+   *
+   * <pre>
+   * Output only. Human eval template in csv format.
+   * It tooks real-world conversations provided through input dataset, generates
+   * example suggestions for customer to verify quality of the model.
+   * For Smart Reply, the generated csv file contains columns of
+   * Context, (Suggestions,Q1,Q2)*3, Actual reply.
+   * Context contains at most 10 latest messages in the conversation prior to
+   * the current suggestion.
+   * Q1: "Would you send it as the next message of agent?"
+   * Evaluated based on whether the suggest is appropriate to be sent by
+   * agent in current context.
+   * Q2: "Does the suggestion move the conversation closer to resolution?"
+   * Evaluated based on whether the suggestion provide solutions, or answers
+   * customer's question or collect information from customer to resolve the
+   * customer's issue.
+   * Actual reply column contains the actual agent reply sent in the context.
+   * </pre>
+   *
+   * <code>string raw_human_eval_template_csv = 8 [(.google.api.field_behavior) = OUTPUT_ONLY];
+   * </code>
+   *
+   * @return The rawHumanEvalTemplateCsv.
+   */
+  @java.lang.Override
+  public java.lang.String getRawHumanEvalTemplateCsv() {
+    java.lang.Object ref = rawHumanEvalTemplateCsv_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      rawHumanEvalTemplateCsv_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * <pre>
+   * Output only. Human eval template in csv format.
+   * It tooks real-world conversations provided through input dataset, generates
+   * example suggestions for customer to verify quality of the model.
+   * For Smart Reply, the generated csv file contains columns of
+   * Context, (Suggestions,Q1,Q2)*3, Actual reply.
+   * Context contains at most 10 latest messages in the conversation prior to
+   * the current suggestion.
+   * Q1: "Would you send it as the next message of agent?"
+   * Evaluated based on whether the suggest is appropriate to be sent by
+   * agent in current context.
+   * Q2: "Does the suggestion move the conversation closer to resolution?"
+   * Evaluated based on whether the suggestion provide solutions, or answers
+   * customer's question or collect information from customer to resolve the
+   * customer's issue.
+   * Actual reply column contains the actual agent reply sent in the context.
+   * </pre>
+   *
+   * <code>string raw_human_eval_template_csv = 8 [(.google.api.field_behavior) = OUTPUT_ONLY];
+   * </code>
+   *
+   * @return The bytes for rawHumanEvalTemplateCsv.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getRawHumanEvalTemplateCsvBytes() {
+    java.lang.Object ref = rawHumanEvalTemplateCsv_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      rawHumanEvalTemplateCsv_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -403,6 +491,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (evaluationConfig_ != null) {
       output.writeMessage(6, getEvaluationConfig());
     }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(rawHumanEvalTemplateCsv_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 8, rawHumanEvalTemplateCsv_);
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -429,6 +520,9 @@ public int getSerializedSize() {
     if (evaluationConfig_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getEvaluationConfig());
     }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(rawHumanEvalTemplateCsv_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, rawHumanEvalTemplateCsv_);
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -455,6 +549,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasCreateTime()) {
       if (!getCreateTime().equals(other.getCreateTime())) return false;
     }
+    if (!getRawHumanEvalTemplateCsv().equals(other.getRawHumanEvalTemplateCsv())) return false;
     if (!getMetricsCase().equals(other.getMetricsCase())) return false;
     switch (metricsCase_) {
       case 5:
@@ -486,6 +581,8 @@ public int hashCode() {
       hash = (37 * hash) + CREATE_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getCreateTime().hashCode();
     }
+    hash = (37 * hash) + RAW_HUMAN_EVAL_TEMPLATE_CSV_FIELD_NUMBER;
+    hash = (53 * hash) + getRawHumanEvalTemplateCsv().hashCode();
     switch (metricsCase_) {
       case 5:
         hash = (37 * hash) + SMART_REPLY_METRICS_FIELD_NUMBER;
@@ -633,25 +730,23 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       displayName_ = "";
-
-      if (evaluationConfigBuilder_ == null) {
-        evaluationConfig_ = null;
-      } else {
-        evaluationConfig_ = null;
+      evaluationConfig_ = null;
+      if (evaluationConfigBuilder_ != null) {
+        evaluationConfigBuilder_.dispose();
         evaluationConfigBuilder_ = null;
       }
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
       if (smartReplyMetricsBuilder_ != null) {
         smartReplyMetricsBuilder_.clear();
       }
+      rawHumanEvalTemplateCsv_ = "";
       metricsCase_ = 0;
       metrics_ = null;
       return this;
@@ -681,28 +776,41 @@ public com.google.cloud.dialogflow.v2.ConversationModelEvaluation build() {
     public com.google.cloud.dialogflow.v2.ConversationModelEvaluation buildPartial() {
       com.google.cloud.dialogflow.v2.ConversationModelEvaluation result =
           new com.google.cloud.dialogflow.v2.ConversationModelEvaluation(this);
-      result.name_ = name_;
-      result.displayName_ = displayName_;
-      if (evaluationConfigBuilder_ == null) {
-        result.evaluationConfig_ = evaluationConfig_;
-      } else {
-        result.evaluationConfig_ = evaluationConfigBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ConversationModelEvaluation result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
       }
-      if (metricsCase_ == 5) {
-        if (smartReplyMetricsBuilder_ == null) {
-          result.metrics_ = metrics_;
-        } else {
-          result.metrics_ = smartReplyMetricsBuilder_.build();
-        }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.displayName_ = displayName_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.evaluationConfig_ =
+            evaluationConfigBuilder_ == null ? evaluationConfig_ : evaluationConfigBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
       }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.rawHumanEvalTemplateCsv_ = rawHumanEvalTemplateCsv_;
+      }
+    }
+
+    private void buildPartialOneofs(
+        com.google.cloud.dialogflow.v2.ConversationModelEvaluation result) {
       result.metricsCase_ = metricsCase_;
-      onBuilt();
-      return result;
+      result.metrics_ = this.metrics_;
+      if (metricsCase_ == 5 && smartReplyMetricsBuilder_ != null) {
+        result.metrics_ = smartReplyMetricsBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -753,10 +861,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ConversationModelEvaluat
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasEvaluationConfig()) {
@@ -765,6 +875,11 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ConversationModelEvaluat
       if (other.hasCreateTime()) {
         mergeCreateTime(other.getCreateTime());
       }
+      if (!other.getRawHumanEvalTemplateCsv().isEmpty()) {
+        rawHumanEvalTemplateCsv_ = other.rawHumanEvalTemplateCsv_;
+        bitField0_ |= 0x00000020;
+        onChanged();
+      }
       switch (other.getMetricsCase()) {
         case SMART_REPLY_METRICS:
           {
@@ -805,19 +920,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 displayName_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 26
             case 42:
@@ -831,9 +946,15 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getEvaluationConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 50
+            case 66:
+              {
+                rawHumanEvalTemplateCsv_ = input.readStringRequireUtf8();
+                bitField0_ |= 0x00000020;
+                break;
+              } // case 66
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -865,6 +986,8 @@ public Builder clearMetrics() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -932,8 +1055,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -951,8 +1074,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -975,8 +1098,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1042,8 +1165,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1059,8 +1182,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
-
       displayName_ = getDefaultInstance().getDisplayName();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1081,8 +1204,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1107,7 +1230,7 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
      * @return Whether the evaluationConfig field is set.
      */
     public boolean hasEvaluationConfig() {
-      return evaluationConfigBuilder_ != null || evaluationConfig_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1148,11 +1271,11 @@ public Builder setEvaluationConfig(com.google.cloud.dialogflow.v2.EvaluationConf
           throw new NullPointerException();
         }
         evaluationConfig_ = value;
-        onChanged();
       } else {
         evaluationConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1170,11 +1293,11 @@ public Builder setEvaluationConfig(
         com.google.cloud.dialogflow.v2.EvaluationConfig.Builder builderForValue) {
       if (evaluationConfigBuilder_ == null) {
         evaluationConfig_ = builderForValue.build();
-        onChanged();
       } else {
         evaluationConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1190,19 +1313,19 @@ public Builder setEvaluationConfig(
      */
     public Builder mergeEvaluationConfig(com.google.cloud.dialogflow.v2.EvaluationConfig value) {
       if (evaluationConfigBuilder_ == null) {
-        if (evaluationConfig_ != null) {
-          evaluationConfig_ =
-              com.google.cloud.dialogflow.v2.EvaluationConfig.newBuilder(evaluationConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && evaluationConfig_ != null
+            && evaluationConfig_
+                != com.google.cloud.dialogflow.v2.EvaluationConfig.getDefaultInstance()) {
+          getEvaluationConfigBuilder().mergeFrom(value);
         } else {
           evaluationConfig_ = value;
         }
-        onChanged();
       } else {
         evaluationConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1217,14 +1340,13 @@ public Builder mergeEvaluationConfig(com.google.cloud.dialogflow.v2.EvaluationCo
      * </code>
      */
     public Builder clearEvaluationConfig() {
-      if (evaluationConfigBuilder_ == null) {
-        evaluationConfig_ = null;
-        onChanged();
-      } else {
-        evaluationConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      evaluationConfig_ = null;
+      if (evaluationConfigBuilder_ != null) {
+        evaluationConfigBuilder_.dispose();
         evaluationConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1239,7 +1361,7 @@ public Builder clearEvaluationConfig() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.EvaluationConfig.Builder getEvaluationConfigBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getEvaluationConfigFieldBuilder().getBuilder();
     }
@@ -1311,7 +1433,7 @@ public com.google.cloud.dialogflow.v2.EvaluationConfigOrBuilder getEvaluationCon
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1352,11 +1474,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1373,11 +1495,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1393,17 +1515,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
         } else {
           createTime_ = value;
         }
-        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1418,14 +1541,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * </code>
      */
     public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1440,7 +1562,7 @@ public Builder clearCreateTime() {
      * </code>
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
@@ -1717,10 +1839,190 @@ public com.google.cloud.dialogflow.v2.SmartReplyMetrics.Builder getSmartReplyMet
       }
       metricsCase_ = 5;
       onChanged();
-      ;
       return smartReplyMetricsBuilder_;
     }
 
+    private java.lang.Object rawHumanEvalTemplateCsv_ = "";
+    /**
+     *
+     *
+     * <pre>
+     * Output only. Human eval template in csv format.
+     * It tooks real-world conversations provided through input dataset, generates
+     * example suggestions for customer to verify quality of the model.
+     * For Smart Reply, the generated csv file contains columns of
+     * Context, (Suggestions,Q1,Q2)*3, Actual reply.
+     * Context contains at most 10 latest messages in the conversation prior to
+     * the current suggestion.
+     * Q1: "Would you send it as the next message of agent?"
+     * Evaluated based on whether the suggest is appropriate to be sent by
+     * agent in current context.
+     * Q2: "Does the suggestion move the conversation closer to resolution?"
+     * Evaluated based on whether the suggestion provide solutions, or answers
+     * customer's question or collect information from customer to resolve the
+     * customer's issue.
+     * Actual reply column contains the actual agent reply sent in the context.
+     * </pre>
+     *
+     * <code>string raw_human_eval_template_csv = 8 [(.google.api.field_behavior) = OUTPUT_ONLY];
+     * </code>
+     *
+     * @return The rawHumanEvalTemplateCsv.
+     */
+    public java.lang.String getRawHumanEvalTemplateCsv() {
+      java.lang.Object ref = rawHumanEvalTemplateCsv_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        rawHumanEvalTemplateCsv_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Output only. Human eval template in csv format.
+     * It tooks real-world conversations provided through input dataset, generates
+     * example suggestions for customer to verify quality of the model.
+     * For Smart Reply, the generated csv file contains columns of
+     * Context, (Suggestions,Q1,Q2)*3, Actual reply.
+     * Context contains at most 10 latest messages in the conversation prior to
+     * the current suggestion.
+     * Q1: "Would you send it as the next message of agent?"
+     * Evaluated based on whether the suggest is appropriate to be sent by
+     * agent in current context.
+     * Q2: "Does the suggestion move the conversation closer to resolution?"
+     * Evaluated based on whether the suggestion provide solutions, or answers
+     * customer's question or collect information from customer to resolve the
+     * customer's issue.
+     * Actual reply column contains the actual agent reply sent in the context.
+     * </pre>
+     *
+     * <code>string raw_human_eval_template_csv = 8 [(.google.api.field_behavior) = OUTPUT_ONLY];
+     * </code>
+     *
+     * @return The bytes for rawHumanEvalTemplateCsv.
+     */
+    public com.google.protobuf.ByteString getRawHumanEvalTemplateCsvBytes() {
+      java.lang.Object ref = rawHumanEvalTemplateCsv_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        rawHumanEvalTemplateCsv_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Output only. Human eval template in csv format.
+     * It tooks real-world conversations provided through input dataset, generates
+     * example suggestions for customer to verify quality of the model.
+     * For Smart Reply, the generated csv file contains columns of
+     * Context, (Suggestions,Q1,Q2)*3, Actual reply.
+     * Context contains at most 10 latest messages in the conversation prior to
+     * the current suggestion.
+     * Q1: "Would you send it as the next message of agent?"
+     * Evaluated based on whether the suggest is appropriate to be sent by
+     * agent in current context.
+     * Q2: "Does the suggestion move the conversation closer to resolution?"
+     * Evaluated based on whether the suggestion provide solutions, or answers
+     * customer's question or collect information from customer to resolve the
+     * customer's issue.
+     * Actual reply column contains the actual agent reply sent in the context.
+     * </pre>
+     *
+     * <code>string raw_human_eval_template_csv = 8 [(.google.api.field_behavior) = OUTPUT_ONLY];
+     * </code>
+     *
+     * @param value The rawHumanEvalTemplateCsv to set.
+     * @return This builder for chaining.
+     */
+    public Builder setRawHumanEvalTemplateCsv(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      rawHumanEvalTemplateCsv_ = value;
+      bitField0_ |= 0x00000020;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Output only. Human eval template in csv format.
+     * It tooks real-world conversations provided through input dataset, generates
+     * example suggestions for customer to verify quality of the model.
+     * For Smart Reply, the generated csv file contains columns of
+     * Context, (Suggestions,Q1,Q2)*3, Actual reply.
+     * Context contains at most 10 latest messages in the conversation prior to
+     * the current suggestion.
+     * Q1: "Would you send it as the next message of agent?"
+     * Evaluated based on whether the suggest is appropriate to be sent by
+     * agent in current context.
+     * Q2: "Does the suggestion move the conversation closer to resolution?"
+     * Evaluated based on whether the suggestion provide solutions, or answers
+     * customer's question or collect information from customer to resolve the
+     * customer's issue.
+     * Actual reply column contains the actual agent reply sent in the context.
+     * </pre>
+     *
+     * <code>string raw_human_eval_template_csv = 8 [(.google.api.field_behavior) = OUTPUT_ONLY];
+     * </code>
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearRawHumanEvalTemplateCsv() {
+      rawHumanEvalTemplateCsv_ = getDefaultInstance().getRawHumanEvalTemplateCsv();
+      bitField0_ = (bitField0_ & ~0x00000020);
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Output only. Human eval template in csv format.
+     * It tooks real-world conversations provided through input dataset, generates
+     * example suggestions for customer to verify quality of the model.
+     * For Smart Reply, the generated csv file contains columns of
+     * Context, (Suggestions,Q1,Q2)*3, Actual reply.
+     * Context contains at most 10 latest messages in the conversation prior to
+     * the current suggestion.
+     * Q1: "Would you send it as the next message of agent?"
+     * Evaluated based on whether the suggest is appropriate to be sent by
+     * agent in current context.
+     * Q2: "Does the suggestion move the conversation closer to resolution?"
+     * Evaluated based on whether the suggestion provide solutions, or answers
+     * customer's question or collect information from customer to resolve the
+     * customer's issue.
+     * Actual reply column contains the actual agent reply sent in the context.
+     * </pre>
+     *
+     * <code>string raw_human_eval_template_csv = 8 [(.google.api.field_behavior) = OUTPUT_ONLY];
+     * </code>
+     *
+     * @param value The bytes for rawHumanEvalTemplateCsv to set.
+     * @return This builder for chaining.
+     */
+    public Builder setRawHumanEvalTemplateCsvBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+      rawHumanEvalTemplateCsv_ = value;
+      bitField0_ |= 0x00000020;
+      onChanged();
+      return this;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationModelEvaluationOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationModelEvaluationOrBuilder.java
index a7d953390004..111e8d546ee3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationModelEvaluationOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationModelEvaluationOrBuilder.java
@@ -197,5 +197,60 @@ public interface ConversationModelEvaluationOrBuilder
    */
   com.google.cloud.dialogflow.v2.SmartReplyMetricsOrBuilder getSmartReplyMetricsOrBuilder();
 
+  /**
+   *
+   *
+   * <pre>
+   * Output only. Human eval template in csv format.
+   * It tooks real-world conversations provided through input dataset, generates
+   * example suggestions for customer to verify quality of the model.
+   * For Smart Reply, the generated csv file contains columns of
+   * Context, (Suggestions,Q1,Q2)*3, Actual reply.
+   * Context contains at most 10 latest messages in the conversation prior to
+   * the current suggestion.
+   * Q1: "Would you send it as the next message of agent?"
+   * Evaluated based on whether the suggest is appropriate to be sent by
+   * agent in current context.
+   * Q2: "Does the suggestion move the conversation closer to resolution?"
+   * Evaluated based on whether the suggestion provide solutions, or answers
+   * customer's question or collect information from customer to resolve the
+   * customer's issue.
+   * Actual reply column contains the actual agent reply sent in the context.
+   * </pre>
+   *
+   * <code>string raw_human_eval_template_csv = 8 [(.google.api.field_behavior) = OUTPUT_ONLY];
+   * </code>
+   *
+   * @return The rawHumanEvalTemplateCsv.
+   */
+  java.lang.String getRawHumanEvalTemplateCsv();
+  /**
+   *
+   *
+   * <pre>
+   * Output only. Human eval template in csv format.
+   * It tooks real-world conversations provided through input dataset, generates
+   * example suggestions for customer to verify quality of the model.
+   * For Smart Reply, the generated csv file contains columns of
+   * Context, (Suggestions,Q1,Q2)*3, Actual reply.
+   * Context contains at most 10 latest messages in the conversation prior to
+   * the current suggestion.
+   * Q1: "Would you send it as the next message of agent?"
+   * Evaluated based on whether the suggest is appropriate to be sent by
+   * agent in current context.
+   * Q2: "Does the suggestion move the conversation closer to resolution?"
+   * Evaluated based on whether the suggestion provide solutions, or answers
+   * customer's question or collect information from customer to resolve the
+   * customer's issue.
+   * Actual reply column contains the actual agent reply sent in the context.
+   * </pre>
+   *
+   * <code>string raw_human_eval_template_csv = 8 [(.google.api.field_behavior) = OUTPUT_ONLY];
+   * </code>
+   *
+   * @return The bytes for rawHumanEvalTemplateCsv.
+   */
+  com.google.protobuf.ByteString getRawHumanEvalTemplateCsvBytes();
+
   public com.google.cloud.dialogflow.v2.ConversationModelEvaluation.MetricsCase getMetricsCase();
 }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationModelProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationModelProto.java
index 90f858b94872..45bdd18eedf0 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationModelProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationModelProto.java
@@ -170,181 +170,182 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "ation}/conversationModels/{conversation_"
           + "model}\022:projects/{project}/conversationM"
           + "odels/{conversation_model}B\020\n\016model_meta"
-          + "data\"\245\004\n\033ConversationModelEvaluation\022\014\n\004"
+          + "data\"\317\004\n\033ConversationModelEvaluation\022\014\n\004"
           + "name\030\001 \001(\t\022\031\n\014display_name\030\002 \001(\tB\003\340A\001\022L\n"
           + "\021evaluation_config\030\006 \001(\0132,.google.cloud."
           + "dialogflow.v2.EvaluationConfigB\003\340A\001\0224\n\013c"
           + "reate_time\030\003 \001(\0132\032.google.protobuf.Times"
           + "tampB\003\340A\003\022Q\n\023smart_reply_metrics\030\005 \001(\0132-"
           + ".google.cloud.dialogflow.v2.SmartReplyMe"
-          + "tricsB\003\340A\003H\000:\372\001\352A\366\001\n5dialogflow.googleap"
-          + "is.com/ConversationModelEvaluation\022Sproj"
-          + "ects/{project}/conversationModels/{conve"
-          + "rsation_model}/evaluations/{evaluation}\022"
-          + "hprojects/{project}/locations/{location}"
-          + "/conversationModels/{conversation_model}"
-          + "/evaluations/{evaluation}B\t\n\007metrics\"\234\004\n"
-          + "\020EvaluationConfig\022?\n\010datasets\030\003 \003(\0132(.go"
-          + "ogle.cloud.dialogflow.v2.InputDatasetB\003\340"
-          + "A\002\022[\n\022smart_reply_config\030\002 \001(\0132=.google."
-          + "cloud.dialogflow.v2.EvaluationConfig.Sma"
-          + "rtReplyConfigH\000\022_\n\024smart_compose_config\030"
-          + "\004 \001(\0132?.google.cloud.dialogflow.v2.Evalu"
-          + "ationConfig.SmartComposeConfigH\000\032v\n\020Smar"
-          + "tReplyConfig\022C\n\022allowlist_document\030\001 \001(\t"
-          + "B\'\372A$\n\"dialogflow.googleapis.com/Documen"
-          + "t\022\035\n\020max_result_count\030\002 \001(\005B\003\340A\002\032x\n\022Smar"
-          + "tComposeConfig\022C\n\022allowlist_document\030\001 \001"
+          + "tricsB\003\340A\003H\000\022(\n\033raw_human_eval_template_"
+          + "csv\030\010 \001(\tB\003\340A\003:\372\001\352A\366\001\n5dialogflow.google"
+          + "apis.com/ConversationModelEvaluation\022Spr"
+          + "ojects/{project}/conversationModels/{con"
+          + "versation_model}/evaluations/{evaluation"
+          + "}\022hprojects/{project}/locations/{locatio"
+          + "n}/conversationModels/{conversation_mode"
+          + "l}/evaluations/{evaluation}B\t\n\007metrics\"\234"
+          + "\004\n\020EvaluationConfig\022?\n\010datasets\030\003 \003(\0132(."
+          + "google.cloud.dialogflow.v2.InputDatasetB"
+          + "\003\340A\002\022[\n\022smart_reply_config\030\002 \001(\0132=.googl"
+          + "e.cloud.dialogflow.v2.EvaluationConfig.S"
+          + "martReplyConfigH\000\022_\n\024smart_compose_confi"
+          + "g\030\004 \001(\0132?.google.cloud.dialogflow.v2.Eva"
+          + "luationConfig.SmartComposeConfigH\000\032v\n\020Sm"
+          + "artReplyConfig\022C\n\022allowlist_document\030\001 \001"
           + "(\tB\'\372A$\n\"dialogflow.googleapis.com/Docum"
-          + "ent\022\035\n\020max_result_count\030\002 \001(\005B\003\340A\002B\027\n\025mo"
-          + "del_specific_config\"V\n\014InputDataset\022F\n\007d"
-          + "ataset\030\001 \001(\tB5\340A\002\372A/\n-dialogflow.googlea"
-          + "pis.com/ConversationDataset\"{\n\036ArticleSu"
-          + "ggestionModelMetadata\022Y\n\023training_model_"
-          + "type\030\003 \001(\01627.google.cloud.dialogflow.v2."
-          + "ConversationModel.ModelTypeB\003\340A\001\"t\n\027Smar"
-          + "tReplyModelMetadata\022Y\n\023training_model_ty"
-          + "pe\030\006 \001(\01627.google.cloud.dialogflow.v2.Co"
-          + "nversationModel.ModelTypeB\003\340A\001\"\307\001\n\021Smart"
-          + "ReplyMetrics\022\032\n\022allowlist_coverage\030\001 \001(\002"
-          + "\022P\n\rtop_n_metrics\030\002 \003(\01329.google.cloud.d"
-          + "ialogflow.v2.SmartReplyMetrics.TopNMetri"
-          + "cs\022\032\n\022conversation_count\030\003 \001(\003\032(\n\013TopNMe"
-          + "trics\022\t\n\001n\030\001 \001(\005\022\016\n\006recall\030\002 \001(\002\"\200\001\n\036Cre"
-          + "ateConversationModelRequest\022\016\n\006parent\030\001 "
-          + "\001(\t\022N\n\022conversation_model\030\002 \001(\0132-.google"
-          + ".cloud.dialogflow.v2.ConversationModelB\003"
-          + "\340A\002\"0\n\033GetConversationModelRequest\022\021\n\004na"
-          + "me\030\001 \001(\tB\003\340A\002\"e\n\035ListConversationModelsR"
-          + "equest\022\023\n\006parent\030\001 \001(\tB\003\340A\002\022\026\n\tpage_size"
-          + "\030\002 \001(\005B\003\340A\001\022\027\n\npage_token\030\003 \001(\tB\003\340A\001\"\205\001\n"
-          + "\036ListConversationModelsResponse\022J\n\023conve"
-          + "rsation_models\030\001 \003(\0132-.google.cloud.dial"
-          + "ogflow.v2.ConversationModel\022\027\n\017next_page"
-          + "_token\030\002 \001(\t\"3\n\036DeleteConversationModelR"
-          + "equest\022\021\n\004name\030\001 \001(\tB\003\340A\002\"3\n\036DeployConve"
-          + "rsationModelRequest\022\021\n\004name\030\001 \001(\tB\003\340A\002\"5"
-          + "\n UndeployConversationModelRequest\022\021\n\004na"
-          + "me\030\001 \001(\tB\003\340A\002\":\n%GetConversationModelEva"
-          + "luationRequest\022\021\n\004name\030\001 \001(\tB\003\340A\002\"o\n\'Lis"
-          + "tConversationModelEvaluationsRequest\022\023\n\006"
-          + "parent\030\001 \001(\tB\003\340A\002\022\026\n\tpage_size\030\002 \001(\005B\003\340A"
-          + "\001\022\027\n\npage_token\030\003 \001(\tB\003\340A\001\"\244\001\n(ListConve"
-          + "rsationModelEvaluationsResponse\022_\n\036conve"
-          + "rsation_model_evaluations\030\001 \003(\01327.google"
-          + ".cloud.dialogflow.v2.ConversationModelEv"
-          + "aluation\022\027\n\017next_page_token\030\002 \001(\t\"\336\001\n(Cr"
-          + "eateConversationModelEvaluationRequest\022M"
-          + "\n\006parent\030\001 \001(\tB=\340A\002\372A7\0225dialogflow.googl"
-          + "eapis.com/ConversationModelEvaluation\022c\n"
-          + "\035conversation_model_evaluation\030\002 \001(\01327.g"
-          + "oogle.cloud.dialogflow.v2.ConversationMo"
-          + "delEvaluationB\003\340A\002\"\307\002\n(CreateConversatio"
-          + "nModelOperationMetadata\022\032\n\022conversation_"
-          + "model\030\001 \001(\t\022Y\n\005state\030\002 \001(\0162J.google.clou"
-          + "d.dialogflow.v2.CreateConversationModelO"
-          + "perationMetadata.State\022/\n\013create_time\030\003 "
-          + "\001(\0132\032.google.protobuf.Timestamp\"s\n\005State"
-          + "\022\025\n\021STATE_UNSPECIFIED\020\000\022\013\n\007PENDING\020\001\022\r\n\t"
-          + "SUCCEEDED\020\002\022\n\n\006FAILED\020\003\022\r\n\tCANCELLED\020\004\022\016"
-          + "\n\nCANCELLING\020\005\022\014\n\010TRAINING\020\006\"w\n(DeployCo"
-          + "nversationModelOperationMetadata\022\032\n\022conv"
-          + "ersation_model\030\001 \001(\t\022/\n\013create_time\030\003 \001("
-          + "\0132\032.google.protobuf.Timestamp\"y\n*Undeplo"
-          + "yConversationModelOperationMetadata\022\032\n\022c"
-          + "onversation_model\030\001 \001(\t\022/\n\013create_time\030\003"
-          + " \001(\0132\032.google.protobuf.Timestamp\"w\n(Dele"
-          + "teConversationModelOperationMetadata\022\032\n\022"
-          + "conversation_model\030\001 \001(\t\022/\n\013create_time\030"
-          + "\003 \001(\0132\032.google.protobuf.Timestamp\"\366\002\n2Cr"
-          + "eateConversationModelEvaluationOperation"
-          + "Metadata\022%\n\035conversation_model_evaluatio"
-          + "n\030\001 \001(\t\022\032\n\022conversation_model\030\004 \001(\t\022c\n\005s"
-          + "tate\030\002 \001(\0162T.google.cloud.dialogflow.v2."
-          + "CreateConversationModelEvaluationOperati"
-          + "onMetadata.State\022/\n\013create_time\030\003 \001(\0132\032."
-          + "google.protobuf.Timestamp\"g\n\005State\022\025\n\021ST"
-          + "ATE_UNSPECIFIED\020\000\022\020\n\014INITIALIZING\020\001\022\013\n\007R"
-          + "UNNING\020\002\022\r\n\tCANCELLED\020\003\022\r\n\tSUCCEEDED\020\004\022\n"
-          + "\n\006FAILED\020\0052\376\026\n\022ConversationModels\022\350\002\n\027Cr"
-          + "eateConversationModel\022:.google.cloud.dia"
-          + "logflow.v2.CreateConversationModelReques"
-          + "t\032\035.google.longrunning.Operation\"\361\001\202\323\344\223\002"
-          + "\216\001\"*/v2/{parent=projects/*}/conversation"
-          + "Models:\022conversation_modelZL\"6/v2/{paren"
-          + "t=projects/*/locations/*}/conversationMo"
-          + "dels:\022conversation_model\332A\031parent,conver"
-          + "sation_model\312A=\n\021ConversationModel\022(Crea"
-          + "teConversationModelOperationMetadata\022\363\001\n"
-          + "\024GetConversationModel\0227.google.cloud.dia"
-          + "logflow.v2.GetConversationModelRequest\032-"
+          + "ent\022\035\n\020max_result_count\030\002 \001(\005B\003\340A\002\032x\n\022Sm"
+          + "artComposeConfig\022C\n\022allowlist_document\030\001"
+          + " \001(\tB\'\372A$\n\"dialogflow.googleapis.com/Doc"
+          + "ument\022\035\n\020max_result_count\030\002 \001(\005B\003\340A\002B\027\n\025"
+          + "model_specific_config\"V\n\014InputDataset\022F\n"
+          + "\007dataset\030\001 \001(\tB5\340A\002\372A/\n-dialogflow.googl"
+          + "eapis.com/ConversationDataset\"{\n\036Article"
+          + "SuggestionModelMetadata\022Y\n\023training_mode"
+          + "l_type\030\003 \001(\01627.google.cloud.dialogflow.v"
+          + "2.ConversationModel.ModelTypeB\003\340A\001\"t\n\027Sm"
+          + "artReplyModelMetadata\022Y\n\023training_model_"
+          + "type\030\006 \001(\01627.google.cloud.dialogflow.v2."
+          + "ConversationModel.ModelTypeB\003\340A\001\"\307\001\n\021Sma"
+          + "rtReplyMetrics\022\032\n\022allowlist_coverage\030\001 \001"
+          + "(\002\022P\n\rtop_n_metrics\030\002 \003(\01329.google.cloud"
+          + ".dialogflow.v2.SmartReplyMetrics.TopNMet"
+          + "rics\022\032\n\022conversation_count\030\003 \001(\003\032(\n\013TopN"
+          + "Metrics\022\t\n\001n\030\001 \001(\005\022\016\n\006recall\030\002 \001(\002\"\200\001\n\036C"
+          + "reateConversationModelRequest\022\016\n\006parent\030"
+          + "\001 \001(\t\022N\n\022conversation_model\030\002 \001(\0132-.goog"
+          + "le.cloud.dialogflow.v2.ConversationModel"
+          + "B\003\340A\002\"0\n\033GetConversationModelRequest\022\021\n\004"
+          + "name\030\001 \001(\tB\003\340A\002\"e\n\035ListConversationModel"
+          + "sRequest\022\023\n\006parent\030\001 \001(\tB\003\340A\002\022\026\n\tpage_si"
+          + "ze\030\002 \001(\005B\003\340A\001\022\027\n\npage_token\030\003 \001(\tB\003\340A\001\"\205"
+          + "\001\n\036ListConversationModelsResponse\022J\n\023con"
+          + "versation_models\030\001 \003(\0132-.google.cloud.di"
+          + "alogflow.v2.ConversationModel\022\027\n\017next_pa"
+          + "ge_token\030\002 \001(\t\"3\n\036DeleteConversationMode"
+          + "lRequest\022\021\n\004name\030\001 \001(\tB\003\340A\002\"3\n\036DeployCon"
+          + "versationModelRequest\022\021\n\004name\030\001 \001(\tB\003\340A\002"
+          + "\"5\n UndeployConversationModelRequest\022\021\n\004"
+          + "name\030\001 \001(\tB\003\340A\002\":\n%GetConversationModelE"
+          + "valuationRequest\022\021\n\004name\030\001 \001(\tB\003\340A\002\"o\n\'L"
+          + "istConversationModelEvaluationsRequest\022\023"
+          + "\n\006parent\030\001 \001(\tB\003\340A\002\022\026\n\tpage_size\030\002 \001(\005B\003"
+          + "\340A\001\022\027\n\npage_token\030\003 \001(\tB\003\340A\001\"\244\001\n(ListCon"
+          + "versationModelEvaluationsResponse\022_\n\036con"
+          + "versation_model_evaluations\030\001 \003(\01327.goog"
+          + "le.cloud.dialogflow.v2.ConversationModel"
+          + "Evaluation\022\027\n\017next_page_token\030\002 \001(\t\"\336\001\n("
+          + "CreateConversationModelEvaluationRequest"
+          + "\022M\n\006parent\030\001 \001(\tB=\340A\002\372A7\0225dialogflow.goo"
+          + "gleapis.com/ConversationModelEvaluation\022"
+          + "c\n\035conversation_model_evaluation\030\002 \001(\01327"
           + ".google.cloud.dialogflow.v2.Conversation"
-          + "Model\"s\202\323\344\223\002f\022*/v2/{name=projects/*/conv"
-          + "ersationModels/*}Z8\0226/v2/{name=projects/"
-          + "*/locations/*/conversationModels/*}\332A\004na"
-          + "me\022\206\002\n\026ListConversationModels\0229.google.c"
-          + "loud.dialogflow.v2.ListConversationModel"
-          + "sRequest\032:.google.cloud.dialogflow.v2.Li"
-          + "stConversationModelsResponse\"u\202\323\344\223\002f\022*/v"
-          + "2/{parent=projects/*}/conversationModels"
-          + "Z8\0226/v2/{parent=projects/*/locations/*}/"
-          + "conversationModels\332A\006parent\022\256\002\n\027DeleteCo"
-          + "nversationModel\022:.google.cloud.dialogflo"
-          + "w.v2.DeleteConversationModelRequest\032\035.go"
-          + "ogle.longrunning.Operation\"\267\001\202\323\344\223\002f**/v2"
-          + "/{name=projects/*/conversationModels/*}Z"
-          + "8*6/v2/{name=projects/*/locations/*/conv"
-          + "ersationModels/*}\332A\004name\312AA\n\025google.prot"
-          + "obuf.Empty\022(DeleteConversationModelOpera"
-          + "tionMetadata\022\273\002\n\027DeployConversationModel"
-          + "\022:.google.cloud.dialogflow.v2.DeployConv"
-          + "ersationModelRequest\032\035.google.longrunnin"
-          + "g.Operation\"\304\001\202\323\344\223\002z\"1/v2/{name=projects"
-          + "/*/conversationModels/*}:deploy:\001*ZB\"=/v"
-          + "2/{name=projects/*/locations/*/conversat"
-          + "ionModels/*}:deploy:\001*\312AA\n\025google.protob"
-          + "uf.Empty\022(DeployConversationModelOperati"
-          + "onMetadata\022\305\002\n\031UndeployConversationModel"
-          + "\022<.google.cloud.dialogflow.v2.UndeployCo"
+          + "ModelEvaluationB\003\340A\002\"\307\002\n(CreateConversat"
+          + "ionModelOperationMetadata\022\032\n\022conversatio"
+          + "n_model\030\001 \001(\t\022Y\n\005state\030\002 \001(\0162J.google.cl"
+          + "oud.dialogflow.v2.CreateConversationMode"
+          + "lOperationMetadata.State\022/\n\013create_time\030"
+          + "\003 \001(\0132\032.google.protobuf.Timestamp\"s\n\005Sta"
+          + "te\022\025\n\021STATE_UNSPECIFIED\020\000\022\013\n\007PENDING\020\001\022\r"
+          + "\n\tSUCCEEDED\020\002\022\n\n\006FAILED\020\003\022\r\n\tCANCELLED\020\004"
+          + "\022\016\n\nCANCELLING\020\005\022\014\n\010TRAINING\020\006\"w\n(Deploy"
+          + "ConversationModelOperationMetadata\022\032\n\022co"
+          + "nversation_model\030\001 \001(\t\022/\n\013create_time\030\003 "
+          + "\001(\0132\032.google.protobuf.Timestamp\"y\n*Undep"
+          + "loyConversationModelOperationMetadata\022\032\n"
+          + "\022conversation_model\030\001 \001(\t\022/\n\013create_time"
+          + "\030\003 \001(\0132\032.google.protobuf.Timestamp\"w\n(De"
+          + "leteConversationModelOperationMetadata\022\032"
+          + "\n\022conversation_model\030\001 \001(\t\022/\n\013create_tim"
+          + "e\030\003 \001(\0132\032.google.protobuf.Timestamp\"\366\002\n2"
+          + "CreateConversationModelEvaluationOperati"
+          + "onMetadata\022%\n\035conversation_model_evaluat"
+          + "ion\030\001 \001(\t\022\032\n\022conversation_model\030\004 \001(\t\022c\n"
+          + "\005state\030\002 \001(\0162T.google.cloud.dialogflow.v"
+          + "2.CreateConversationModelEvaluationOpera"
+          + "tionMetadata.State\022/\n\013create_time\030\003 \001(\0132"
+          + "\032.google.protobuf.Timestamp\"g\n\005State\022\025\n\021"
+          + "STATE_UNSPECIFIED\020\000\022\020\n\014INITIALIZING\020\001\022\013\n"
+          + "\007RUNNING\020\002\022\r\n\tCANCELLED\020\003\022\r\n\tSUCCEEDED\020\004"
+          + "\022\n\n\006FAILED\020\0052\376\026\n\022ConversationModels\022\350\002\n\027"
+          + "CreateConversationModel\022:.google.cloud.d"
+          + "ialogflow.v2.CreateConversationModelRequ"
+          + "est\032\035.google.longrunning.Operation\"\361\001\202\323\344"
+          + "\223\002\216\001\"*/v2/{parent=projects/*}/conversati"
+          + "onModels:\022conversation_modelZL\"6/v2/{par"
+          + "ent=projects/*/locations/*}/conversation"
+          + "Models:\022conversation_model\332A\031parent,conv"
+          + "ersation_model\312A=\n\021ConversationModel\022(Cr"
+          + "eateConversationModelOperationMetadata\022\363"
+          + "\001\n\024GetConversationModel\0227.google.cloud.d"
+          + "ialogflow.v2.GetConversationModelRequest"
+          + "\032-.google.cloud.dialogflow.v2.Conversati"
+          + "onModel\"s\202\323\344\223\002f\022*/v2/{name=projects/*/co"
+          + "nversationModels/*}Z8\0226/v2/{name=project"
+          + "s/*/locations/*/conversationModels/*}\332A\004"
+          + "name\022\206\002\n\026ListConversationModels\0229.google"
+          + ".cloud.dialogflow.v2.ListConversationMod"
+          + "elsRequest\032:.google.cloud.dialogflow.v2."
+          + "ListConversationModelsResponse\"u\202\323\344\223\002f\022*"
+          + "/v2/{parent=projects/*}/conversationMode"
+          + "lsZ8\0226/v2/{parent=projects/*/locations/*"
+          + "}/conversationModels\332A\006parent\022\256\002\n\027Delete"
+          + "ConversationModel\022:.google.cloud.dialogf"
+          + "low.v2.DeleteConversationModelRequest\032\035."
+          + "google.longrunning.Operation\"\267\001\202\323\344\223\002f**/"
+          + "v2/{name=projects/*/conversationModels/*"
+          + "}Z8*6/v2/{name=projects/*/locations/*/co"
+          + "nversationModels/*}\332A\004name\312AA\n\025google.pr"
+          + "otobuf.Empty\022(DeleteConversationModelOpe"
+          + "rationMetadata\022\273\002\n\027DeployConversationMod"
+          + "el\022:.google.cloud.dialogflow.v2.DeployCo"
           + "nversationModelRequest\032\035.google.longrunn"
-          + "ing.Operation\"\312\001\202\323\344\223\002~\"3/v2/{name=projec"
-          + "ts/*/conversationModels/*}:undeploy:\001*ZD"
-          + "\"?/v2/{name=projects/*/locations/*/conve"
-          + "rsationModels/*}:undeploy:\001*\312AC\n\025google."
-          + "protobuf.Empty\022*UndeployConversationMode"
-          + "lOperationMetadata\022\257\002\n\036GetConversationMo"
-          + "delEvaluation\022A.google.cloud.dialogflow."
-          + "v2.GetConversationModelEvaluationRequest"
-          + "\0327.google.cloud.dialogflow.v2.Conversati"
-          + "onModelEvaluation\"\220\001\202\323\344\223\002\202\001\0228/v2/{name=p"
-          + "rojects/*/conversationModels/*/evaluatio"
-          + "ns/*}ZF\022D/v2/{name=projects/*/locations/"
-          + "*/conversationModels/*/evaluations/*}\332A\004"
-          + "name\022\302\002\n ListConversationModelEvaluation"
-          + "s\022C.google.cloud.dialogflow.v2.ListConve"
-          + "rsationModelEvaluationsRequest\032D.google."
-          + "cloud.dialogflow.v2.ListConversationMode"
-          + "lEvaluationsResponse\"\222\001\202\323\344\223\002\202\001\0228/v2/{par"
-          + "ent=projects/*/conversationModels/*}/eva"
-          + "luationsZF\022D/v2/{parent=projects/*/locat"
-          + "ions/*/conversationModels/*}/evaluations"
-          + "\332A\006parent\022\325\002\n!CreateConversationModelEva"
-          + "luation\022D.google.cloud.dialogflow.v2.Cre"
-          + "ateConversationModelEvaluationRequest\032\035."
-          + "google.longrunning.Operation\"\312\001\202\323\344\223\002I\"D/"
-          + "v2/{parent=projects/*/locations/*/conver"
-          + "sationModels/*}/evaluations:\001*\332A$parent,"
-          + "conversation_model_evaluation\312AQ\n\033Conver"
-          + "sationModelEvaluation\0222CreateConversatio"
-          + "nModelEvaluationOperationMetadata\032x\312A\031di"
-          + "alogflow.googleapis.com\322AYhttps://www.go"
-          + "ogleapis.com/auth/cloud-platform,https:/"
-          + "/www.googleapis.com/auth/dialogflowB\245\001\n\036"
-          + "com.google.cloud.dialogflow.v2B\026Conversa"
-          + "tionModelProtoP\001ZDgoogle.golang.org/genp"
-          + "roto/googleapis/cloud/dialogflow/v2;dial"
-          + "ogflow\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dialogflow"
-          + ".V2b\006proto3"
+          + "ing.Operation\"\304\001\202\323\344\223\002z\"1/v2/{name=projec"
+          + "ts/*/conversationModels/*}:deploy:\001*ZB\"="
+          + "/v2/{name=projects/*/locations/*/convers"
+          + "ationModels/*}:deploy:\001*\312AA\n\025google.prot"
+          + "obuf.Empty\022(DeployConversationModelOpera"
+          + "tionMetadata\022\305\002\n\031UndeployConversationMod"
+          + "el\022<.google.cloud.dialogflow.v2.Undeploy"
+          + "ConversationModelRequest\032\035.google.longru"
+          + "nning.Operation\"\312\001\202\323\344\223\002~\"3/v2/{name=proj"
+          + "ects/*/conversationModels/*}:undeploy:\001*"
+          + "ZD\"?/v2/{name=projects/*/locations/*/con"
+          + "versationModels/*}:undeploy:\001*\312AC\n\025googl"
+          + "e.protobuf.Empty\022*UndeployConversationMo"
+          + "delOperationMetadata\022\257\002\n\036GetConversation"
+          + "ModelEvaluation\022A.google.cloud.dialogflo"
+          + "w.v2.GetConversationModelEvaluationReque"
+          + "st\0327.google.cloud.dialogflow.v2.Conversa"
+          + "tionModelEvaluation\"\220\001\202\323\344\223\002\202\001\0228/v2/{name"
+          + "=projects/*/conversationModels/*/evaluat"
+          + "ions/*}ZF\022D/v2/{name=projects/*/location"
+          + "s/*/conversationModels/*/evaluations/*}\332"
+          + "A\004name\022\302\002\n ListConversationModelEvaluati"
+          + "ons\022C.google.cloud.dialogflow.v2.ListCon"
+          + "versationModelEvaluationsRequest\032D.googl"
+          + "e.cloud.dialogflow.v2.ListConversationMo"
+          + "delEvaluationsResponse\"\222\001\202\323\344\223\002\202\001\0228/v2/{p"
+          + "arent=projects/*/conversationModels/*}/e"
+          + "valuationsZF\022D/v2/{parent=projects/*/loc"
+          + "ations/*/conversationModels/*}/evaluatio"
+          + "ns\332A\006parent\022\325\002\n!CreateConversationModelE"
+          + "valuation\022D.google.cloud.dialogflow.v2.C"
+          + "reateConversationModelEvaluationRequest\032"
+          + "\035.google.longrunning.Operation\"\312\001\202\323\344\223\002I\""
+          + "D/v2/{parent=projects/*/locations/*/conv"
+          + "ersationModels/*}/evaluations:\001*\332A$paren"
+          + "t,conversation_model_evaluation\312AQ\n\033Conv"
+          + "ersationModelEvaluation\0222CreateConversat"
+          + "ionModelEvaluationOperationMetadata\032x\312A\031"
+          + "dialogflow.googleapis.com\322AYhttps://www."
+          + "googleapis.com/auth/cloud-platform,https"
+          + "://www.googleapis.com/auth/dialogflowB\237\001"
+          + "\n\036com.google.cloud.dialogflow.v2B\026Conver"
+          + "sationModelProtoP\001Z>cloud.google.com/go/"
+          + "dialogflow/apiv2/dialogflowpb;dialogflow"
+          + "pb\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dialogflow.V2b"
+          + "\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -384,6 +385,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "EvaluationConfig",
               "CreateTime",
               "SmartReplyMetrics",
+              "RawHumanEvalTemplateCsv",
               "Metrics",
             });
     internal_static_google_cloud_dialogflow_v2_EvaluationConfig_descriptor =
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationOrBuilder.java
index fe99ec27c923..fa3ca41e27bf 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationOrBuilder.java
@@ -120,8 +120,8 @@ public interface ConversationOrBuilder
    *
    *
    * <pre>
-   * Output only. It will not be empty if the conversation is to be connected over
-   * telephony.
+   * Output only. It will not be empty if the conversation is to be connected
+   * over telephony.
    * </pre>
    *
    * <code>
@@ -135,8 +135,8 @@ public interface ConversationOrBuilder
    *
    *
    * <pre>
-   * Output only. It will not be empty if the conversation is to be connected over
-   * telephony.
+   * Output only. It will not be empty if the conversation is to be connected
+   * over telephony.
    * </pre>
    *
    * <code>
@@ -150,8 +150,8 @@ public interface ConversationOrBuilder
    *
    *
    * <pre>
-   * Output only. It will not be empty if the conversation is to be connected over
-   * telephony.
+   * Output only. It will not be empty if the conversation is to be connected
+   * over telephony.
    * </pre>
    *
    * <code>
@@ -244,12 +244,15 @@ public interface ConversationOrBuilder
    * human agent is handling the conversation.
    * If the conversation is created with the conversation profile that has
    * Dialogflow config set, defaults to
-   * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE]; Otherwise, defaults to
+   * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE];
+   * Otherwise, defaults to
    * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE].
    * If the conversation is created with the conversation profile that has
    * Dialogflow config set but explicitly sets conversation_stage to
-   * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE], it skips
-   * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE] stage and directly goes to
+   * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE],
+   * it skips
+   * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE]
+   * stage and directly goes to
    * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE].
    * </pre>
    *
@@ -266,12 +269,15 @@ public interface ConversationOrBuilder
    * human agent is handling the conversation.
    * If the conversation is created with the conversation profile that has
    * Dialogflow config set, defaults to
-   * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE]; Otherwise, defaults to
+   * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE];
+   * Otherwise, defaults to
    * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE].
    * If the conversation is created with the conversation profile that has
    * Dialogflow config set but explicitly sets conversation_stage to
-   * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE], it skips
-   * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE] stage and directly goes to
+   * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE],
+   * it skips
+   * [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE]
+   * stage and directly goes to
    * [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE].
    * </pre>
    *
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationPhoneNumber.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationPhoneNumber.java
index e60b8a5203ba..81a73cb5ba0b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationPhoneNumber.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationPhoneNumber.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PHONE_NUMBER_FIELD_NUMBER = 3;
-  private volatile java.lang.Object phoneNumber_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object phoneNumber_ = "";
   /**
    *
    *
@@ -316,8 +318,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       phoneNumber_ = "";
-
       return this;
     }
 
@@ -345,11 +347,20 @@ public com.google.cloud.dialogflow.v2.ConversationPhoneNumber build() {
     public com.google.cloud.dialogflow.v2.ConversationPhoneNumber buildPartial() {
       com.google.cloud.dialogflow.v2.ConversationPhoneNumber result =
           new com.google.cloud.dialogflow.v2.ConversationPhoneNumber(this);
-      result.phoneNumber_ = phoneNumber_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ConversationPhoneNumber result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.phoneNumber_ = phoneNumber_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -398,6 +409,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ConversationPhoneNumber
         return this;
       if (!other.getPhoneNumber().isEmpty()) {
         phoneNumber_ = other.phoneNumber_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -429,7 +441,7 @@ public Builder mergeFrom(
             case 26:
               {
                 phoneNumber_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 26
             default:
@@ -449,6 +461,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object phoneNumber_ = "";
     /**
      *
@@ -510,8 +524,8 @@ public Builder setPhoneNumber(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       phoneNumber_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -527,8 +541,8 @@ public Builder setPhoneNumber(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPhoneNumber() {
-
       phoneNumber_ = getDefaultInstance().getPhoneNumber();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -549,8 +563,8 @@ public Builder setPhoneNumberBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       phoneNumber_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationProfile.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationProfile.java
index f459388115e5..c2159e95b140 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationProfile.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationProfile.java
@@ -72,7 +72,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -125,7 +127,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
@@ -219,7 +223,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
 
   public static final int UPDATE_TIME_FIELD_NUMBER = 12;
@@ -268,7 +272,7 @@ public com.google.protobuf.Timestamp getUpdateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
-    return getUpdateTime();
+    return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
   }
 
   public static final int AUTOMATED_AGENT_CONFIG_FIELD_NUMBER = 3;
@@ -317,7 +321,9 @@ public com.google.cloud.dialogflow.v2.AutomatedAgentConfig getAutomatedAgentConf
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.AutomatedAgentConfigOrBuilder
       getAutomatedAgentConfigOrBuilder() {
-    return getAutomatedAgentConfig();
+    return automatedAgentConfig_ == null
+        ? com.google.cloud.dialogflow.v2.AutomatedAgentConfig.getDefaultInstance()
+        : automatedAgentConfig_;
   }
 
   public static final int HUMAN_AGENT_ASSISTANT_CONFIG_FIELD_NUMBER = 4;
@@ -369,7 +375,9 @@ public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig getHumanAgentAss
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfigOrBuilder
       getHumanAgentAssistantConfigOrBuilder() {
-    return getHumanAgentAssistantConfig();
+    return humanAgentAssistantConfig_ == null
+        ? com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.getDefaultInstance()
+        : humanAgentAssistantConfig_;
   }
 
   public static final int HUMAN_AGENT_HANDOFF_CONFIG_FIELD_NUMBER = 5;
@@ -427,7 +435,9 @@ public com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig getHumanAgentHando
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.HumanAgentHandoffConfigOrBuilder
       getHumanAgentHandoffConfigOrBuilder() {
-    return getHumanAgentHandoffConfig();
+    return humanAgentHandoffConfig_ == null
+        ? com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig.getDefaultInstance()
+        : humanAgentHandoffConfig_;
   }
 
   public static final int NOTIFICATION_CONFIG_FIELD_NUMBER = 6;
@@ -476,7 +486,9 @@ public com.google.cloud.dialogflow.v2.NotificationConfig getNotificationConfig()
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.NotificationConfigOrBuilder
       getNotificationConfigOrBuilder() {
-    return getNotificationConfig();
+    return notificationConfig_ == null
+        ? com.google.cloud.dialogflow.v2.NotificationConfig.getDefaultInstance()
+        : notificationConfig_;
   }
 
   public static final int LOGGING_CONFIG_FIELD_NUMBER = 7;
@@ -524,7 +536,9 @@ public com.google.cloud.dialogflow.v2.LoggingConfig getLoggingConfig() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.LoggingConfigOrBuilder getLoggingConfigOrBuilder() {
-    return getLoggingConfig();
+    return loggingConfig_ == null
+        ? com.google.cloud.dialogflow.v2.LoggingConfig.getDefaultInstance()
+        : loggingConfig_;
   }
 
   public static final int NEW_MESSAGE_EVENT_NOTIFICATION_CONFIG_FIELD_NUMBER = 8;
@@ -579,7 +593,9 @@ public com.google.cloud.dialogflow.v2.NotificationConfig getNewMessageEventNotif
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.NotificationConfigOrBuilder
       getNewMessageEventNotificationConfigOrBuilder() {
-    return getNewMessageEventNotificationConfig();
+    return newMessageEventNotificationConfig_ == null
+        ? com.google.cloud.dialogflow.v2.NotificationConfig.getDefaultInstance()
+        : newMessageEventNotificationConfig_;
   }
 
   public static final int STT_CONFIG_FIELD_NUMBER = 9;
@@ -627,11 +643,15 @@ public com.google.cloud.dialogflow.v2.SpeechToTextConfig getSttConfig() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.SpeechToTextConfigOrBuilder getSttConfigOrBuilder() {
-    return getSttConfig();
+    return sttConfig_ == null
+        ? com.google.cloud.dialogflow.v2.SpeechToTextConfig.getDefaultInstance()
+        : sttConfig_;
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 10;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -688,7 +708,9 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
   }
 
   public static final int TIME_ZONE_FIELD_NUMBER = 14;
-  private volatile java.lang.Object timeZone_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object timeZone_ = "";
   /**
    *
    *
@@ -741,7 +763,9 @@ public com.google.protobuf.ByteString getTimeZoneBytes() {
   }
 
   public static final int SECURITY_SETTINGS_FIELD_NUMBER = 13;
-  private volatile java.lang.Object securitySettings_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object securitySettings_ = "";
   /**
    *
    *
@@ -1161,70 +1185,57 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       displayName_ = "";
-
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-      if (updateTimeBuilder_ == null) {
-        updateTime_ = null;
-      } else {
-        updateTime_ = null;
+      updateTime_ = null;
+      if (updateTimeBuilder_ != null) {
+        updateTimeBuilder_.dispose();
         updateTimeBuilder_ = null;
       }
-      if (automatedAgentConfigBuilder_ == null) {
-        automatedAgentConfig_ = null;
-      } else {
-        automatedAgentConfig_ = null;
+      automatedAgentConfig_ = null;
+      if (automatedAgentConfigBuilder_ != null) {
+        automatedAgentConfigBuilder_.dispose();
         automatedAgentConfigBuilder_ = null;
       }
-      if (humanAgentAssistantConfigBuilder_ == null) {
-        humanAgentAssistantConfig_ = null;
-      } else {
-        humanAgentAssistantConfig_ = null;
+      humanAgentAssistantConfig_ = null;
+      if (humanAgentAssistantConfigBuilder_ != null) {
+        humanAgentAssistantConfigBuilder_.dispose();
         humanAgentAssistantConfigBuilder_ = null;
       }
-      if (humanAgentHandoffConfigBuilder_ == null) {
-        humanAgentHandoffConfig_ = null;
-      } else {
-        humanAgentHandoffConfig_ = null;
+      humanAgentHandoffConfig_ = null;
+      if (humanAgentHandoffConfigBuilder_ != null) {
+        humanAgentHandoffConfigBuilder_.dispose();
         humanAgentHandoffConfigBuilder_ = null;
       }
-      if (notificationConfigBuilder_ == null) {
-        notificationConfig_ = null;
-      } else {
-        notificationConfig_ = null;
+      notificationConfig_ = null;
+      if (notificationConfigBuilder_ != null) {
+        notificationConfigBuilder_.dispose();
         notificationConfigBuilder_ = null;
       }
-      if (loggingConfigBuilder_ == null) {
-        loggingConfig_ = null;
-      } else {
-        loggingConfig_ = null;
+      loggingConfig_ = null;
+      if (loggingConfigBuilder_ != null) {
+        loggingConfigBuilder_.dispose();
         loggingConfigBuilder_ = null;
       }
-      if (newMessageEventNotificationConfigBuilder_ == null) {
-        newMessageEventNotificationConfig_ = null;
-      } else {
-        newMessageEventNotificationConfig_ = null;
+      newMessageEventNotificationConfig_ = null;
+      if (newMessageEventNotificationConfigBuilder_ != null) {
+        newMessageEventNotificationConfigBuilder_.dispose();
         newMessageEventNotificationConfigBuilder_ = null;
       }
-      if (sttConfigBuilder_ == null) {
-        sttConfig_ = null;
-      } else {
-        sttConfig_ = null;
+      sttConfig_ = null;
+      if (sttConfigBuilder_ != null) {
+        sttConfigBuilder_.dispose();
         sttConfigBuilder_ = null;
       }
       languageCode_ = "";
-
       timeZone_ = "";
-
       securitySettings_ = "";
-
       return this;
     }
 
@@ -1252,59 +1263,73 @@ public com.google.cloud.dialogflow.v2.ConversationProfile build() {
     public com.google.cloud.dialogflow.v2.ConversationProfile buildPartial() {
       com.google.cloud.dialogflow.v2.ConversationProfile result =
           new com.google.cloud.dialogflow.v2.ConversationProfile(this);
-      result.name_ = name_;
-      result.displayName_ = displayName_;
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (updateTimeBuilder_ == null) {
-        result.updateTime_ = updateTime_;
-      } else {
-        result.updateTime_ = updateTimeBuilder_.build();
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ConversationProfile result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
       }
-      if (automatedAgentConfigBuilder_ == null) {
-        result.automatedAgentConfig_ = automatedAgentConfig_;
-      } else {
-        result.automatedAgentConfig_ = automatedAgentConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.displayName_ = displayName_;
       }
-      if (humanAgentAssistantConfigBuilder_ == null) {
-        result.humanAgentAssistantConfig_ = humanAgentAssistantConfig_;
-      } else {
-        result.humanAgentAssistantConfig_ = humanAgentAssistantConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
       }
-      if (humanAgentHandoffConfigBuilder_ == null) {
-        result.humanAgentHandoffConfig_ = humanAgentHandoffConfig_;
-      } else {
-        result.humanAgentHandoffConfig_ = humanAgentHandoffConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
       }
-      if (notificationConfigBuilder_ == null) {
-        result.notificationConfig_ = notificationConfig_;
-      } else {
-        result.notificationConfig_ = notificationConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.automatedAgentConfig_ =
+            automatedAgentConfigBuilder_ == null
+                ? automatedAgentConfig_
+                : automatedAgentConfigBuilder_.build();
       }
-      if (loggingConfigBuilder_ == null) {
-        result.loggingConfig_ = loggingConfig_;
-      } else {
-        result.loggingConfig_ = loggingConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.humanAgentAssistantConfig_ =
+            humanAgentAssistantConfigBuilder_ == null
+                ? humanAgentAssistantConfig_
+                : humanAgentAssistantConfigBuilder_.build();
       }
-      if (newMessageEventNotificationConfigBuilder_ == null) {
-        result.newMessageEventNotificationConfig_ = newMessageEventNotificationConfig_;
-      } else {
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.humanAgentHandoffConfig_ =
+            humanAgentHandoffConfigBuilder_ == null
+                ? humanAgentHandoffConfig_
+                : humanAgentHandoffConfigBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.notificationConfig_ =
+            notificationConfigBuilder_ == null
+                ? notificationConfig_
+                : notificationConfigBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000100) != 0)) {
+        result.loggingConfig_ =
+            loggingConfigBuilder_ == null ? loggingConfig_ : loggingConfigBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000200) != 0)) {
         result.newMessageEventNotificationConfig_ =
-            newMessageEventNotificationConfigBuilder_.build();
+            newMessageEventNotificationConfigBuilder_ == null
+                ? newMessageEventNotificationConfig_
+                : newMessageEventNotificationConfigBuilder_.build();
       }
-      if (sttConfigBuilder_ == null) {
-        result.sttConfig_ = sttConfig_;
-      } else {
-        result.sttConfig_ = sttConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000400) != 0)) {
+        result.sttConfig_ = sttConfigBuilder_ == null ? sttConfig_ : sttConfigBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000800) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00001000) != 0)) {
+        result.timeZone_ = timeZone_;
+      }
+      if (((from_bitField0_ & 0x00002000) != 0)) {
+        result.securitySettings_ = securitySettings_;
       }
-      result.languageCode_ = languageCode_;
-      result.timeZone_ = timeZone_;
-      result.securitySettings_ = securitySettings_;
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -1355,10 +1380,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ConversationProfile othe
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasCreateTime()) {
@@ -1390,14 +1417,17 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ConversationProfile othe
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000800;
         onChanged();
       }
       if (!other.getTimeZone().isEmpty()) {
         timeZone_ = other.timeZone_;
+        bitField0_ |= 0x00001000;
         onChanged();
       }
       if (!other.getSecuritySettings().isEmpty()) {
         securitySettings_ = other.securitySettings_;
+        bitField0_ |= 0x00002000;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -1429,47 +1459,47 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 displayName_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(
                     getAutomatedAgentConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(
                     getHumanAgentAssistantConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 34
             case 42:
               {
                 input.readMessage(
                     getHumanAgentHandoffConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 42
             case 50:
               {
                 input.readMessage(
                     getNotificationConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 50
             case 58:
               {
                 input.readMessage(getLoggingConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000100;
                 break;
               } // case 58
             case 66:
@@ -1477,43 +1507,43 @@ public Builder mergeFrom(
                 input.readMessage(
                     getNewMessageEventNotificationConfigFieldBuilder().getBuilder(),
                     extensionRegistry);
-
+                bitField0_ |= 0x00000200;
                 break;
               } // case 66
             case 74:
               {
                 input.readMessage(getSttConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000400;
                 break;
               } // case 74
             case 82:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000800;
                 break;
               } // case 82
             case 90:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 90
             case 98:
               {
                 input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 98
             case 106:
               {
                 securitySettings_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00002000;
                 break;
               } // case 106
             case 114:
               {
                 timeZone_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00001000;
                 break;
               } // case 114
             default:
@@ -1533,6 +1563,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -1600,8 +1632,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1619,8 +1651,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1643,8 +1675,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1710,8 +1742,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1727,8 +1759,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
-
       displayName_ = getDefaultInstance().getDisplayName();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1749,8 +1781,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1775,7 +1807,7 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1816,11 +1848,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1837,11 +1869,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1857,17 +1889,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
         } else {
           createTime_ = value;
         }
-        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1882,14 +1915,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * </code>
      */
     public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1904,7 +1936,7 @@ public Builder clearCreateTime() {
      * </code>
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
@@ -1976,7 +2008,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
      * @return Whether the updateTime field is set.
      */
     public boolean hasUpdateTime() {
-      return updateTimeBuilder_ != null || updateTime_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -2017,11 +2049,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         updateTime_ = value;
-        onChanged();
       } else {
         updateTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -2038,11 +2070,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
     public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (updateTimeBuilder_ == null) {
         updateTime_ = builderForValue.build();
-        onChanged();
       } else {
         updateTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -2058,17 +2090,18 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       if (updateTimeBuilder_ == null) {
-        if (updateTime_ != null) {
-          updateTime_ =
-              com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && updateTime_ != null
+            && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getUpdateTimeBuilder().mergeFrom(value);
         } else {
           updateTime_ = value;
         }
-        onChanged();
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -2083,14 +2116,13 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
      * </code>
      */
     public Builder clearUpdateTime() {
-      if (updateTimeBuilder_ == null) {
-        updateTime_ = null;
-        onChanged();
-      } else {
-        updateTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      updateTime_ = null;
+      if (updateTimeBuilder_ != null) {
+        updateTimeBuilder_.dispose();
         updateTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2105,7 +2137,7 @@ public Builder clearUpdateTime() {
      * </code>
      */
     public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getUpdateTimeFieldBuilder().getBuilder();
     }
@@ -2175,7 +2207,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
      * @return Whether the automatedAgentConfig field is set.
      */
     public boolean hasAutomatedAgentConfig() {
-      return automatedAgentConfigBuilder_ != null || automatedAgentConfig_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -2213,11 +2245,11 @@ public Builder setAutomatedAgentConfig(
           throw new NullPointerException();
         }
         automatedAgentConfig_ = value;
-        onChanged();
       } else {
         automatedAgentConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2233,11 +2265,11 @@ public Builder setAutomatedAgentConfig(
         com.google.cloud.dialogflow.v2.AutomatedAgentConfig.Builder builderForValue) {
       if (automatedAgentConfigBuilder_ == null) {
         automatedAgentConfig_ = builderForValue.build();
-        onChanged();
       } else {
         automatedAgentConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2252,19 +2284,19 @@ public Builder setAutomatedAgentConfig(
     public Builder mergeAutomatedAgentConfig(
         com.google.cloud.dialogflow.v2.AutomatedAgentConfig value) {
       if (automatedAgentConfigBuilder_ == null) {
-        if (automatedAgentConfig_ != null) {
-          automatedAgentConfig_ =
-              com.google.cloud.dialogflow.v2.AutomatedAgentConfig.newBuilder(automatedAgentConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && automatedAgentConfig_ != null
+            && automatedAgentConfig_
+                != com.google.cloud.dialogflow.v2.AutomatedAgentConfig.getDefaultInstance()) {
+          getAutomatedAgentConfigBuilder().mergeFrom(value);
         } else {
           automatedAgentConfig_ = value;
         }
-        onChanged();
       } else {
         automatedAgentConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2277,14 +2309,13 @@ public Builder mergeAutomatedAgentConfig(
      * <code>.google.cloud.dialogflow.v2.AutomatedAgentConfig automated_agent_config = 3;</code>
      */
     public Builder clearAutomatedAgentConfig() {
-      if (automatedAgentConfigBuilder_ == null) {
-        automatedAgentConfig_ = null;
-        onChanged();
-      } else {
-        automatedAgentConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      automatedAgentConfig_ = null;
+      if (automatedAgentConfigBuilder_ != null) {
+        automatedAgentConfigBuilder_.dispose();
         automatedAgentConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2298,7 +2329,7 @@ public Builder clearAutomatedAgentConfig() {
      */
     public com.google.cloud.dialogflow.v2.AutomatedAgentConfig.Builder
         getAutomatedAgentConfigBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getAutomatedAgentConfigFieldBuilder().getBuilder();
     }
@@ -2366,7 +2397,7 @@ public Builder clearAutomatedAgentConfig() {
      * @return Whether the humanAgentAssistantConfig field is set.
      */
     public boolean hasHumanAgentAssistantConfig() {
-      return humanAgentAssistantConfigBuilder_ != null || humanAgentAssistantConfig_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -2406,11 +2437,11 @@ public Builder setHumanAgentAssistantConfig(
           throw new NullPointerException();
         }
         humanAgentAssistantConfig_ = value;
-        onChanged();
       } else {
         humanAgentAssistantConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2427,11 +2458,11 @@ public Builder setHumanAgentAssistantConfig(
         com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.Builder builderForValue) {
       if (humanAgentAssistantConfigBuilder_ == null) {
         humanAgentAssistantConfig_ = builderForValue.build();
-        onChanged();
       } else {
         humanAgentAssistantConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2447,20 +2478,19 @@ public Builder setHumanAgentAssistantConfig(
     public Builder mergeHumanAgentAssistantConfig(
         com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig value) {
       if (humanAgentAssistantConfigBuilder_ == null) {
-        if (humanAgentAssistantConfig_ != null) {
-          humanAgentAssistantConfig_ =
-              com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.newBuilder(
-                      humanAgentAssistantConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && humanAgentAssistantConfig_ != null
+            && humanAgentAssistantConfig_
+                != com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.getDefaultInstance()) {
+          getHumanAgentAssistantConfigBuilder().mergeFrom(value);
         } else {
           humanAgentAssistantConfig_ = value;
         }
-        onChanged();
       } else {
         humanAgentAssistantConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2474,14 +2504,13 @@ public Builder mergeHumanAgentAssistantConfig(
      * </code>
      */
     public Builder clearHumanAgentAssistantConfig() {
-      if (humanAgentAssistantConfigBuilder_ == null) {
-        humanAgentAssistantConfig_ = null;
-        onChanged();
-      } else {
-        humanAgentAssistantConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      humanAgentAssistantConfig_ = null;
+      if (humanAgentAssistantConfigBuilder_ != null) {
+        humanAgentAssistantConfigBuilder_.dispose();
         humanAgentAssistantConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2496,7 +2525,7 @@ public Builder clearHumanAgentAssistantConfig() {
      */
     public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.Builder
         getHumanAgentAssistantConfigBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getHumanAgentAssistantConfigFieldBuilder().getBuilder();
     }
@@ -2568,7 +2597,7 @@ public Builder clearHumanAgentAssistantConfig() {
      * @return Whether the humanAgentHandoffConfig field is set.
      */
     public boolean hasHumanAgentHandoffConfig() {
-      return humanAgentHandoffConfigBuilder_ != null || humanAgentHandoffConfig_ != null;
+      return ((bitField0_ & 0x00000040) != 0);
     }
     /**
      *
@@ -2612,11 +2641,11 @@ public Builder setHumanAgentHandoffConfig(
           throw new NullPointerException();
         }
         humanAgentHandoffConfig_ = value;
-        onChanged();
       } else {
         humanAgentHandoffConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2635,11 +2664,11 @@ public Builder setHumanAgentHandoffConfig(
         com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig.Builder builderForValue) {
       if (humanAgentHandoffConfigBuilder_ == null) {
         humanAgentHandoffConfig_ = builderForValue.build();
-        onChanged();
       } else {
         humanAgentHandoffConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2657,20 +2686,19 @@ public Builder setHumanAgentHandoffConfig(
     public Builder mergeHumanAgentHandoffConfig(
         com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig value) {
       if (humanAgentHandoffConfigBuilder_ == null) {
-        if (humanAgentHandoffConfig_ != null) {
-          humanAgentHandoffConfig_ =
-              com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig.newBuilder(
-                      humanAgentHandoffConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000040) != 0)
+            && humanAgentHandoffConfig_ != null
+            && humanAgentHandoffConfig_
+                != com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig.getDefaultInstance()) {
+          getHumanAgentHandoffConfigBuilder().mergeFrom(value);
         } else {
           humanAgentHandoffConfig_ = value;
         }
-        onChanged();
       } else {
         humanAgentHandoffConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2686,14 +2714,13 @@ public Builder mergeHumanAgentHandoffConfig(
      * </code>
      */
     public Builder clearHumanAgentHandoffConfig() {
-      if (humanAgentHandoffConfigBuilder_ == null) {
-        humanAgentHandoffConfig_ = null;
-        onChanged();
-      } else {
-        humanAgentHandoffConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      humanAgentHandoffConfig_ = null;
+      if (humanAgentHandoffConfigBuilder_ != null) {
+        humanAgentHandoffConfigBuilder_.dispose();
         humanAgentHandoffConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2710,7 +2737,7 @@ public Builder clearHumanAgentHandoffConfig() {
      */
     public com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig.Builder
         getHumanAgentHandoffConfigBuilder() {
-
+      bitField0_ |= 0x00000040;
       onChanged();
       return getHumanAgentHandoffConfigFieldBuilder().getBuilder();
     }
@@ -2783,7 +2810,7 @@ public Builder clearHumanAgentHandoffConfig() {
      * @return Whether the notificationConfig field is set.
      */
     public boolean hasNotificationConfig() {
-      return notificationConfigBuilder_ != null || notificationConfig_ != null;
+      return ((bitField0_ & 0x00000080) != 0);
     }
     /**
      *
@@ -2820,11 +2847,11 @@ public Builder setNotificationConfig(com.google.cloud.dialogflow.v2.Notification
           throw new NullPointerException();
         }
         notificationConfig_ = value;
-        onChanged();
       } else {
         notificationConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2840,11 +2867,11 @@ public Builder setNotificationConfig(
         com.google.cloud.dialogflow.v2.NotificationConfig.Builder builderForValue) {
       if (notificationConfigBuilder_ == null) {
         notificationConfig_ = builderForValue.build();
-        onChanged();
       } else {
         notificationConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2859,19 +2886,19 @@ public Builder setNotificationConfig(
     public Builder mergeNotificationConfig(
         com.google.cloud.dialogflow.v2.NotificationConfig value) {
       if (notificationConfigBuilder_ == null) {
-        if (notificationConfig_ != null) {
-          notificationConfig_ =
-              com.google.cloud.dialogflow.v2.NotificationConfig.newBuilder(notificationConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000080) != 0)
+            && notificationConfig_ != null
+            && notificationConfig_
+                != com.google.cloud.dialogflow.v2.NotificationConfig.getDefaultInstance()) {
+          getNotificationConfigBuilder().mergeFrom(value);
         } else {
           notificationConfig_ = value;
         }
-        onChanged();
       } else {
         notificationConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2884,14 +2911,13 @@ public Builder mergeNotificationConfig(
      * <code>.google.cloud.dialogflow.v2.NotificationConfig notification_config = 6;</code>
      */
     public Builder clearNotificationConfig() {
-      if (notificationConfigBuilder_ == null) {
-        notificationConfig_ = null;
-        onChanged();
-      } else {
-        notificationConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000080);
+      notificationConfig_ = null;
+      if (notificationConfigBuilder_ != null) {
+        notificationConfigBuilder_.dispose();
         notificationConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2905,7 +2931,7 @@ public Builder clearNotificationConfig() {
      */
     public com.google.cloud.dialogflow.v2.NotificationConfig.Builder
         getNotificationConfigBuilder() {
-
+      bitField0_ |= 0x00000080;
       onChanged();
       return getNotificationConfigFieldBuilder().getBuilder();
     }
@@ -2972,7 +2998,7 @@ public Builder clearNotificationConfig() {
      * @return Whether the loggingConfig field is set.
      */
     public boolean hasLoggingConfig() {
-      return loggingConfigBuilder_ != null || loggingConfig_ != null;
+      return ((bitField0_ & 0x00000100) != 0);
     }
     /**
      *
@@ -3009,11 +3035,11 @@ public Builder setLoggingConfig(com.google.cloud.dialogflow.v2.LoggingConfig val
           throw new NullPointerException();
         }
         loggingConfig_ = value;
-        onChanged();
       } else {
         loggingConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -3029,11 +3055,11 @@ public Builder setLoggingConfig(
         com.google.cloud.dialogflow.v2.LoggingConfig.Builder builderForValue) {
       if (loggingConfigBuilder_ == null) {
         loggingConfig_ = builderForValue.build();
-        onChanged();
       } else {
         loggingConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -3047,19 +3073,19 @@ public Builder setLoggingConfig(
      */
     public Builder mergeLoggingConfig(com.google.cloud.dialogflow.v2.LoggingConfig value) {
       if (loggingConfigBuilder_ == null) {
-        if (loggingConfig_ != null) {
-          loggingConfig_ =
-              com.google.cloud.dialogflow.v2.LoggingConfig.newBuilder(loggingConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000100) != 0)
+            && loggingConfig_ != null
+            && loggingConfig_
+                != com.google.cloud.dialogflow.v2.LoggingConfig.getDefaultInstance()) {
+          getLoggingConfigBuilder().mergeFrom(value);
         } else {
           loggingConfig_ = value;
         }
-        onChanged();
       } else {
         loggingConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -3072,14 +3098,13 @@ public Builder mergeLoggingConfig(com.google.cloud.dialogflow.v2.LoggingConfig v
      * <code>.google.cloud.dialogflow.v2.LoggingConfig logging_config = 7;</code>
      */
     public Builder clearLoggingConfig() {
-      if (loggingConfigBuilder_ == null) {
-        loggingConfig_ = null;
-        onChanged();
-      } else {
-        loggingConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000100);
+      loggingConfig_ = null;
+      if (loggingConfigBuilder_ != null) {
+        loggingConfigBuilder_.dispose();
         loggingConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3092,7 +3117,7 @@ public Builder clearLoggingConfig() {
      * <code>.google.cloud.dialogflow.v2.LoggingConfig logging_config = 7;</code>
      */
     public com.google.cloud.dialogflow.v2.LoggingConfig.Builder getLoggingConfigBuilder() {
-
+      bitField0_ |= 0x00000100;
       onChanged();
       return getLoggingConfigFieldBuilder().getBuilder();
     }
@@ -3161,8 +3186,7 @@ public com.google.cloud.dialogflow.v2.LoggingConfigOrBuilder getLoggingConfigOrB
      * @return Whether the newMessageEventNotificationConfig field is set.
      */
     public boolean hasNewMessageEventNotificationConfig() {
-      return newMessageEventNotificationConfigBuilder_ != null
-          || newMessageEventNotificationConfig_ != null;
+      return ((bitField0_ & 0x00000200) != 0);
     }
     /**
      *
@@ -3207,11 +3231,11 @@ public Builder setNewMessageEventNotificationConfig(
           throw new NullPointerException();
         }
         newMessageEventNotificationConfig_ = value;
-        onChanged();
       } else {
         newMessageEventNotificationConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -3230,11 +3254,11 @@ public Builder setNewMessageEventNotificationConfig(
         com.google.cloud.dialogflow.v2.NotificationConfig.Builder builderForValue) {
       if (newMessageEventNotificationConfigBuilder_ == null) {
         newMessageEventNotificationConfig_ = builderForValue.build();
-        onChanged();
       } else {
         newMessageEventNotificationConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -3252,20 +3276,19 @@ public Builder setNewMessageEventNotificationConfig(
     public Builder mergeNewMessageEventNotificationConfig(
         com.google.cloud.dialogflow.v2.NotificationConfig value) {
       if (newMessageEventNotificationConfigBuilder_ == null) {
-        if (newMessageEventNotificationConfig_ != null) {
-          newMessageEventNotificationConfig_ =
-              com.google.cloud.dialogflow.v2.NotificationConfig.newBuilder(
-                      newMessageEventNotificationConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000200) != 0)
+            && newMessageEventNotificationConfig_ != null
+            && newMessageEventNotificationConfig_
+                != com.google.cloud.dialogflow.v2.NotificationConfig.getDefaultInstance()) {
+          getNewMessageEventNotificationConfigBuilder().mergeFrom(value);
         } else {
           newMessageEventNotificationConfig_ = value;
         }
-        onChanged();
       } else {
         newMessageEventNotificationConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -3281,14 +3304,13 @@ public Builder mergeNewMessageEventNotificationConfig(
      * </code>
      */
     public Builder clearNewMessageEventNotificationConfig() {
-      if (newMessageEventNotificationConfigBuilder_ == null) {
-        newMessageEventNotificationConfig_ = null;
-        onChanged();
-      } else {
-        newMessageEventNotificationConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000200);
+      newMessageEventNotificationConfig_ = null;
+      if (newMessageEventNotificationConfigBuilder_ != null) {
+        newMessageEventNotificationConfigBuilder_.dispose();
         newMessageEventNotificationConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3305,7 +3327,7 @@ public Builder clearNewMessageEventNotificationConfig() {
      */
     public com.google.cloud.dialogflow.v2.NotificationConfig.Builder
         getNewMessageEventNotificationConfigBuilder() {
-
+      bitField0_ |= 0x00000200;
       onChanged();
       return getNewMessageEventNotificationConfigFieldBuilder().getBuilder();
     }
@@ -3378,7 +3400,7 @@ public Builder clearNewMessageEventNotificationConfig() {
      * @return Whether the sttConfig field is set.
      */
     public boolean hasSttConfig() {
-      return sttConfigBuilder_ != null || sttConfig_ != null;
+      return ((bitField0_ & 0x00000400) != 0);
     }
     /**
      *
@@ -3415,11 +3437,11 @@ public Builder setSttConfig(com.google.cloud.dialogflow.v2.SpeechToTextConfig va
           throw new NullPointerException();
         }
         sttConfig_ = value;
-        onChanged();
       } else {
         sttConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000400;
+      onChanged();
       return this;
     }
     /**
@@ -3435,11 +3457,11 @@ public Builder setSttConfig(
         com.google.cloud.dialogflow.v2.SpeechToTextConfig.Builder builderForValue) {
       if (sttConfigBuilder_ == null) {
         sttConfig_ = builderForValue.build();
-        onChanged();
       } else {
         sttConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000400;
+      onChanged();
       return this;
     }
     /**
@@ -3453,19 +3475,19 @@ public Builder setSttConfig(
      */
     public Builder mergeSttConfig(com.google.cloud.dialogflow.v2.SpeechToTextConfig value) {
       if (sttConfigBuilder_ == null) {
-        if (sttConfig_ != null) {
-          sttConfig_ =
-              com.google.cloud.dialogflow.v2.SpeechToTextConfig.newBuilder(sttConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000400) != 0)
+            && sttConfig_ != null
+            && sttConfig_
+                != com.google.cloud.dialogflow.v2.SpeechToTextConfig.getDefaultInstance()) {
+          getSttConfigBuilder().mergeFrom(value);
         } else {
           sttConfig_ = value;
         }
-        onChanged();
       } else {
         sttConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000400;
+      onChanged();
       return this;
     }
     /**
@@ -3478,14 +3500,13 @@ public Builder mergeSttConfig(com.google.cloud.dialogflow.v2.SpeechToTextConfig
      * <code>.google.cloud.dialogflow.v2.SpeechToTextConfig stt_config = 9;</code>
      */
     public Builder clearSttConfig() {
-      if (sttConfigBuilder_ == null) {
-        sttConfig_ = null;
-        onChanged();
-      } else {
-        sttConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000400);
+      sttConfig_ = null;
+      if (sttConfigBuilder_ != null) {
+        sttConfigBuilder_.dispose();
         sttConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3498,7 +3519,7 @@ public Builder clearSttConfig() {
      * <code>.google.cloud.dialogflow.v2.SpeechToTextConfig stt_config = 9;</code>
      */
     public com.google.cloud.dialogflow.v2.SpeechToTextConfig.Builder getSttConfigBuilder() {
-
+      bitField0_ |= 0x00000400;
       onChanged();
       return getSttConfigFieldBuilder().getBuilder();
     }
@@ -3619,8 +3640,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000800;
       onChanged();
       return this;
     }
@@ -3640,8 +3661,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000800);
       onChanged();
       return this;
     }
@@ -3666,8 +3687,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000800;
       onChanged();
       return this;
     }
@@ -3739,8 +3760,8 @@ public Builder setTimeZone(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       timeZone_ = value;
+      bitField0_ |= 0x00001000;
       onChanged();
       return this;
     }
@@ -3758,8 +3779,8 @@ public Builder setTimeZone(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTimeZone() {
-
       timeZone_ = getDefaultInstance().getTimeZone();
+      bitField0_ = (bitField0_ & ~0x00001000);
       onChanged();
       return this;
     }
@@ -3782,8 +3803,8 @@ public Builder setTimeZoneBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       timeZone_ = value;
+      bitField0_ |= 0x00001000;
       onChanged();
       return this;
     }
@@ -3855,8 +3876,8 @@ public Builder setSecuritySettings(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       securitySettings_ = value;
+      bitField0_ |= 0x00002000;
       onChanged();
       return this;
     }
@@ -3874,8 +3895,8 @@ public Builder setSecuritySettings(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSecuritySettings() {
-
       securitySettings_ = getDefaultInstance().getSecuritySettings();
+      bitField0_ = (bitField0_ & ~0x00002000);
       onChanged();
       return this;
     }
@@ -3898,8 +3919,8 @@ public Builder setSecuritySettingsBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       securitySettings_ = value;
+      bitField0_ |= 0x00002000;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationProfileProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationProfileProto.java
index 8fb513f9e49c..7fe6b85f6394 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationProfileProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationProfileProto.java
@@ -391,15 +391,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "gOperationMetadata\032x\312A\031dialogflow.google"
           + "apis.com\322AYhttps://www.googleapis.com/au"
           + "th/cloud-platform,https://www.googleapis"
-          + ".com/auth/dialogflowB\246\002\n\036com.google.clou"
+          + ".com/auth/dialogflowB\240\002\n\036com.google.clou"
           + "d.dialogflow.v2B\030ConversationProfileProt"
-          + "oP\001ZDgoogle.golang.org/genproto/googleap"
-          + "is/cloud/dialogflow/v2;dialogflow\370\001\001\242\002\002D"
-          + "F\252\002\032Google.Cloud.Dialogflow.V2\352A|\n,dialo"
-          + "gflow.googleapis.com/CXSecuritySettings\022"
-          + "Lprojects/{project}/locations/{location}"
-          + "/securitySettings/{security_settings}b\006p"
-          + "roto3"
+          + "oP\001Z>cloud.google.com/go/dialogflow/apiv"
+          + "2/dialogflowpb;dialogflowpb\370\001\001\242\002\002DF\252\002\032Go"
+          + "ogle.Cloud.Dialogflow.V2\352A|\n,dialogflow."
+          + "googleapis.com/CXSecuritySettings\022Lproje"
+          + "cts/{project}/locations/{location}/secur"
+          + "itySettings/{security_settings}b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationProto.java
index 76950c9c5b6f..9aa8938159ab 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationProto.java
@@ -63,6 +63,22 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
       internal_static_google_cloud_dialogflow_v2_ConversationPhoneNumber_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_cloud_dialogflow_v2_ConversationPhoneNumber_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryRequest_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_Summary_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_Summary_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_Summary_TextSectionsEntry_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_Summary_TextSectionsEntry_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     return descriptor;
@@ -123,46 +139,72 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "agesResponse\0225\n\010messages\030\001 \003(\0132#.google."
           + "cloud.dialogflow.v2.Message\022\027\n\017next_page"
           + "_token\030\002 \001(\t\"4\n\027ConversationPhoneNumber\022"
-          + "\031\n\014phone_number\030\003 \001(\tB\003\340A\0032\335\n\n\rConversat"
-          + "ions\022\214\002\n\022CreateConversation\0225.google.clo"
-          + "ud.dialogflow.v2.CreateConversationReque"
-          + "st\032(.google.cloud.dialogflow.v2.Conversa"
-          + "tion\"\224\001\202\323\344\223\002x\"%/v2/{parent=projects/*}/c"
-          + "onversations:\014conversationZA\"1/v2/{paren"
-          + "t=projects/*/locations/*}/conversations:"
-          + "\014conversation\332A\023parent,conversation\022\355\001\n\021"
-          + "ListConversations\0224.google.cloud.dialogf"
-          + "low.v2.ListConversationsRequest\0325.google"
-          + ".cloud.dialogflow.v2.ListConversationsRe"
-          + "sponse\"k\202\323\344\223\002\\\022%/v2/{parent=projects/*}/"
-          + "conversationsZ3\0221/v2/{parent=projects/*/"
-          + "locations/*}/conversations\332A\006parent\022\332\001\n\017"
-          + "GetConversation\0222.google.cloud.dialogflo"
-          + "w.v2.GetConversationRequest\032(.google.clo"
-          + "ud.dialogflow.v2.Conversation\"i\202\323\344\223\002\\\022%/"
-          + "v2/{name=projects/*/conversations/*}Z3\0221"
-          + "/v2/{name=projects/*/locations/*/convers"
-          + "ations/*}\332A\004name\022\375\001\n\024CompleteConversatio"
-          + "n\0227.google.cloud.dialogflow.v2.CompleteC"
-          + "onversationRequest\032(.google.cloud.dialog"
-          + "flow.v2.Conversation\"\201\001\202\323\344\223\002t\"./v2/{name"
-          + "=projects/*/conversations/*}:complete:\001*"
-          + "Z?\":/v2/{name=projects/*/locations/*/con"
-          + "versations/*}:complete:\001*\332A\004name\022\365\001\n\014Lis"
-          + "tMessages\022/.google.cloud.dialogflow.v2.L"
-          + "istMessagesRequest\0320.google.cloud.dialog"
-          + "flow.v2.ListMessagesResponse\"\201\001\202\323\344\223\002r\0220/"
-          + "v2/{parent=projects/*/conversations/*}/m"
-          + "essagesZ>\022</v2/{parent=projects/*/locati"
-          + "ons/*/conversations/*}/messages\332A\006parent"
-          + "\032x\312A\031dialogflow.googleapis.com\322AYhttps:/"
-          + "/www.googleapis.com/auth/cloud-platform,"
-          + "https://www.googleapis.com/auth/dialogfl"
-          + "owB\240\001\n\036com.google.cloud.dialogflow.v2B\021C"
-          + "onversationProtoP\001ZDgoogle.golang.org/ge"
-          + "nproto/googleapis/cloud/dialogflow/v2;di"
-          + "alogflow\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dialogfl"
-          + "ow.V2b\006proto3"
+          + "\031\n\014phone_number\030\003 \001(\tB\003\340A\003\"\277\001\n!SuggestCo"
+          + "nversationSummaryRequest\022D\n\014conversation"
+          + "\030\001 \001(\tB.\340A\002\372A(\n&dialogflow.googleapis.co"
+          + "m/Conversation\022>\n\016latest_message\030\003 \001(\tB&"
+          + "\372A#\n!dialogflow.googleapis.com/Message\022\024"
+          + "\n\014context_size\030\004 \001(\005\"\327\003\n\"SuggestConversa"
+          + "tionSummaryResponse\022W\n\007summary\030\001 \001(\0132F.g"
+          + "oogle.cloud.dialogflow.v2.SuggestConvers"
+          + "ationSummaryResponse.Summary\022>\n\016latest_m"
+          + "essage\030\002 \001(\tB&\372A#\n!dialogflow.googleapis"
+          + ".com/Message\022\024\n\014context_size\030\003 \001(\005\032\201\002\n\007S"
+          + "ummary\022\014\n\004text\030\001 \001(\t\022o\n\rtext_sections\030\004 "
+          + "\003(\0132X.google.cloud.dialogflow.v2.Suggest"
+          + "ConversationSummaryResponse.Summary.Text"
+          + "SectionsEntry\022B\n\ranswer_record\030\003 \001(\tB+\372A"
+          + "(\n&dialogflow.googleapis.com/AnswerRecor"
+          + "d\0323\n\021TextSectionsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005v"
+          + "alue\030\002 \001(\t:\0028\0012\324\r\n\rConversations\022\214\002\n\022Cre"
+          + "ateConversation\0225.google.cloud.dialogflo"
+          + "w.v2.CreateConversationRequest\032(.google."
+          + "cloud.dialogflow.v2.Conversation\"\224\001\202\323\344\223\002"
+          + "x\"%/v2/{parent=projects/*}/conversations"
+          + ":\014conversationZA\"1/v2/{parent=projects/*"
+          + "/locations/*}/conversations:\014conversatio"
+          + "n\332A\023parent,conversation\022\355\001\n\021ListConversa"
+          + "tions\0224.google.cloud.dialogflow.v2.ListC"
+          + "onversationsRequest\0325.google.cloud.dialo"
+          + "gflow.v2.ListConversationsResponse\"k\202\323\344\223"
+          + "\002\\\022%/v2/{parent=projects/*}/conversation"
+          + "sZ3\0221/v2/{parent=projects/*/locations/*}"
+          + "/conversations\332A\006parent\022\332\001\n\017GetConversat"
+          + "ion\0222.google.cloud.dialogflow.v2.GetConv"
+          + "ersationRequest\032(.google.cloud.dialogflo"
+          + "w.v2.Conversation\"i\202\323\344\223\002\\\022%/v2/{name=pro"
+          + "jects/*/conversations/*}Z3\0221/v2/{name=pr"
+          + "ojects/*/locations/*/conversations/*}\332A\004"
+          + "name\022\375\001\n\024CompleteConversation\0227.google.c"
+          + "loud.dialogflow.v2.CompleteConversationR"
+          + "equest\032(.google.cloud.dialogflow.v2.Conv"
+          + "ersation\"\201\001\202\323\344\223\002t\"./v2/{name=projects/*/"
+          + "conversations/*}:complete:\001*Z?\":/v2/{nam"
+          + "e=projects/*/locations/*/conversations/*"
+          + "}:complete:\001*\332A\004name\022\365\001\n\014ListMessages\022/."
+          + "google.cloud.dialogflow.v2.ListMessagesR"
+          + "equest\0320.google.cloud.dialogflow.v2.List"
+          + "MessagesResponse\"\201\001\202\323\344\223\002r\0220/v2/{parent=p"
+          + "rojects/*/conversations/*}/messagesZ>\022</"
+          + "v2/{parent=projects/*/locations/*/conver"
+          + "sations/*}/messages\332A\006parent\022\364\002\n\032Suggest"
+          + "ConversationSummary\022=.google.cloud.dialo"
+          + "gflow.v2.SuggestConversationSummaryReque"
+          + "st\032>.google.cloud.dialogflow.v2.SuggestC"
+          + "onversationSummaryResponse\"\326\001\202\323\344\223\002\300\001\"T/v"
+          + "2/{conversation=projects/*/conversations"
+          + "/*}/suggestions:suggestConversationSumma"
+          + "ry:\001*Ze\"`/v2/{conversation=projects/*/lo"
+          + "cations/*/conversations/*}/suggestions:s"
+          + "uggestConversationSummary:\001*\332A\014conversat"
+          + "ion\032x\312A\031dialogflow.googleapis.com\322AYhttp"
+          + "s://www.googleapis.com/auth/cloud-platfo"
+          + "rm,https://www.googleapis.com/auth/dialo"
+          + "gflowB\232\001\n\036com.google.cloud.dialogflow.v2"
+          + "B\021ConversationProtoP\001Z>cloud.google.com/"
+          + "go/dialogflow/apiv2/dialogflowpb;dialogf"
+          + "lowpb\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dialogflow."
+          + "V2b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -253,6 +295,42 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
             new java.lang.String[] {
               "PhoneNumber",
             });
+    internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryRequest_descriptor =
+        getDescriptor().getMessageTypes().get(9);
+    internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryRequest_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryRequest_descriptor,
+            new java.lang.String[] {
+              "Conversation", "LatestMessage", "ContextSize",
+            });
+    internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_descriptor =
+        getDescriptor().getMessageTypes().get(10);
+    internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_descriptor,
+            new java.lang.String[] {
+              "Summary", "LatestMessage", "ContextSize",
+            });
+    internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_Summary_descriptor =
+        internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_descriptor
+            .getNestedTypes()
+            .get(0);
+    internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_Summary_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_Summary_descriptor,
+            new java.lang.String[] {
+              "Text", "TextSections", "AnswerRecord",
+            });
+    internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_Summary_TextSectionsEntry_descriptor =
+        internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_Summary_descriptor
+            .getNestedTypes()
+            .get(0);
+    internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_Summary_TextSectionsEntry_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_Summary_TextSectionsEntry_descriptor,
+            new java.lang.String[] {
+              "Key", "Value",
+            });
     com.google.protobuf.ExtensionRegistry registry =
         com.google.protobuf.ExtensionRegistry.newInstance();
     registry.add(com.google.api.ClientProto.defaultHost);
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateContextRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateContextRequest.java
index d82f6ab3dca2..cfed694fbcee 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateContextRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateContextRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Contexts.CreateContext][google.cloud.dialogflow.v2.Contexts.CreateContext].
+ * The request message for
+ * [Contexts.CreateContext][google.cloud.dialogflow.v2.Contexts.CreateContext].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.CreateContextRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -181,7 +184,9 @@ public com.google.cloud.dialogflow.v2.Context getContext() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.ContextOrBuilder getContextOrBuilder() {
-    return getContext();
+    return context_ == null
+        ? com.google.cloud.dialogflow.v2.Context.getDefaultInstance()
+        : context_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -361,7 +366,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Contexts.CreateContext][google.cloud.dialogflow.v2.Contexts.CreateContext].
+   * The request message for
+   * [Contexts.CreateContext][google.cloud.dialogflow.v2.Contexts.CreateContext].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.CreateContextRequest}
@@ -395,12 +401,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (contextBuilder_ == null) {
-        context_ = null;
-      } else {
-        context_ = null;
+      context_ = null;
+      if (contextBuilder_ != null) {
+        contextBuilder_.dispose();
         contextBuilder_ = null;
       }
       return this;
@@ -430,16 +435,23 @@ public com.google.cloud.dialogflow.v2.CreateContextRequest build() {
     public com.google.cloud.dialogflow.v2.CreateContextRequest buildPartial() {
       com.google.cloud.dialogflow.v2.CreateContextRequest result =
           new com.google.cloud.dialogflow.v2.CreateContextRequest(this);
-      result.parent_ = parent_;
-      if (contextBuilder_ == null) {
-        result.context_ = context_;
-      } else {
-        result.context_ = contextBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.CreateContextRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.context_ = contextBuilder_ == null ? context_ : contextBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -488,6 +500,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.CreateContextRequest oth
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasContext()) {
@@ -522,13 +535,13 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getContextFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -548,6 +561,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -630,8 +645,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -654,8 +669,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -683,8 +698,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -709,7 +724,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the context field is set.
      */
     public boolean hasContext() {
-      return contextBuilder_ != null || context_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -750,11 +765,11 @@ public Builder setContext(com.google.cloud.dialogflow.v2.Context value) {
           throw new NullPointerException();
         }
         context_ = value;
-        onChanged();
       } else {
         contextBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -771,11 +786,11 @@ public Builder setContext(com.google.cloud.dialogflow.v2.Context value) {
     public Builder setContext(com.google.cloud.dialogflow.v2.Context.Builder builderForValue) {
       if (contextBuilder_ == null) {
         context_ = builderForValue.build();
-        onChanged();
       } else {
         contextBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -791,19 +806,18 @@ public Builder setContext(com.google.cloud.dialogflow.v2.Context.Builder builder
      */
     public Builder mergeContext(com.google.cloud.dialogflow.v2.Context value) {
       if (contextBuilder_ == null) {
-        if (context_ != null) {
-          context_ =
-              com.google.cloud.dialogflow.v2.Context.newBuilder(context_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && context_ != null
+            && context_ != com.google.cloud.dialogflow.v2.Context.getDefaultInstance()) {
+          getContextBuilder().mergeFrom(value);
         } else {
           context_ = value;
         }
-        onChanged();
       } else {
         contextBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -818,14 +832,13 @@ public Builder mergeContext(com.google.cloud.dialogflow.v2.Context value) {
      * </code>
      */
     public Builder clearContext() {
-      if (contextBuilder_ == null) {
-        context_ = null;
-        onChanged();
-      } else {
-        context_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      context_ = null;
+      if (contextBuilder_ != null) {
+        contextBuilder_.dispose();
         contextBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -840,7 +853,7 @@ public Builder clearContext() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.Context.Builder getContextBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getContextFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationDatasetOperationMetadata.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationDatasetOperationMetadata.java
index ec68bf02271b..0179ab9e7b2c 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationDatasetOperationMetadata.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationDatasetOperationMetadata.java
@@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_DATASET_FIELD_NUMBER = 1;
-  private volatile java.lang.Object conversationDataset_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversationDataset_ = "";
   /**
    *
    *
@@ -325,8 +327,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       conversationDataset_ = "";
-
       return this;
     }
 
@@ -358,11 +360,21 @@ public com.google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata
         buildPartial() {
       com.google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata result =
           new com.google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata(this);
-      result.conversationDataset_ = conversationDataset_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversationDataset_ = conversationDataset_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -415,6 +427,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getConversationDataset().isEmpty()) {
         conversationDataset_ = other.conversationDataset_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -446,7 +459,7 @@ public Builder mergeFrom(
             case 10:
               {
                 conversationDataset_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -466,6 +479,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object conversationDataset_ = "";
     /**
      *
@@ -533,8 +548,8 @@ public Builder setConversationDataset(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversationDataset_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -552,8 +567,8 @@ public Builder setConversationDataset(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationDataset() {
-
       conversationDataset_ = getDefaultInstance().getConversationDataset();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -576,8 +591,8 @@ public Builder setConversationDatasetBytes(com.google.protobuf.ByteString value)
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversationDataset_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationDatasetRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationDatasetRequest.java
index fbb5e77a78a7..530c76cdb9a5 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationDatasetRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationDatasetRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -172,7 +174,9 @@ public com.google.cloud.dialogflow.v2.ConversationDataset getConversationDataset
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.ConversationDatasetOrBuilder
       getConversationDatasetOrBuilder() {
-    return getConversationDataset();
+    return conversationDataset_ == null
+        ? com.google.cloud.dialogflow.v2.ConversationDataset.getDefaultInstance()
+        : conversationDataset_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -388,12 +392,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (conversationDatasetBuilder_ == null) {
-        conversationDataset_ = null;
-      } else {
-        conversationDataset_ = null;
+      conversationDataset_ = null;
+      if (conversationDatasetBuilder_ != null) {
+        conversationDatasetBuilder_.dispose();
         conversationDatasetBuilder_ = null;
       }
       return this;
@@ -424,16 +427,27 @@ public com.google.cloud.dialogflow.v2.CreateConversationDatasetRequest build() {
     public com.google.cloud.dialogflow.v2.CreateConversationDatasetRequest buildPartial() {
       com.google.cloud.dialogflow.v2.CreateConversationDatasetRequest result =
           new com.google.cloud.dialogflow.v2.CreateConversationDatasetRequest(this);
-      result.parent_ = parent_;
-      if (conversationDatasetBuilder_ == null) {
-        result.conversationDataset_ = conversationDataset_;
-      } else {
-        result.conversationDataset_ = conversationDatasetBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.CreateConversationDatasetRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.conversationDataset_ =
+            conversationDatasetBuilder_ == null
+                ? conversationDataset_
+                : conversationDatasetBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -484,6 +498,7 @@ public Builder mergeFrom(
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasConversationDataset()) {
@@ -518,14 +533,14 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(
                     getConversationDatasetFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -545,6 +560,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -609,8 +626,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -627,8 +644,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -650,8 +667,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -676,7 +693,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the conversationDataset field is set.
      */
     public boolean hasConversationDataset() {
-      return conversationDatasetBuilder_ != null || conversationDataset_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -718,11 +735,11 @@ public Builder setConversationDataset(
           throw new NullPointerException();
         }
         conversationDataset_ = value;
-        onChanged();
       } else {
         conversationDatasetBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -740,11 +757,11 @@ public Builder setConversationDataset(
         com.google.cloud.dialogflow.v2.ConversationDataset.Builder builderForValue) {
       if (conversationDatasetBuilder_ == null) {
         conversationDataset_ = builderForValue.build();
-        onChanged();
       } else {
         conversationDatasetBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -761,19 +778,19 @@ public Builder setConversationDataset(
     public Builder mergeConversationDataset(
         com.google.cloud.dialogflow.v2.ConversationDataset value) {
       if (conversationDatasetBuilder_ == null) {
-        if (conversationDataset_ != null) {
-          conversationDataset_ =
-              com.google.cloud.dialogflow.v2.ConversationDataset.newBuilder(conversationDataset_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && conversationDataset_ != null
+            && conversationDataset_
+                != com.google.cloud.dialogflow.v2.ConversationDataset.getDefaultInstance()) {
+          getConversationDatasetBuilder().mergeFrom(value);
         } else {
           conversationDataset_ = value;
         }
-        onChanged();
       } else {
         conversationDatasetBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -788,14 +805,13 @@ public Builder mergeConversationDataset(
      * </code>
      */
     public Builder clearConversationDataset() {
-      if (conversationDatasetBuilder_ == null) {
-        conversationDataset_ = null;
-        onChanged();
-      } else {
-        conversationDataset_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      conversationDataset_ = null;
+      if (conversationDatasetBuilder_ != null) {
+        conversationDatasetBuilder_.dispose();
         conversationDatasetBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -811,7 +827,7 @@ public Builder clearConversationDataset() {
      */
     public com.google.cloud.dialogflow.v2.ConversationDataset.Builder
         getConversationDatasetBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getConversationDatasetFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationModelEvaluationOperationMetadata.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationModelEvaluationOperationMetadata.java
index db0c419395c3..f267a2c509ab 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationModelEvaluationOperationMetadata.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationModelEvaluationOperationMetadata.java
@@ -303,7 +303,9 @@ private State(int value) {
   }
 
   public static final int CONVERSATION_MODEL_EVALUATION_FIELD_NUMBER = 1;
-  private volatile java.lang.Object conversationModelEvaluation_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversationModelEvaluation_ = "";
   /**
    *
    *
@@ -356,7 +358,9 @@ public com.google.protobuf.ByteString getConversationModelEvaluationBytes() {
   }
 
   public static final int CONVERSATION_MODEL_FIELD_NUMBER = 4;
-  private volatile java.lang.Object conversationModel_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversationModel_ = "";
   /**
    *
    *
@@ -409,7 +413,7 @@ public com.google.protobuf.ByteString getConversationModelBytes() {
   }
 
   public static final int STATE_FIELD_NUMBER = 2;
-  private int state_;
+  private int state_ = 0;
   /**
    *
    *
@@ -443,10 +447,9 @@ public int getStateValue() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.CreateConversationModelEvaluationOperationMetadata.State
       getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.CreateConversationModelEvaluationOperationMetadata.State result =
         com.google.cloud.dialogflow.v2.CreateConversationModelEvaluationOperationMetadata.State
-            .valueOf(state_);
+            .forNumber(state_);
     return result == null
         ? com.google.cloud.dialogflow.v2.CreateConversationModelEvaluationOperationMetadata.State
             .UNRECOGNIZED
@@ -499,7 +502,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -754,16 +757,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       conversationModelEvaluation_ = "";
-
       conversationModel_ = "";
-
       state_ = 0;
-
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
       return this;
@@ -799,18 +799,30 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
       com.google.cloud.dialogflow.v2.CreateConversationModelEvaluationOperationMetadata result =
           new com.google.cloud.dialogflow.v2.CreateConversationModelEvaluationOperationMetadata(
               this);
-      result.conversationModelEvaluation_ = conversationModelEvaluation_;
-      result.conversationModel_ = conversationModel_;
-      result.state_ = state_;
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.CreateConversationModelEvaluationOperationMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversationModelEvaluation_ = conversationModelEvaluation_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.conversationModel_ = conversationModel_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.state_ = state_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -865,10 +877,12 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getConversationModelEvaluation().isEmpty()) {
         conversationModelEvaluation_ = other.conversationModelEvaluation_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getConversationModel().isEmpty()) {
         conversationModel_ = other.conversationModel_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.state_ != 0) {
@@ -906,25 +920,25 @@ public Builder mergeFrom(
             case 10:
               {
                 conversationModelEvaluation_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 state_ = input.readEnum();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 16
             case 26:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 26
             case 34:
               {
                 conversationModel_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 34
             default:
@@ -944,6 +958,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object conversationModelEvaluation_ = "";
     /**
      *
@@ -1011,8 +1027,8 @@ public Builder setConversationModelEvaluation(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversationModelEvaluation_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1030,8 +1046,8 @@ public Builder setConversationModelEvaluation(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationModelEvaluation() {
-
       conversationModelEvaluation_ = getDefaultInstance().getConversationModelEvaluation();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1054,8 +1070,8 @@ public Builder setConversationModelEvaluationBytes(com.google.protobuf.ByteStrin
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversationModelEvaluation_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1127,8 +1143,8 @@ public Builder setConversationModel(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversationModel_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1146,8 +1162,8 @@ public Builder setConversationModel(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationModel() {
-
       conversationModel_ = getDefaultInstance().getConversationModel();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1170,8 +1186,8 @@ public Builder setConversationModelBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversationModel_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1209,8 +1225,8 @@ public int getStateValue() {
      * @return This builder for chaining.
      */
     public Builder setStateValue(int value) {
-
       state_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1230,11 +1246,10 @@ public Builder setStateValue(int value) {
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.CreateConversationModelEvaluationOperationMetadata.State
         getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.CreateConversationModelEvaluationOperationMetadata.State
           result =
               com.google.cloud.dialogflow.v2.CreateConversationModelEvaluationOperationMetadata
-                  .State.valueOf(state_);
+                  .State.forNumber(state_);
       return result == null
           ? com.google.cloud.dialogflow.v2.CreateConversationModelEvaluationOperationMetadata.State
               .UNRECOGNIZED
@@ -1260,7 +1275,7 @@ public Builder setState(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000004;
       state_ = value.getNumber();
       onChanged();
       return this;
@@ -1279,7 +1294,7 @@ public Builder setState(
      * @return This builder for chaining.
      */
     public Builder clearState() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       state_ = 0;
       onChanged();
       return this;
@@ -1304,7 +1319,7 @@ public Builder clearState() {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1343,11 +1358,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1363,11 +1378,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1382,17 +1397,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
         } else {
           createTime_ = value;
         }
-        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1406,14 +1422,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * <code>.google.protobuf.Timestamp create_time = 3;</code>
      */
     public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1427,7 +1442,7 @@ public Builder clearCreateTime() {
      * <code>.google.protobuf.Timestamp create_time = 3;</code>
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationModelEvaluationRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationModelEvaluationRequest.java
index 79f3c8981c10..4394449cd8af 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationModelEvaluationRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationModelEvaluationRequest.java
@@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -180,7 +182,9 @@ public boolean hasConversationModelEvaluation() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.ConversationModelEvaluationOrBuilder
       getConversationModelEvaluationOrBuilder() {
-    return getConversationModelEvaluation();
+    return conversationModelEvaluation_ == null
+        ? com.google.cloud.dialogflow.v2.ConversationModelEvaluation.getDefaultInstance()
+        : conversationModelEvaluation_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -402,12 +406,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (conversationModelEvaluationBuilder_ == null) {
-        conversationModelEvaluation_ = null;
-      } else {
-        conversationModelEvaluation_ = null;
+      conversationModelEvaluation_ = null;
+      if (conversationModelEvaluationBuilder_ != null) {
+        conversationModelEvaluationBuilder_.dispose();
         conversationModelEvaluationBuilder_ = null;
       }
       return this;
@@ -440,16 +443,27 @@ public com.google.cloud.dialogflow.v2.CreateConversationModelEvaluationRequest b
     public com.google.cloud.dialogflow.v2.CreateConversationModelEvaluationRequest buildPartial() {
       com.google.cloud.dialogflow.v2.CreateConversationModelEvaluationRequest result =
           new com.google.cloud.dialogflow.v2.CreateConversationModelEvaluationRequest(this);
-      result.parent_ = parent_;
-      if (conversationModelEvaluationBuilder_ == null) {
-        result.conversationModelEvaluation_ = conversationModelEvaluation_;
-      } else {
-        result.conversationModelEvaluation_ = conversationModelEvaluationBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.CreateConversationModelEvaluationRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.conversationModelEvaluation_ =
+            conversationModelEvaluationBuilder_ == null
+                ? conversationModelEvaluation_
+                : conversationModelEvaluationBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -502,6 +516,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasConversationModelEvaluation()) {
@@ -536,14 +551,14 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(
                     getConversationModelEvaluationFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -563,6 +578,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -636,8 +653,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -657,8 +674,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -683,8 +700,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -709,7 +726,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the conversationModelEvaluation field is set.
      */
     public boolean hasConversationModelEvaluation() {
-      return conversationModelEvaluationBuilder_ != null || conversationModelEvaluation_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -752,11 +769,11 @@ public Builder setConversationModelEvaluation(
           throw new NullPointerException();
         }
         conversationModelEvaluation_ = value;
-        onChanged();
       } else {
         conversationModelEvaluationBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -774,11 +791,11 @@ public Builder setConversationModelEvaluation(
         com.google.cloud.dialogflow.v2.ConversationModelEvaluation.Builder builderForValue) {
       if (conversationModelEvaluationBuilder_ == null) {
         conversationModelEvaluation_ = builderForValue.build();
-        onChanged();
       } else {
         conversationModelEvaluationBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -795,20 +812,20 @@ public Builder setConversationModelEvaluation(
     public Builder mergeConversationModelEvaluation(
         com.google.cloud.dialogflow.v2.ConversationModelEvaluation value) {
       if (conversationModelEvaluationBuilder_ == null) {
-        if (conversationModelEvaluation_ != null) {
-          conversationModelEvaluation_ =
-              com.google.cloud.dialogflow.v2.ConversationModelEvaluation.newBuilder(
-                      conversationModelEvaluation_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && conversationModelEvaluation_ != null
+            && conversationModelEvaluation_
+                != com.google.cloud.dialogflow.v2.ConversationModelEvaluation
+                    .getDefaultInstance()) {
+          getConversationModelEvaluationBuilder().mergeFrom(value);
         } else {
           conversationModelEvaluation_ = value;
         }
-        onChanged();
       } else {
         conversationModelEvaluationBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -823,14 +840,13 @@ public Builder mergeConversationModelEvaluation(
      * </code>
      */
     public Builder clearConversationModelEvaluation() {
-      if (conversationModelEvaluationBuilder_ == null) {
-        conversationModelEvaluation_ = null;
-        onChanged();
-      } else {
-        conversationModelEvaluation_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      conversationModelEvaluation_ = null;
+      if (conversationModelEvaluationBuilder_ != null) {
+        conversationModelEvaluationBuilder_.dispose();
         conversationModelEvaluationBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -846,7 +862,7 @@ public Builder clearConversationModelEvaluation() {
      */
     public com.google.cloud.dialogflow.v2.ConversationModelEvaluation.Builder
         getConversationModelEvaluationBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getConversationModelEvaluationFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationModelOperationMetadata.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationModelOperationMetadata.java
index cf091e8a0a54..952671a16d40 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationModelOperationMetadata.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationModelOperationMetadata.java
@@ -22,7 +22,9 @@
  *
  *
  * <pre>
- * Metadata for a [ConversationModels.CreateConversationModel][google.cloud.dialogflow.v2.ConversationModels.CreateConversationModel] operation.
+ * Metadata for a
+ * [ConversationModels.CreateConversationModel][google.cloud.dialogflow.v2.ConversationModels.CreateConversationModel]
+ * operation.
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata}
@@ -322,7 +324,9 @@ private State(int value) {
   }
 
   public static final int CONVERSATION_MODEL_FIELD_NUMBER = 1;
-  private volatile java.lang.Object conversationModel_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversationModel_ = "";
   /**
    *
    *
@@ -373,7 +377,7 @@ public com.google.protobuf.ByteString getConversationModelBytes() {
   }
 
   public static final int STATE_FIELD_NUMBER = 2;
-  private int state_;
+  private int state_ = 0;
   /**
    *
    *
@@ -404,9 +408,8 @@ public int getStateValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata.State result =
-        com.google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata.State.valueOf(
+        com.google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata.State.forNumber(
             state_);
     return result == null
         ? com.google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata.State.UNRECOGNIZED
@@ -459,7 +462,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -656,7 +659,9 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Metadata for a [ConversationModels.CreateConversationModel][google.cloud.dialogflow.v2.ConversationModels.CreateConversationModel] operation.
+   * Metadata for a
+   * [ConversationModels.CreateConversationModel][google.cloud.dialogflow.v2.ConversationModels.CreateConversationModel]
+   * operation.
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata}
@@ -692,14 +697,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       conversationModel_ = "";
-
       state_ = 0;
-
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
       return this;
@@ -732,17 +735,27 @@ public com.google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata b
     public com.google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata buildPartial() {
       com.google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata result =
           new com.google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata(this);
-      result.conversationModel_ = conversationModel_;
-      result.state_ = state_;
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversationModel_ = conversationModel_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.state_ = state_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -795,6 +808,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getConversationModel().isEmpty()) {
         conversationModel_ = other.conversationModel_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.state_ != 0) {
@@ -832,19 +846,19 @@ public Builder mergeFrom(
             case 10:
               {
                 conversationModel_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 state_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -864,6 +878,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object conversationModel_ = "";
     /**
      *
@@ -928,8 +944,8 @@ public Builder setConversationModel(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversationModel_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -946,8 +962,8 @@ public Builder setConversationModel(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationModel() {
-
       conversationModel_ = getDefaultInstance().getConversationModel();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -969,8 +985,8 @@ public Builder setConversationModelBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversationModel_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1006,8 +1022,8 @@ public int getStateValue() {
      * @return This builder for chaining.
      */
     public Builder setStateValue(int value) {
-
       state_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1026,9 +1042,8 @@ public Builder setStateValue(int value) {
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata.State
         getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata.State result =
-          com.google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata.State.valueOf(
+          com.google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata.State.forNumber(
               state_);
       return result == null
           ? com.google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata.State
@@ -1053,7 +1068,7 @@ public Builder setState(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       state_ = value.getNumber();
       onChanged();
       return this;
@@ -1071,7 +1086,7 @@ public Builder setState(
      * @return This builder for chaining.
      */
     public Builder clearState() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       state_ = 0;
       onChanged();
       return this;
@@ -1096,7 +1111,7 @@ public Builder clearState() {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1135,11 +1150,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1155,11 +1170,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1174,17 +1189,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
         } else {
           createTime_ = value;
         }
-        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1198,14 +1214,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * <code>.google.protobuf.Timestamp create_time = 3;</code>
      */
     public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1219,7 +1234,7 @@ public Builder clearCreateTime() {
      * <code>.google.protobuf.Timestamp create_time = 3;</code>
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationModelRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationModelRequest.java
index 3314b24967c4..965a203a28c9 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationModelRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationModelRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -171,7 +173,9 @@ public com.google.cloud.dialogflow.v2.ConversationModel getConversationModel() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.ConversationModelOrBuilder getConversationModelOrBuilder() {
-    return getConversationModel();
+    return conversationModel_ == null
+        ? com.google.cloud.dialogflow.v2.ConversationModel.getDefaultInstance()
+        : conversationModel_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -387,12 +391,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (conversationModelBuilder_ == null) {
-        conversationModel_ = null;
-      } else {
-        conversationModel_ = null;
+      conversationModel_ = null;
+      if (conversationModelBuilder_ != null) {
+        conversationModelBuilder_.dispose();
         conversationModelBuilder_ = null;
       }
       return this;
@@ -423,16 +426,27 @@ public com.google.cloud.dialogflow.v2.CreateConversationModelRequest build() {
     public com.google.cloud.dialogflow.v2.CreateConversationModelRequest buildPartial() {
       com.google.cloud.dialogflow.v2.CreateConversationModelRequest result =
           new com.google.cloud.dialogflow.v2.CreateConversationModelRequest(this);
-      result.parent_ = parent_;
-      if (conversationModelBuilder_ == null) {
-        result.conversationModel_ = conversationModel_;
-      } else {
-        result.conversationModel_ = conversationModelBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.CreateConversationModelRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.conversationModel_ =
+            conversationModelBuilder_ == null
+                ? conversationModel_
+                : conversationModelBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -482,6 +496,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.CreateConversationModelR
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasConversationModel()) {
@@ -516,14 +531,14 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(
                     getConversationModelFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -543,6 +558,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -607,8 +624,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -625,8 +642,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -648,8 +665,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -674,7 +691,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the conversationModel field is set.
      */
     public boolean hasConversationModel() {
-      return conversationModelBuilder_ != null || conversationModel_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -715,11 +732,11 @@ public Builder setConversationModel(com.google.cloud.dialogflow.v2.ConversationM
           throw new NullPointerException();
         }
         conversationModel_ = value;
-        onChanged();
       } else {
         conversationModelBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -737,11 +754,11 @@ public Builder setConversationModel(
         com.google.cloud.dialogflow.v2.ConversationModel.Builder builderForValue) {
       if (conversationModelBuilder_ == null) {
         conversationModel_ = builderForValue.build();
-        onChanged();
       } else {
         conversationModelBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -757,19 +774,19 @@ public Builder setConversationModel(
      */
     public Builder mergeConversationModel(com.google.cloud.dialogflow.v2.ConversationModel value) {
       if (conversationModelBuilder_ == null) {
-        if (conversationModel_ != null) {
-          conversationModel_ =
-              com.google.cloud.dialogflow.v2.ConversationModel.newBuilder(conversationModel_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && conversationModel_ != null
+            && conversationModel_
+                != com.google.cloud.dialogflow.v2.ConversationModel.getDefaultInstance()) {
+          getConversationModelBuilder().mergeFrom(value);
         } else {
           conversationModel_ = value;
         }
-        onChanged();
       } else {
         conversationModelBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -784,14 +801,13 @@ public Builder mergeConversationModel(com.google.cloud.dialogflow.v2.Conversatio
      * </code>
      */
     public Builder clearConversationModel() {
-      if (conversationModelBuilder_ == null) {
-        conversationModel_ = null;
-        onChanged();
-      } else {
-        conversationModel_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      conversationModel_ = null;
+      if (conversationModelBuilder_ != null) {
+        conversationModelBuilder_.dispose();
         conversationModelBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -806,7 +822,7 @@ public Builder clearConversationModel() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.ConversationModel.Builder getConversationModelBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getConversationModelFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationProfileRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationProfileRequest.java
index 2ef74efe07f5..79a9f11ed45c 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationProfileRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationProfileRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [ConversationProfiles.CreateConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.CreateConversationProfile].
+ * The request message for
+ * [ConversationProfiles.CreateConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.CreateConversationProfile].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.CreateConversationProfileRequest}
@@ -69,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -175,7 +178,9 @@ public com.google.cloud.dialogflow.v2.ConversationProfile getConversationProfile
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.ConversationProfileOrBuilder
       getConversationProfileOrBuilder() {
-    return getConversationProfile();
+    return conversationProfile_ == null
+        ? com.google.cloud.dialogflow.v2.ConversationProfile.getDefaultInstance()
+        : conversationProfile_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -356,7 +361,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [ConversationProfiles.CreateConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.CreateConversationProfile].
+   * The request message for
+   * [ConversationProfiles.CreateConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.CreateConversationProfile].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.CreateConversationProfileRequest}
@@ -390,12 +396,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (conversationProfileBuilder_ == null) {
-        conversationProfile_ = null;
-      } else {
-        conversationProfile_ = null;
+      conversationProfile_ = null;
+      if (conversationProfileBuilder_ != null) {
+        conversationProfileBuilder_.dispose();
         conversationProfileBuilder_ = null;
       }
       return this;
@@ -426,16 +431,27 @@ public com.google.cloud.dialogflow.v2.CreateConversationProfileRequest build() {
     public com.google.cloud.dialogflow.v2.CreateConversationProfileRequest buildPartial() {
       com.google.cloud.dialogflow.v2.CreateConversationProfileRequest result =
           new com.google.cloud.dialogflow.v2.CreateConversationProfileRequest(this);
-      result.parent_ = parent_;
-      if (conversationProfileBuilder_ == null) {
-        result.conversationProfile_ = conversationProfile_;
-      } else {
-        result.conversationProfile_ = conversationProfileBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.CreateConversationProfileRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.conversationProfile_ =
+            conversationProfileBuilder_ == null
+                ? conversationProfile_
+                : conversationProfileBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -486,6 +502,7 @@ public Builder mergeFrom(
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasConversationProfile()) {
@@ -520,14 +537,14 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(
                     getConversationProfileFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -547,6 +564,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -617,8 +636,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -637,8 +656,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -662,8 +681,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -688,7 +707,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the conversationProfile field is set.
      */
     public boolean hasConversationProfile() {
-      return conversationProfileBuilder_ != null || conversationProfile_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -730,11 +749,11 @@ public Builder setConversationProfile(
           throw new NullPointerException();
         }
         conversationProfile_ = value;
-        onChanged();
       } else {
         conversationProfileBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -752,11 +771,11 @@ public Builder setConversationProfile(
         com.google.cloud.dialogflow.v2.ConversationProfile.Builder builderForValue) {
       if (conversationProfileBuilder_ == null) {
         conversationProfile_ = builderForValue.build();
-        onChanged();
       } else {
         conversationProfileBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -773,19 +792,19 @@ public Builder setConversationProfile(
     public Builder mergeConversationProfile(
         com.google.cloud.dialogflow.v2.ConversationProfile value) {
       if (conversationProfileBuilder_ == null) {
-        if (conversationProfile_ != null) {
-          conversationProfile_ =
-              com.google.cloud.dialogflow.v2.ConversationProfile.newBuilder(conversationProfile_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && conversationProfile_ != null
+            && conversationProfile_
+                != com.google.cloud.dialogflow.v2.ConversationProfile.getDefaultInstance()) {
+          getConversationProfileBuilder().mergeFrom(value);
         } else {
           conversationProfile_ = value;
         }
-        onChanged();
       } else {
         conversationProfileBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -800,14 +819,13 @@ public Builder mergeConversationProfile(
      * </code>
      */
     public Builder clearConversationProfile() {
-      if (conversationProfileBuilder_ == null) {
-        conversationProfile_ = null;
-        onChanged();
-      } else {
-        conversationProfile_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      conversationProfile_ = null;
+      if (conversationProfileBuilder_ != null) {
+        conversationProfileBuilder_.dispose();
         conversationProfileBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -823,7 +841,7 @@ public Builder clearConversationProfile() {
      */
     public com.google.cloud.dialogflow.v2.ConversationProfile.Builder
         getConversationProfileBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getConversationProfileFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationRequest.java
index b488a7ed4960..fcc89a80c1f5 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Conversations.CreateConversation][google.cloud.dialogflow.v2.Conversations.CreateConversation].
+ * The request message for
+ * [Conversations.CreateConversation][google.cloud.dialogflow.v2.Conversations.CreateConversation].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.CreateConversationRequest}
@@ -69,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -174,17 +177,21 @@ public com.google.cloud.dialogflow.v2.Conversation getConversation() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.ConversationOrBuilder getConversationOrBuilder() {
-    return getConversation();
+    return conversation_ == null
+        ? com.google.cloud.dialogflow.v2.Conversation.getDefaultInstance()
+        : conversation_;
   }
 
   public static final int CONVERSATION_ID_FIELD_NUMBER = 3;
-  private volatile java.lang.Object conversationId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversationId_ = "";
   /**
    *
    *
    * <pre>
-   * Optional. Identifier of the conversation. Generally it's auto generated by Google.
-   * Only set it if you cannot wait for the response to return a
+   * Optional. Identifier of the conversation. Generally it's auto generated by
+   * Google. Only set it if you cannot wait for the response to return a
    * auto-generated one to you.
    * The conversation ID must be compliant with the regression fomula
    * "[a-zA-Z][a-zA-Z0-9_-]*" with the characters length in range of [3,64].
@@ -214,8 +221,8 @@ public java.lang.String getConversationId() {
    *
    *
    * <pre>
-   * Optional. Identifier of the conversation. Generally it's auto generated by Google.
-   * Only set it if you cannot wait for the response to return a
+   * Optional. Identifier of the conversation. Generally it's auto generated by
+   * Google. Only set it if you cannot wait for the response to return a
    * auto-generated one to you.
    * The conversation ID must be compliant with the regression fomula
    * "[a-zA-Z][a-zA-Z0-9_-]*" with the characters length in range of [3,64].
@@ -429,7 +436,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Conversations.CreateConversation][google.cloud.dialogflow.v2.Conversations.CreateConversation].
+   * The request message for
+   * [Conversations.CreateConversation][google.cloud.dialogflow.v2.Conversations.CreateConversation].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.CreateConversationRequest}
@@ -463,16 +471,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (conversationBuilder_ == null) {
-        conversation_ = null;
-      } else {
-        conversation_ = null;
+      conversation_ = null;
+      if (conversationBuilder_ != null) {
+        conversationBuilder_.dispose();
         conversationBuilder_ = null;
       }
       conversationId_ = "";
-
       return this;
     }
 
@@ -500,17 +506,27 @@ public com.google.cloud.dialogflow.v2.CreateConversationRequest build() {
     public com.google.cloud.dialogflow.v2.CreateConversationRequest buildPartial() {
       com.google.cloud.dialogflow.v2.CreateConversationRequest result =
           new com.google.cloud.dialogflow.v2.CreateConversationRequest(this);
-      result.parent_ = parent_;
-      if (conversationBuilder_ == null) {
-        result.conversation_ = conversation_;
-      } else {
-        result.conversation_ = conversationBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.conversationId_ = conversationId_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.CreateConversationRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.conversation_ =
+            conversationBuilder_ == null ? conversation_ : conversationBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.conversationId_ = conversationId_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -559,6 +575,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.CreateConversationReques
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasConversation()) {
@@ -566,6 +583,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.CreateConversationReques
       }
       if (!other.getConversationId().isEmpty()) {
         conversationId_ = other.conversationId_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -597,19 +615,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getConversationFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 conversationId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -629,6 +647,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -699,8 +719,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -719,8 +739,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -744,8 +764,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -770,7 +790,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the conversation field is set.
      */
     public boolean hasConversation() {
-      return conversationBuilder_ != null || conversation_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -811,11 +831,11 @@ public Builder setConversation(com.google.cloud.dialogflow.v2.Conversation value
           throw new NullPointerException();
         }
         conversation_ = value;
-        onChanged();
       } else {
         conversationBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -833,11 +853,11 @@ public Builder setConversation(
         com.google.cloud.dialogflow.v2.Conversation.Builder builderForValue) {
       if (conversationBuilder_ == null) {
         conversation_ = builderForValue.build();
-        onChanged();
       } else {
         conversationBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -853,19 +873,18 @@ public Builder setConversation(
      */
     public Builder mergeConversation(com.google.cloud.dialogflow.v2.Conversation value) {
       if (conversationBuilder_ == null) {
-        if (conversation_ != null) {
-          conversation_ =
-              com.google.cloud.dialogflow.v2.Conversation.newBuilder(conversation_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && conversation_ != null
+            && conversation_ != com.google.cloud.dialogflow.v2.Conversation.getDefaultInstance()) {
+          getConversationBuilder().mergeFrom(value);
         } else {
           conversation_ = value;
         }
-        onChanged();
       } else {
         conversationBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -880,14 +899,13 @@ public Builder mergeConversation(com.google.cloud.dialogflow.v2.Conversation val
      * </code>
      */
     public Builder clearConversation() {
-      if (conversationBuilder_ == null) {
-        conversation_ = null;
-        onChanged();
-      } else {
-        conversation_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      conversation_ = null;
+      if (conversationBuilder_ != null) {
+        conversationBuilder_.dispose();
         conversationBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -902,7 +920,7 @@ public Builder clearConversation() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.Conversation.Builder getConversationBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getConversationFieldBuilder().getBuilder();
     }
@@ -959,8 +977,8 @@ public com.google.cloud.dialogflow.v2.ConversationOrBuilder getConversationOrBui
      *
      *
      * <pre>
-     * Optional. Identifier of the conversation. Generally it's auto generated by Google.
-     * Only set it if you cannot wait for the response to return a
+     * Optional. Identifier of the conversation. Generally it's auto generated by
+     * Google. Only set it if you cannot wait for the response to return a
      * auto-generated one to you.
      * The conversation ID must be compliant with the regression fomula
      * "[a-zA-Z][a-zA-Z0-9_-]*" with the characters length in range of [3,64].
@@ -989,8 +1007,8 @@ public java.lang.String getConversationId() {
      *
      *
      * <pre>
-     * Optional. Identifier of the conversation. Generally it's auto generated by Google.
-     * Only set it if you cannot wait for the response to return a
+     * Optional. Identifier of the conversation. Generally it's auto generated by
+     * Google. Only set it if you cannot wait for the response to return a
      * auto-generated one to you.
      * The conversation ID must be compliant with the regression fomula
      * "[a-zA-Z][a-zA-Z0-9_-]*" with the characters length in range of [3,64].
@@ -1019,8 +1037,8 @@ public com.google.protobuf.ByteString getConversationIdBytes() {
      *
      *
      * <pre>
-     * Optional. Identifier of the conversation. Generally it's auto generated by Google.
-     * Only set it if you cannot wait for the response to return a
+     * Optional. Identifier of the conversation. Generally it's auto generated by
+     * Google. Only set it if you cannot wait for the response to return a
      * auto-generated one to you.
      * The conversation ID must be compliant with the regression fomula
      * "[a-zA-Z][a-zA-Z0-9_-]*" with the characters length in range of [3,64].
@@ -1039,8 +1057,8 @@ public Builder setConversationId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversationId_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1048,8 +1066,8 @@ public Builder setConversationId(java.lang.String value) {
      *
      *
      * <pre>
-     * Optional. Identifier of the conversation. Generally it's auto generated by Google.
-     * Only set it if you cannot wait for the response to return a
+     * Optional. Identifier of the conversation. Generally it's auto generated by
+     * Google. Only set it if you cannot wait for the response to return a
      * auto-generated one to you.
      * The conversation ID must be compliant with the regression fomula
      * "[a-zA-Z][a-zA-Z0-9_-]*" with the characters length in range of [3,64].
@@ -1064,8 +1082,8 @@ public Builder setConversationId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationId() {
-
       conversationId_ = getDefaultInstance().getConversationId();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1073,8 +1091,8 @@ public Builder clearConversationId() {
      *
      *
      * <pre>
-     * Optional. Identifier of the conversation. Generally it's auto generated by Google.
-     * Only set it if you cannot wait for the response to return a
+     * Optional. Identifier of the conversation. Generally it's auto generated by
+     * Google. Only set it if you cannot wait for the response to return a
      * auto-generated one to you.
      * The conversation ID must be compliant with the regression fomula
      * "[a-zA-Z][a-zA-Z0-9_-]*" with the characters length in range of [3,64].
@@ -1094,8 +1112,8 @@ public Builder setConversationIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversationId_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationRequestOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationRequestOrBuilder.java
index 397294a2026b..8d225306fbac 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationRequestOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationRequestOrBuilder.java
@@ -99,8 +99,8 @@ public interface CreateConversationRequestOrBuilder
    *
    *
    * <pre>
-   * Optional. Identifier of the conversation. Generally it's auto generated by Google.
-   * Only set it if you cannot wait for the response to return a
+   * Optional. Identifier of the conversation. Generally it's auto generated by
+   * Google. Only set it if you cannot wait for the response to return a
    * auto-generated one to you.
    * The conversation ID must be compliant with the regression fomula
    * "[a-zA-Z][a-zA-Z0-9_-]*" with the characters length in range of [3,64].
@@ -119,8 +119,8 @@ public interface CreateConversationRequestOrBuilder
    *
    *
    * <pre>
-   * Optional. Identifier of the conversation. Generally it's auto generated by Google.
-   * Only set it if you cannot wait for the response to return a
+   * Optional. Identifier of the conversation. Generally it's auto generated by
+   * Google. Only set it if you cannot wait for the response to return a
    * auto-generated one to you.
    * The conversation ID must be compliant with the regression fomula
    * "[a-zA-Z][a-zA-Z0-9_-]*" with the characters length in range of [3,64].
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateDocumentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateDocumentRequest.java
index 714590cb16ba..7c7eefcfaedf 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateDocumentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateDocumentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * Request message for [Documents.CreateDocument][google.cloud.dialogflow.v2.Documents.CreateDocument].
+ * Request message for
+ * [Documents.CreateDocument][google.cloud.dialogflow.v2.Documents.CreateDocument].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.CreateDocumentRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -175,7 +178,9 @@ public com.google.cloud.dialogflow.v2.Document getDocument() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.DocumentOrBuilder getDocumentOrBuilder() {
-    return getDocument();
+    return document_ == null
+        ? com.google.cloud.dialogflow.v2.Document.getDefaultInstance()
+        : document_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -355,7 +360,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Request message for [Documents.CreateDocument][google.cloud.dialogflow.v2.Documents.CreateDocument].
+   * Request message for
+   * [Documents.CreateDocument][google.cloud.dialogflow.v2.Documents.CreateDocument].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.CreateDocumentRequest}
@@ -389,12 +395,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (documentBuilder_ == null) {
-        document_ = null;
-      } else {
-        document_ = null;
+      document_ = null;
+      if (documentBuilder_ != null) {
+        documentBuilder_.dispose();
         documentBuilder_ = null;
       }
       return this;
@@ -424,16 +429,23 @@ public com.google.cloud.dialogflow.v2.CreateDocumentRequest build() {
     public com.google.cloud.dialogflow.v2.CreateDocumentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.CreateDocumentRequest result =
           new com.google.cloud.dialogflow.v2.CreateDocumentRequest(this);
-      result.parent_ = parent_;
-      if (documentBuilder_ == null) {
-        result.document_ = document_;
-      } else {
-        result.document_ = documentBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.CreateDocumentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.document_ = documentBuilder_ == null ? document_ : documentBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -482,6 +494,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.CreateDocumentRequest ot
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasDocument()) {
@@ -516,13 +529,13 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getDocumentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -542,6 +555,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -615,8 +630,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -636,8 +651,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -662,8 +677,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -688,7 +703,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the document field is set.
      */
     public boolean hasDocument() {
-      return documentBuilder_ != null || document_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -729,11 +744,11 @@ public Builder setDocument(com.google.cloud.dialogflow.v2.Document value) {
           throw new NullPointerException();
         }
         document_ = value;
-        onChanged();
       } else {
         documentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -750,11 +765,11 @@ public Builder setDocument(com.google.cloud.dialogflow.v2.Document value) {
     public Builder setDocument(com.google.cloud.dialogflow.v2.Document.Builder builderForValue) {
       if (documentBuilder_ == null) {
         document_ = builderForValue.build();
-        onChanged();
       } else {
         documentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -770,19 +785,18 @@ public Builder setDocument(com.google.cloud.dialogflow.v2.Document.Builder build
      */
     public Builder mergeDocument(com.google.cloud.dialogflow.v2.Document value) {
       if (documentBuilder_ == null) {
-        if (document_ != null) {
-          document_ =
-              com.google.cloud.dialogflow.v2.Document.newBuilder(document_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && document_ != null
+            && document_ != com.google.cloud.dialogflow.v2.Document.getDefaultInstance()) {
+          getDocumentBuilder().mergeFrom(value);
         } else {
           document_ = value;
         }
-        onChanged();
       } else {
         documentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -797,14 +811,13 @@ public Builder mergeDocument(com.google.cloud.dialogflow.v2.Document value) {
      * </code>
      */
     public Builder clearDocument() {
-      if (documentBuilder_ == null) {
-        document_ = null;
-        onChanged();
-      } else {
-        document_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      document_ = null;
+      if (documentBuilder_ != null) {
+        documentBuilder_.dispose();
         documentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -819,7 +832,7 @@ public Builder clearDocument() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.Document.Builder getDocumentBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getDocumentFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateEntityTypeRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateEntityTypeRequest.java
index da79afac5409..d8c922983d64 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateEntityTypeRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateEntityTypeRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [EntityTypes.CreateEntityType][google.cloud.dialogflow.v2.EntityTypes.CreateEntityType].
+ * The request message for
+ * [EntityTypes.CreateEntityType][google.cloud.dialogflow.v2.EntityTypes.CreateEntityType].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.CreateEntityTypeRequest}
@@ -69,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -174,11 +177,15 @@ public com.google.cloud.dialogflow.v2.EntityType getEntityType() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.EntityTypeOrBuilder getEntityTypeOrBuilder() {
-    return getEntityType();
+    return entityType_ == null
+        ? com.google.cloud.dialogflow.v2.EntityType.getDefaultInstance()
+        : entityType_;
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -421,7 +428,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [EntityTypes.CreateEntityType][google.cloud.dialogflow.v2.EntityTypes.CreateEntityType].
+   * The request message for
+   * [EntityTypes.CreateEntityType][google.cloud.dialogflow.v2.EntityTypes.CreateEntityType].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.CreateEntityTypeRequest}
@@ -455,16 +463,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (entityTypeBuilder_ == null) {
-        entityType_ = null;
-      } else {
-        entityType_ = null;
+      entityType_ = null;
+      if (entityTypeBuilder_ != null) {
+        entityTypeBuilder_.dispose();
         entityTypeBuilder_ = null;
       }
       languageCode_ = "";
-
       return this;
     }
 
@@ -492,17 +498,26 @@ public com.google.cloud.dialogflow.v2.CreateEntityTypeRequest build() {
     public com.google.cloud.dialogflow.v2.CreateEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2.CreateEntityTypeRequest result =
           new com.google.cloud.dialogflow.v2.CreateEntityTypeRequest(this);
-      result.parent_ = parent_;
-      if (entityTypeBuilder_ == null) {
-        result.entityType_ = entityType_;
-      } else {
-        result.entityType_ = entityTypeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.languageCode_ = languageCode_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.CreateEntityTypeRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.entityType_ = entityTypeBuilder_ == null ? entityType_ : entityTypeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -551,6 +566,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.CreateEntityTypeRequest
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasEntityType()) {
@@ -558,6 +574,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.CreateEntityTypeRequest
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -589,19 +606,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getEntityTypeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -621,6 +638,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -691,8 +710,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -711,8 +730,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -736,8 +755,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -762,7 +781,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the entityType field is set.
      */
     public boolean hasEntityType() {
-      return entityTypeBuilder_ != null || entityType_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -803,11 +822,11 @@ public Builder setEntityType(com.google.cloud.dialogflow.v2.EntityType value) {
           throw new NullPointerException();
         }
         entityType_ = value;
-        onChanged();
       } else {
         entityTypeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -825,11 +844,11 @@ public Builder setEntityType(
         com.google.cloud.dialogflow.v2.EntityType.Builder builderForValue) {
       if (entityTypeBuilder_ == null) {
         entityType_ = builderForValue.build();
-        onChanged();
       } else {
         entityTypeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -845,19 +864,18 @@ public Builder setEntityType(
      */
     public Builder mergeEntityType(com.google.cloud.dialogflow.v2.EntityType value) {
       if (entityTypeBuilder_ == null) {
-        if (entityType_ != null) {
-          entityType_ =
-              com.google.cloud.dialogflow.v2.EntityType.newBuilder(entityType_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && entityType_ != null
+            && entityType_ != com.google.cloud.dialogflow.v2.EntityType.getDefaultInstance()) {
+          getEntityTypeBuilder().mergeFrom(value);
         } else {
           entityType_ = value;
         }
-        onChanged();
       } else {
         entityTypeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -872,14 +890,13 @@ public Builder mergeEntityType(com.google.cloud.dialogflow.v2.EntityType value)
      * </code>
      */
     public Builder clearEntityType() {
-      if (entityTypeBuilder_ == null) {
-        entityType_ = null;
-        onChanged();
-      } else {
-        entityType_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      entityType_ = null;
+      if (entityTypeBuilder_ != null) {
+        entityTypeBuilder_.dispose();
         entityTypeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -894,7 +911,7 @@ public Builder clearEntityType() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.EntityType.Builder getEntityTypeBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getEntityTypeFieldBuilder().getBuilder();
     }
@@ -1019,8 +1036,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1040,8 +1057,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1066,8 +1083,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateEnvironmentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateEnvironmentRequest.java
index 9ef98685fd68..829bd0aa17ee 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateEnvironmentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateEnvironmentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Environments.CreateEnvironment][google.cloud.dialogflow.v2.Environments.CreateEnvironment].
+ * The request message for
+ * [Environments.CreateEnvironment][google.cloud.dialogflow.v2.Environments.CreateEnvironment].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.CreateEnvironmentRequest}
@@ -69,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -178,11 +181,15 @@ public com.google.cloud.dialogflow.v2.Environment getEnvironment() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.EnvironmentOrBuilder getEnvironmentOrBuilder() {
-    return getEnvironment();
+    return environment_ == null
+        ? com.google.cloud.dialogflow.v2.Environment.getDefaultInstance()
+        : environment_;
   }
 
   public static final int ENVIRONMENT_ID_FIELD_NUMBER = 3;
-  private volatile java.lang.Object environmentId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object environmentId_ = "";
   /**
    *
    *
@@ -417,7 +424,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Environments.CreateEnvironment][google.cloud.dialogflow.v2.Environments.CreateEnvironment].
+   * The request message for
+   * [Environments.CreateEnvironment][google.cloud.dialogflow.v2.Environments.CreateEnvironment].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.CreateEnvironmentRequest}
@@ -451,16 +459,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (environmentBuilder_ == null) {
-        environment_ = null;
-      } else {
-        environment_ = null;
+      environment_ = null;
+      if (environmentBuilder_ != null) {
+        environmentBuilder_.dispose();
         environmentBuilder_ = null;
       }
       environmentId_ = "";
-
       return this;
     }
 
@@ -488,17 +494,27 @@ public com.google.cloud.dialogflow.v2.CreateEnvironmentRequest build() {
     public com.google.cloud.dialogflow.v2.CreateEnvironmentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.CreateEnvironmentRequest result =
           new com.google.cloud.dialogflow.v2.CreateEnvironmentRequest(this);
-      result.parent_ = parent_;
-      if (environmentBuilder_ == null) {
-        result.environment_ = environment_;
-      } else {
-        result.environment_ = environmentBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.environmentId_ = environmentId_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.CreateEnvironmentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.environment_ =
+            environmentBuilder_ == null ? environment_ : environmentBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.environmentId_ = environmentId_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -547,6 +563,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.CreateEnvironmentRequest
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasEnvironment()) {
@@ -554,6 +571,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.CreateEnvironmentRequest
       }
       if (!other.getEnvironmentId().isEmpty()) {
         environmentId_ = other.environmentId_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -585,19 +603,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getEnvironmentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 environmentId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -617,6 +635,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -693,8 +713,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -715,8 +735,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -742,8 +762,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -768,7 +788,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the environment field is set.
      */
     public boolean hasEnvironment() {
-      return environmentBuilder_ != null || environment_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -809,11 +829,11 @@ public Builder setEnvironment(com.google.cloud.dialogflow.v2.Environment value)
           throw new NullPointerException();
         }
         environment_ = value;
-        onChanged();
       } else {
         environmentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -831,11 +851,11 @@ public Builder setEnvironment(
         com.google.cloud.dialogflow.v2.Environment.Builder builderForValue) {
       if (environmentBuilder_ == null) {
         environment_ = builderForValue.build();
-        onChanged();
       } else {
         environmentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -851,19 +871,18 @@ public Builder setEnvironment(
      */
     public Builder mergeEnvironment(com.google.cloud.dialogflow.v2.Environment value) {
       if (environmentBuilder_ == null) {
-        if (environment_ != null) {
-          environment_ =
-              com.google.cloud.dialogflow.v2.Environment.newBuilder(environment_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && environment_ != null
+            && environment_ != com.google.cloud.dialogflow.v2.Environment.getDefaultInstance()) {
+          getEnvironmentBuilder().mergeFrom(value);
         } else {
           environment_ = value;
         }
-        onChanged();
       } else {
         environmentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -878,14 +897,13 @@ public Builder mergeEnvironment(com.google.cloud.dialogflow.v2.Environment value
      * </code>
      */
     public Builder clearEnvironment() {
-      if (environmentBuilder_ == null) {
-        environment_ = null;
-        onChanged();
-      } else {
-        environment_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      environment_ = null;
+      if (environmentBuilder_ != null) {
+        environmentBuilder_.dispose();
         environmentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -900,7 +918,7 @@ public Builder clearEnvironment() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.Environment.Builder getEnvironmentBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getEnvironmentFieldBuilder().getBuilder();
     }
@@ -1013,8 +1031,8 @@ public Builder setEnvironmentId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       environmentId_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1030,8 +1048,8 @@ public Builder setEnvironmentId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearEnvironmentId() {
-
       environmentId_ = getDefaultInstance().getEnvironmentId();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1052,8 +1070,8 @@ public Builder setEnvironmentIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       environmentId_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateIntentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateIntentRequest.java
index 8e7beacdf087..5e5ff2a4056f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateIntentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateIntentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Intents.CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent].
+ * The request message for
+ * [Intents.CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.CreateIntentRequest}
@@ -70,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -170,11 +173,13 @@ public com.google.cloud.dialogflow.v2.Intent getIntent() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.IntentOrBuilder getIntentOrBuilder() {
-    return getIntent();
+    return intent_ == null ? com.google.cloud.dialogflow.v2.Intent.getDefaultInstance() : intent_;
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -231,7 +236,7 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
   }
 
   public static final int INTENT_VIEW_FIELD_NUMBER = 4;
-  private int intentView_;
+  private int intentView_ = 0;
   /**
    *
    *
@@ -264,9 +269,8 @@ public int getIntentViewValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.IntentView getIntentView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.IntentView result =
-        com.google.cloud.dialogflow.v2.IntentView.valueOf(intentView_);
+        com.google.cloud.dialogflow.v2.IntentView.forNumber(intentView_);
     return result == null ? com.google.cloud.dialogflow.v2.IntentView.UNRECOGNIZED : result;
   }
 
@@ -467,7 +471,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Intents.CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent].
+   * The request message for
+   * [Intents.CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.CreateIntentRequest}
@@ -501,18 +506,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (intentBuilder_ == null) {
-        intent_ = null;
-      } else {
-        intent_ = null;
+      intent_ = null;
+      if (intentBuilder_ != null) {
+        intentBuilder_.dispose();
         intentBuilder_ = null;
       }
       languageCode_ = "";
-
       intentView_ = 0;
-
       return this;
     }
 
@@ -540,18 +542,29 @@ public com.google.cloud.dialogflow.v2.CreateIntentRequest build() {
     public com.google.cloud.dialogflow.v2.CreateIntentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.CreateIntentRequest result =
           new com.google.cloud.dialogflow.v2.CreateIntentRequest(this);
-      result.parent_ = parent_;
-      if (intentBuilder_ == null) {
-        result.intent_ = intent_;
-      } else {
-        result.intent_ = intentBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.languageCode_ = languageCode_;
-      result.intentView_ = intentView_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.CreateIntentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.intent_ = intentBuilder_ == null ? intent_ : intentBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.intentView_ = intentView_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -600,6 +613,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.CreateIntentRequest othe
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasIntent()) {
@@ -607,6 +621,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.CreateIntentRequest othe
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.intentView_ != 0) {
@@ -641,25 +656,25 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getIntentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 32:
               {
                 intentView_ = input.readEnum();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 32
             default:
@@ -679,6 +694,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -749,8 +766,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -769,8 +786,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -794,8 +811,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -820,7 +837,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the intent field is set.
      */
     public boolean hasIntent() {
-      return intentBuilder_ != null || intent_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -861,11 +878,11 @@ public Builder setIntent(com.google.cloud.dialogflow.v2.Intent value) {
           throw new NullPointerException();
         }
         intent_ = value;
-        onChanged();
       } else {
         intentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -882,11 +899,11 @@ public Builder setIntent(com.google.cloud.dialogflow.v2.Intent value) {
     public Builder setIntent(com.google.cloud.dialogflow.v2.Intent.Builder builderForValue) {
       if (intentBuilder_ == null) {
         intent_ = builderForValue.build();
-        onChanged();
       } else {
         intentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -902,19 +919,18 @@ public Builder setIntent(com.google.cloud.dialogflow.v2.Intent.Builder builderFo
      */
     public Builder mergeIntent(com.google.cloud.dialogflow.v2.Intent value) {
       if (intentBuilder_ == null) {
-        if (intent_ != null) {
-          intent_ =
-              com.google.cloud.dialogflow.v2.Intent.newBuilder(intent_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && intent_ != null
+            && intent_ != com.google.cloud.dialogflow.v2.Intent.getDefaultInstance()) {
+          getIntentBuilder().mergeFrom(value);
         } else {
           intent_ = value;
         }
-        onChanged();
       } else {
         intentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -929,14 +945,13 @@ public Builder mergeIntent(com.google.cloud.dialogflow.v2.Intent value) {
      * </code>
      */
     public Builder clearIntent() {
-      if (intentBuilder_ == null) {
-        intent_ = null;
-        onChanged();
-      } else {
-        intent_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      intent_ = null;
+      if (intentBuilder_ != null) {
+        intentBuilder_.dispose();
         intentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -951,7 +966,7 @@ public Builder clearIntent() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.Intent.Builder getIntentBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getIntentFieldBuilder().getBuilder();
     }
@@ -1076,8 +1091,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1097,8 +1112,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1123,8 +1138,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1162,8 +1177,8 @@ public int getIntentViewValue() {
      * @return This builder for chaining.
      */
     public Builder setIntentViewValue(int value) {
-
       intentView_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1182,9 +1197,8 @@ public Builder setIntentViewValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.IntentView getIntentView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.IntentView result =
-          com.google.cloud.dialogflow.v2.IntentView.valueOf(intentView_);
+          com.google.cloud.dialogflow.v2.IntentView.forNumber(intentView_);
       return result == null ? com.google.cloud.dialogflow.v2.IntentView.UNRECOGNIZED : result;
     }
     /**
@@ -1205,7 +1219,7 @@ public Builder setIntentView(com.google.cloud.dialogflow.v2.IntentView value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000008;
       intentView_ = value.getNumber();
       onChanged();
       return this;
@@ -1224,7 +1238,7 @@ public Builder setIntentView(com.google.cloud.dialogflow.v2.IntentView value) {
      * @return This builder for chaining.
      */
     public Builder clearIntentView() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       intentView_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateKnowledgeBaseRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateKnowledgeBaseRequest.java
index d2eacaa0b51a..aefb62e0ff53 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateKnowledgeBaseRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateKnowledgeBaseRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * Request message for [KnowledgeBases.CreateKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.CreateKnowledgeBase].
+ * Request message for
+ * [KnowledgeBases.CreateKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.CreateKnowledgeBase].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.CreateKnowledgeBaseRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -173,7 +176,9 @@ public com.google.cloud.dialogflow.v2.KnowledgeBase getKnowledgeBase() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.KnowledgeBaseOrBuilder getKnowledgeBaseOrBuilder() {
-    return getKnowledgeBase();
+    return knowledgeBase_ == null
+        ? com.google.cloud.dialogflow.v2.KnowledgeBase.getDefaultInstance()
+        : knowledgeBase_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -354,7 +359,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Request message for [KnowledgeBases.CreateKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.CreateKnowledgeBase].
+   * Request message for
+   * [KnowledgeBases.CreateKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.CreateKnowledgeBase].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.CreateKnowledgeBaseRequest}
@@ -388,12 +394,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (knowledgeBaseBuilder_ == null) {
-        knowledgeBase_ = null;
-      } else {
-        knowledgeBase_ = null;
+      knowledgeBase_ = null;
+      if (knowledgeBaseBuilder_ != null) {
+        knowledgeBaseBuilder_.dispose();
         knowledgeBaseBuilder_ = null;
       }
       return this;
@@ -423,16 +428,24 @@ public com.google.cloud.dialogflow.v2.CreateKnowledgeBaseRequest build() {
     public com.google.cloud.dialogflow.v2.CreateKnowledgeBaseRequest buildPartial() {
       com.google.cloud.dialogflow.v2.CreateKnowledgeBaseRequest result =
           new com.google.cloud.dialogflow.v2.CreateKnowledgeBaseRequest(this);
-      result.parent_ = parent_;
-      if (knowledgeBaseBuilder_ == null) {
-        result.knowledgeBase_ = knowledgeBase_;
-      } else {
-        result.knowledgeBase_ = knowledgeBaseBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.CreateKnowledgeBaseRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.knowledgeBase_ =
+            knowledgeBaseBuilder_ == null ? knowledgeBase_ : knowledgeBaseBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -481,6 +494,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.CreateKnowledgeBaseReque
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasKnowledgeBase()) {
@@ -515,13 +529,13 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getKnowledgeBaseFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -541,6 +555,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -611,8 +627,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -631,8 +647,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -656,8 +672,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -682,7 +698,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the knowledgeBase field is set.
      */
     public boolean hasKnowledgeBase() {
-      return knowledgeBaseBuilder_ != null || knowledgeBase_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -723,11 +739,11 @@ public Builder setKnowledgeBase(com.google.cloud.dialogflow.v2.KnowledgeBase val
           throw new NullPointerException();
         }
         knowledgeBase_ = value;
-        onChanged();
       } else {
         knowledgeBaseBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -745,11 +761,11 @@ public Builder setKnowledgeBase(
         com.google.cloud.dialogflow.v2.KnowledgeBase.Builder builderForValue) {
       if (knowledgeBaseBuilder_ == null) {
         knowledgeBase_ = builderForValue.build();
-        onChanged();
       } else {
         knowledgeBaseBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -765,19 +781,19 @@ public Builder setKnowledgeBase(
      */
     public Builder mergeKnowledgeBase(com.google.cloud.dialogflow.v2.KnowledgeBase value) {
       if (knowledgeBaseBuilder_ == null) {
-        if (knowledgeBase_ != null) {
-          knowledgeBase_ =
-              com.google.cloud.dialogflow.v2.KnowledgeBase.newBuilder(knowledgeBase_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && knowledgeBase_ != null
+            && knowledgeBase_
+                != com.google.cloud.dialogflow.v2.KnowledgeBase.getDefaultInstance()) {
+          getKnowledgeBaseBuilder().mergeFrom(value);
         } else {
           knowledgeBase_ = value;
         }
-        onChanged();
       } else {
         knowledgeBaseBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -792,14 +808,13 @@ public Builder mergeKnowledgeBase(com.google.cloud.dialogflow.v2.KnowledgeBase v
      * </code>
      */
     public Builder clearKnowledgeBase() {
-      if (knowledgeBaseBuilder_ == null) {
-        knowledgeBase_ = null;
-        onChanged();
-      } else {
-        knowledgeBase_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      knowledgeBase_ = null;
+      if (knowledgeBaseBuilder_ != null) {
+        knowledgeBaseBuilder_.dispose();
         knowledgeBaseBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -814,7 +829,7 @@ public Builder clearKnowledgeBase() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.KnowledgeBase.Builder getKnowledgeBaseBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getKnowledgeBaseFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateParticipantRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateParticipantRequest.java
index f5018c1750fd..200a4179dc94 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateParticipantRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateParticipantRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Participants.CreateParticipant][google.cloud.dialogflow.v2.Participants.CreateParticipant].
+ * The request message for
+ * [Participants.CreateParticipant][google.cloud.dialogflow.v2.Participants.CreateParticipant].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.CreateParticipantRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -175,7 +178,9 @@ public com.google.cloud.dialogflow.v2.Participant getParticipant() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.ParticipantOrBuilder getParticipantOrBuilder() {
-    return getParticipant();
+    return participant_ == null
+        ? com.google.cloud.dialogflow.v2.Participant.getDefaultInstance()
+        : participant_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -356,7 +361,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Participants.CreateParticipant][google.cloud.dialogflow.v2.Participants.CreateParticipant].
+   * The request message for
+   * [Participants.CreateParticipant][google.cloud.dialogflow.v2.Participants.CreateParticipant].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.CreateParticipantRequest}
@@ -390,12 +396,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (participantBuilder_ == null) {
-        participant_ = null;
-      } else {
-        participant_ = null;
+      participant_ = null;
+      if (participantBuilder_ != null) {
+        participantBuilder_.dispose();
         participantBuilder_ = null;
       }
       return this;
@@ -425,16 +430,24 @@ public com.google.cloud.dialogflow.v2.CreateParticipantRequest build() {
     public com.google.cloud.dialogflow.v2.CreateParticipantRequest buildPartial() {
       com.google.cloud.dialogflow.v2.CreateParticipantRequest result =
           new com.google.cloud.dialogflow.v2.CreateParticipantRequest(this);
-      result.parent_ = parent_;
-      if (participantBuilder_ == null) {
-        result.participant_ = participant_;
-      } else {
-        result.participant_ = participantBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.CreateParticipantRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.participant_ =
+            participantBuilder_ == null ? participant_ : participantBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -483,6 +496,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.CreateParticipantRequest
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasParticipant()) {
@@ -517,13 +531,13 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getParticipantFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -543,6 +557,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -616,8 +632,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -637,8 +653,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -663,8 +679,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -689,7 +705,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the participant field is set.
      */
     public boolean hasParticipant() {
-      return participantBuilder_ != null || participant_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -730,11 +746,11 @@ public Builder setParticipant(com.google.cloud.dialogflow.v2.Participant value)
           throw new NullPointerException();
         }
         participant_ = value;
-        onChanged();
       } else {
         participantBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -752,11 +768,11 @@ public Builder setParticipant(
         com.google.cloud.dialogflow.v2.Participant.Builder builderForValue) {
       if (participantBuilder_ == null) {
         participant_ = builderForValue.build();
-        onChanged();
       } else {
         participantBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -772,19 +788,18 @@ public Builder setParticipant(
      */
     public Builder mergeParticipant(com.google.cloud.dialogflow.v2.Participant value) {
       if (participantBuilder_ == null) {
-        if (participant_ != null) {
-          participant_ =
-              com.google.cloud.dialogflow.v2.Participant.newBuilder(participant_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && participant_ != null
+            && participant_ != com.google.cloud.dialogflow.v2.Participant.getDefaultInstance()) {
+          getParticipantBuilder().mergeFrom(value);
         } else {
           participant_ = value;
         }
-        onChanged();
       } else {
         participantBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -799,14 +814,13 @@ public Builder mergeParticipant(com.google.cloud.dialogflow.v2.Participant value
      * </code>
      */
     public Builder clearParticipant() {
-      if (participantBuilder_ == null) {
-        participant_ = null;
-        onChanged();
-      } else {
-        participant_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      participant_ = null;
+      if (participantBuilder_ != null) {
+        participantBuilder_.dispose();
         participantBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -821,7 +835,7 @@ public Builder clearParticipant() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.Participant.Builder getParticipantBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getParticipantFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateSessionEntityTypeRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateSessionEntityTypeRequest.java
index be7d24d2e3c9..2324180ae1a1 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateSessionEntityTypeRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateSessionEntityTypeRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [SessionEntityTypes.CreateSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.CreateSessionEntityType].
+ * The request message for
+ * [SessionEntityTypes.CreateSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.CreateSessionEntityType].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest}
@@ -69,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -182,7 +185,9 @@ public com.google.cloud.dialogflow.v2.SessionEntityType getSessionEntityType() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.SessionEntityTypeOrBuilder getSessionEntityTypeOrBuilder() {
-    return getSessionEntityType();
+    return sessionEntityType_ == null
+        ? com.google.cloud.dialogflow.v2.SessionEntityType.getDefaultInstance()
+        : sessionEntityType_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -363,7 +368,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [SessionEntityTypes.CreateSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.CreateSessionEntityType].
+   * The request message for
+   * [SessionEntityTypes.CreateSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.CreateSessionEntityType].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest}
@@ -397,12 +403,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (sessionEntityTypeBuilder_ == null) {
-        sessionEntityType_ = null;
-      } else {
-        sessionEntityType_ = null;
+      sessionEntityType_ = null;
+      if (sessionEntityTypeBuilder_ != null) {
+        sessionEntityTypeBuilder_.dispose();
         sessionEntityTypeBuilder_ = null;
       }
       return this;
@@ -433,16 +438,27 @@ public com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest build() {
     public com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest result =
           new com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest(this);
-      result.parent_ = parent_;
-      if (sessionEntityTypeBuilder_ == null) {
-        result.sessionEntityType_ = sessionEntityType_;
-      } else {
-        result.sessionEntityType_ = sessionEntityTypeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.sessionEntityType_ =
+            sessionEntityTypeBuilder_ == null
+                ? sessionEntityType_
+                : sessionEntityTypeBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -492,6 +508,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.CreateSessionEntityTypeR
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasSessionEntityType()) {
@@ -526,14 +543,14 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(
                     getSessionEntityTypeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -553,6 +570,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -635,8 +654,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -659,8 +678,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -688,8 +707,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -714,7 +733,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the sessionEntityType field is set.
      */
     public boolean hasSessionEntityType() {
-      return sessionEntityTypeBuilder_ != null || sessionEntityType_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -755,11 +774,11 @@ public Builder setSessionEntityType(com.google.cloud.dialogflow.v2.SessionEntity
           throw new NullPointerException();
         }
         sessionEntityType_ = value;
-        onChanged();
       } else {
         sessionEntityTypeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -777,11 +796,11 @@ public Builder setSessionEntityType(
         com.google.cloud.dialogflow.v2.SessionEntityType.Builder builderForValue) {
       if (sessionEntityTypeBuilder_ == null) {
         sessionEntityType_ = builderForValue.build();
-        onChanged();
       } else {
         sessionEntityTypeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -797,19 +816,19 @@ public Builder setSessionEntityType(
      */
     public Builder mergeSessionEntityType(com.google.cloud.dialogflow.v2.SessionEntityType value) {
       if (sessionEntityTypeBuilder_ == null) {
-        if (sessionEntityType_ != null) {
-          sessionEntityType_ =
-              com.google.cloud.dialogflow.v2.SessionEntityType.newBuilder(sessionEntityType_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && sessionEntityType_ != null
+            && sessionEntityType_
+                != com.google.cloud.dialogflow.v2.SessionEntityType.getDefaultInstance()) {
+          getSessionEntityTypeBuilder().mergeFrom(value);
         } else {
           sessionEntityType_ = value;
         }
-        onChanged();
       } else {
         sessionEntityTypeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -824,14 +843,13 @@ public Builder mergeSessionEntityType(com.google.cloud.dialogflow.v2.SessionEnti
      * </code>
      */
     public Builder clearSessionEntityType() {
-      if (sessionEntityTypeBuilder_ == null) {
-        sessionEntityType_ = null;
-        onChanged();
-      } else {
-        sessionEntityType_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      sessionEntityType_ = null;
+      if (sessionEntityTypeBuilder_ != null) {
+        sessionEntityTypeBuilder_.dispose();
         sessionEntityTypeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -846,7 +864,7 @@ public Builder clearSessionEntityType() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.SessionEntityType.Builder getSessionEntityTypeBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getSessionEntityTypeFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateVersionRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateVersionRequest.java
index 4252142070c9..c2dfef4ca898 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateVersionRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateVersionRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Versions.CreateVersion][google.cloud.dialogflow.v2.Versions.CreateVersion].
+ * The request message for
+ * [Versions.CreateVersion][google.cloud.dialogflow.v2.Versions.CreateVersion].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.CreateVersionRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -177,7 +180,9 @@ public com.google.cloud.dialogflow.v2.Version getVersion() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.VersionOrBuilder getVersionOrBuilder() {
-    return getVersion();
+    return version_ == null
+        ? com.google.cloud.dialogflow.v2.Version.getDefaultInstance()
+        : version_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -357,7 +362,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Versions.CreateVersion][google.cloud.dialogflow.v2.Versions.CreateVersion].
+   * The request message for
+   * [Versions.CreateVersion][google.cloud.dialogflow.v2.Versions.CreateVersion].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.CreateVersionRequest}
@@ -391,12 +397,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (versionBuilder_ == null) {
-        version_ = null;
-      } else {
-        version_ = null;
+      version_ = null;
+      if (versionBuilder_ != null) {
+        versionBuilder_.dispose();
         versionBuilder_ = null;
       }
       return this;
@@ -426,16 +431,23 @@ public com.google.cloud.dialogflow.v2.CreateVersionRequest build() {
     public com.google.cloud.dialogflow.v2.CreateVersionRequest buildPartial() {
       com.google.cloud.dialogflow.v2.CreateVersionRequest result =
           new com.google.cloud.dialogflow.v2.CreateVersionRequest(this);
-      result.parent_ = parent_;
-      if (versionBuilder_ == null) {
-        result.version_ = version_;
-      } else {
-        result.version_ = versionBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.CreateVersionRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.version_ = versionBuilder_ == null ? version_ : versionBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -484,6 +496,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.CreateVersionRequest oth
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasVersion()) {
@@ -518,13 +531,13 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getVersionFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -544,6 +557,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -620,8 +635,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -642,8 +657,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -669,8 +684,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -695,7 +710,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the version field is set.
      */
     public boolean hasVersion() {
-      return versionBuilder_ != null || version_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -736,11 +751,11 @@ public Builder setVersion(com.google.cloud.dialogflow.v2.Version value) {
           throw new NullPointerException();
         }
         version_ = value;
-        onChanged();
       } else {
         versionBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -757,11 +772,11 @@ public Builder setVersion(com.google.cloud.dialogflow.v2.Version value) {
     public Builder setVersion(com.google.cloud.dialogflow.v2.Version.Builder builderForValue) {
       if (versionBuilder_ == null) {
         version_ = builderForValue.build();
-        onChanged();
       } else {
         versionBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -777,19 +792,18 @@ public Builder setVersion(com.google.cloud.dialogflow.v2.Version.Builder builder
      */
     public Builder mergeVersion(com.google.cloud.dialogflow.v2.Version value) {
       if (versionBuilder_ == null) {
-        if (version_ != null) {
-          version_ =
-              com.google.cloud.dialogflow.v2.Version.newBuilder(version_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && version_ != null
+            && version_ != com.google.cloud.dialogflow.v2.Version.getDefaultInstance()) {
+          getVersionBuilder().mergeFrom(value);
         } else {
           version_ = value;
         }
-        onChanged();
       } else {
         versionBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -804,14 +818,13 @@ public Builder mergeVersion(com.google.cloud.dialogflow.v2.Version value) {
      * </code>
      */
     public Builder clearVersion() {
-      if (versionBuilder_ == null) {
-        version_ = null;
-        onChanged();
-      } else {
-        version_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      version_ = null;
+      if (versionBuilder_ != null) {
+        versionBuilder_.dispose();
         versionBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -826,7 +839,7 @@ public Builder clearVersion() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.Version.Builder getVersionBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getVersionFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteAgentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteAgentRequest.java
index a2d4f31ecfa4..d00a65851862 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteAgentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteAgentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Agents.DeleteAgent][google.cloud.dialogflow.v2.Agents.DeleteAgent].
+ * The request message for
+ * [Agents.DeleteAgent][google.cloud.dialogflow.v2.Agents.DeleteAgent].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.DeleteAgentRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -285,7 +288,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Agents.DeleteAgent][google.cloud.dialogflow.v2.Agents.DeleteAgent].
+   * The request message for
+   * [Agents.DeleteAgent][google.cloud.dialogflow.v2.Agents.DeleteAgent].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.DeleteAgentRequest}
@@ -319,8 +323,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       return this;
     }
 
@@ -348,11 +352,20 @@ public com.google.cloud.dialogflow.v2.DeleteAgentRequest build() {
     public com.google.cloud.dialogflow.v2.DeleteAgentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.DeleteAgentRequest result =
           new com.google.cloud.dialogflow.v2.DeleteAgentRequest(this);
-      result.parent_ = parent_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.DeleteAgentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -401,6 +414,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.DeleteAgentRequest other
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -432,7 +446,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -452,6 +466,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -522,8 +538,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -542,8 +558,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -567,8 +583,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteAllContextsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteAllContextsRequest.java
index 747904ea006d..9b09e2c2a5c6 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteAllContextsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteAllContextsRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Contexts.DeleteAllContexts][google.cloud.dialogflow.v2.Contexts.DeleteAllContexts].
+ * The request message for
+ * [Contexts.DeleteAllContexts][google.cloud.dialogflow.v2.Contexts.DeleteAllContexts].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.DeleteAllContextsRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -294,7 +297,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Contexts.DeleteAllContexts][google.cloud.dialogflow.v2.Contexts.DeleteAllContexts].
+   * The request message for
+   * [Contexts.DeleteAllContexts][google.cloud.dialogflow.v2.Contexts.DeleteAllContexts].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.DeleteAllContextsRequest}
@@ -328,8 +332,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       return this;
     }
 
@@ -357,11 +361,20 @@ public com.google.cloud.dialogflow.v2.DeleteAllContextsRequest build() {
     public com.google.cloud.dialogflow.v2.DeleteAllContextsRequest buildPartial() {
       com.google.cloud.dialogflow.v2.DeleteAllContextsRequest result =
           new com.google.cloud.dialogflow.v2.DeleteAllContextsRequest(this);
-      result.parent_ = parent_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.DeleteAllContextsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -410,6 +423,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.DeleteAllContextsRequest
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -441,7 +455,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -461,6 +475,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -543,8 +559,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -567,8 +583,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -596,8 +612,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteContextRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteContextRequest.java
index a839542dfdd0..8e1157eb4496 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteContextRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteContextRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Contexts.DeleteContext][google.cloud.dialogflow.v2.Contexts.DeleteContext].
+ * The request message for
+ * [Contexts.DeleteContext][google.cloud.dialogflow.v2.Contexts.DeleteContext].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.DeleteContextRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -293,7 +296,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Contexts.DeleteContext][google.cloud.dialogflow.v2.Contexts.DeleteContext].
+   * The request message for
+   * [Contexts.DeleteContext][google.cloud.dialogflow.v2.Contexts.DeleteContext].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.DeleteContextRequest}
@@ -327,8 +331,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -356,11 +360,20 @@ public com.google.cloud.dialogflow.v2.DeleteContextRequest build() {
     public com.google.cloud.dialogflow.v2.DeleteContextRequest buildPartial() {
       com.google.cloud.dialogflow.v2.DeleteContextRequest result =
           new com.google.cloud.dialogflow.v2.DeleteContextRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.DeleteContextRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -409,6 +422,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.DeleteContextRequest oth
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -440,7 +454,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -460,6 +474,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -542,8 +558,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -566,8 +582,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -595,8 +611,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteConversationDatasetRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteConversationDatasetRequest.java
index d0c23d19aed3..1a60c1b1cd17 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteConversationDatasetRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteConversationDatasetRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -325,8 +327,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -355,11 +357,21 @@ public com.google.cloud.dialogflow.v2.DeleteConversationDatasetRequest build() {
     public com.google.cloud.dialogflow.v2.DeleteConversationDatasetRequest buildPartial() {
       com.google.cloud.dialogflow.v2.DeleteConversationDatasetRequest result =
           new com.google.cloud.dialogflow.v2.DeleteConversationDatasetRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.DeleteConversationDatasetRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -410,6 +422,7 @@ public Builder mergeFrom(
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -441,7 +454,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -461,6 +474,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -534,8 +549,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -555,8 +570,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -581,8 +596,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteConversationModelOperationMetadata.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteConversationModelOperationMetadata.java
index b875beda475e..8637d3c3174b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteConversationModelOperationMetadata.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteConversationModelOperationMetadata.java
@@ -22,7 +22,9 @@
  *
  *
  * <pre>
- * Metadata for a [ConversationModels.DeleteConversationModel][google.cloud.dialogflow.v2.ConversationModels.DeleteConversationModel] operation.
+ * Metadata for a
+ * [ConversationModels.DeleteConversationModel][google.cloud.dialogflow.v2.ConversationModels.DeleteConversationModel]
+ * operation.
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata}
@@ -70,7 +72,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_MODEL_FIELD_NUMBER = 1;
-  private volatile java.lang.Object conversationModel_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversationModel_ = "";
   /**
    *
    *
@@ -166,7 +170,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -348,7 +352,9 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Metadata for a [ConversationModels.DeleteConversationModel][google.cloud.dialogflow.v2.ConversationModels.DeleteConversationModel] operation.
+   * Metadata for a
+   * [ConversationModels.DeleteConversationModel][google.cloud.dialogflow.v2.ConversationModels.DeleteConversationModel]
+   * operation.
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata}
@@ -384,12 +390,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       conversationModel_ = "";
-
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
       return this;
@@ -422,16 +427,24 @@ public com.google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata b
     public com.google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata buildPartial() {
       com.google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata result =
           new com.google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata(this);
-      result.conversationModel_ = conversationModel_;
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversationModel_ = conversationModel_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -484,6 +497,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getConversationModel().isEmpty()) {
         conversationModel_ = other.conversationModel_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasCreateTime()) {
@@ -518,13 +532,13 @@ public Builder mergeFrom(
             case 10:
               {
                 conversationModel_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 26:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 26
             default:
@@ -544,6 +558,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object conversationModel_ = "";
     /**
      *
@@ -608,8 +624,8 @@ public Builder setConversationModel(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversationModel_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -626,8 +642,8 @@ public Builder setConversationModel(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationModel() {
-
       conversationModel_ = getDefaultInstance().getConversationModel();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -649,8 +665,8 @@ public Builder setConversationModelBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversationModel_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -674,7 +690,7 @@ public Builder setConversationModelBytes(com.google.protobuf.ByteString value) {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -713,11 +729,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -733,11 +749,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -752,17 +768,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
         } else {
           createTime_ = value;
         }
-        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -776,14 +793,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * <code>.google.protobuf.Timestamp create_time = 3;</code>
      */
     public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -797,7 +813,7 @@ public Builder clearCreateTime() {
      * <code>.google.protobuf.Timestamp create_time = 3;</code>
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteConversationModelRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteConversationModelRequest.java
index 460646dd922c..01a684c2c094 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteConversationModelRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteConversationModelRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -319,8 +321,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -349,11 +351,21 @@ public com.google.cloud.dialogflow.v2.DeleteConversationModelRequest build() {
     public com.google.cloud.dialogflow.v2.DeleteConversationModelRequest buildPartial() {
       com.google.cloud.dialogflow.v2.DeleteConversationModelRequest result =
           new com.google.cloud.dialogflow.v2.DeleteConversationModelRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.DeleteConversationModelRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -403,6 +415,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.DeleteConversationModelR
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -434,7 +447,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -454,6 +467,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -518,8 +533,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -536,8 +551,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -559,8 +574,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteConversationProfileRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteConversationProfileRequest.java
index f28e8c57f6a5..f1a1486df25d 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteConversationProfileRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteConversationProfileRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [ConversationProfiles.DeleteConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.DeleteConversationProfile].
+ * The request message for
+ * [ConversationProfiles.DeleteConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.DeleteConversationProfile].
  * This operation fails if the conversation profile is still referenced from
  * a phone number.
  * </pre>
@@ -71,7 +72,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -291,7 +294,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [ConversationProfiles.DeleteConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.DeleteConversationProfile].
+   * The request message for
+   * [ConversationProfiles.DeleteConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.DeleteConversationProfile].
    * This operation fails if the conversation profile is still referenced from
    * a phone number.
    * </pre>
@@ -327,8 +331,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -357,11 +361,21 @@ public com.google.cloud.dialogflow.v2.DeleteConversationProfileRequest build() {
     public com.google.cloud.dialogflow.v2.DeleteConversationProfileRequest buildPartial() {
       com.google.cloud.dialogflow.v2.DeleteConversationProfileRequest result =
           new com.google.cloud.dialogflow.v2.DeleteConversationProfileRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.DeleteConversationProfileRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -412,6 +426,7 @@ public Builder mergeFrom(
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -443,7 +458,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -463,6 +478,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -536,8 +553,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -557,8 +574,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -583,8 +600,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteDocumentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteDocumentRequest.java
index 7c0b41b45c33..a3b556b82378 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteDocumentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteDocumentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * Request message for [Documents.DeleteDocument][google.cloud.dialogflow.v2.Documents.DeleteDocument].
+ * Request message for
+ * [Documents.DeleteDocument][google.cloud.dialogflow.v2.Documents.DeleteDocument].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.DeleteDocumentRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -287,7 +290,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Request message for [Documents.DeleteDocument][google.cloud.dialogflow.v2.Documents.DeleteDocument].
+   * Request message for
+   * [Documents.DeleteDocument][google.cloud.dialogflow.v2.Documents.DeleteDocument].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.DeleteDocumentRequest}
@@ -321,8 +325,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -350,11 +354,20 @@ public com.google.cloud.dialogflow.v2.DeleteDocumentRequest build() {
     public com.google.cloud.dialogflow.v2.DeleteDocumentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.DeleteDocumentRequest result =
           new com.google.cloud.dialogflow.v2.DeleteDocumentRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.DeleteDocumentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -403,6 +416,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.DeleteDocumentRequest ot
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -434,7 +448,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -454,6 +468,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -527,8 +543,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -548,8 +564,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -574,8 +590,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteEntityTypeRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteEntityTypeRequest.java
index f1c7a2885a7e..52ed72f99bdd 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteEntityTypeRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteEntityTypeRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [EntityTypes.DeleteEntityType][google.cloud.dialogflow.v2.EntityTypes.DeleteEntityType].
+ * The request message for
+ * [EntityTypes.DeleteEntityType][google.cloud.dialogflow.v2.EntityTypes.DeleteEntityType].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.DeleteEntityTypeRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -286,7 +289,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [EntityTypes.DeleteEntityType][google.cloud.dialogflow.v2.EntityTypes.DeleteEntityType].
+   * The request message for
+   * [EntityTypes.DeleteEntityType][google.cloud.dialogflow.v2.EntityTypes.DeleteEntityType].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.DeleteEntityTypeRequest}
@@ -320,8 +324,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -349,11 +353,20 @@ public com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest build() {
     public com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest result =
           new com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -402,6 +415,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -433,7 +447,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -453,6 +467,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -523,8 +539,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -543,8 +559,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -568,8 +584,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteEnvironmentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteEnvironmentRequest.java
index f31b4107ba38..7d948329e3e7 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteEnvironmentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteEnvironmentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Environments.DeleteEnvironment][google.cloud.dialogflow.v2.Environments.DeleteEnvironment].
+ * The request message for
+ * [Environments.DeleteEnvironment][google.cloud.dialogflow.v2.Environments.DeleteEnvironment].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.DeleteEnvironmentRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -294,7 +297,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Environments.DeleteEnvironment][google.cloud.dialogflow.v2.Environments.DeleteEnvironment].
+   * The request message for
+   * [Environments.DeleteEnvironment][google.cloud.dialogflow.v2.Environments.DeleteEnvironment].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.DeleteEnvironmentRequest}
@@ -328,8 +332,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -357,11 +361,20 @@ public com.google.cloud.dialogflow.v2.DeleteEnvironmentRequest build() {
     public com.google.cloud.dialogflow.v2.DeleteEnvironmentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.DeleteEnvironmentRequest result =
           new com.google.cloud.dialogflow.v2.DeleteEnvironmentRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.DeleteEnvironmentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -410,6 +423,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.DeleteEnvironmentRequest
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -441,7 +455,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -461,6 +475,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -543,8 +559,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -567,8 +583,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -596,8 +612,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteIntentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteIntentRequest.java
index 29c17b2769df..15b1adc9c6f0 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteIntentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteIntentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Intents.DeleteIntent][google.cloud.dialogflow.v2.Intents.DeleteIntent].
+ * The request message for
+ * [Intents.DeleteIntent][google.cloud.dialogflow.v2.Intents.DeleteIntent].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.DeleteIntentRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -287,7 +290,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Intents.DeleteIntent][google.cloud.dialogflow.v2.Intents.DeleteIntent].
+   * The request message for
+   * [Intents.DeleteIntent][google.cloud.dialogflow.v2.Intents.DeleteIntent].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.DeleteIntentRequest}
@@ -321,8 +325,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -350,11 +354,20 @@ public com.google.cloud.dialogflow.v2.DeleteIntentRequest build() {
     public com.google.cloud.dialogflow.v2.DeleteIntentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.DeleteIntentRequest result =
           new com.google.cloud.dialogflow.v2.DeleteIntentRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.DeleteIntentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -403,6 +416,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.DeleteIntentRequest othe
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -434,7 +448,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -454,6 +468,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -527,8 +543,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -548,8 +564,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -574,8 +590,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteKnowledgeBaseRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteKnowledgeBaseRequest.java
index 99a32e1a9d64..6bff030054ff 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteKnowledgeBaseRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteKnowledgeBaseRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * Request message for [KnowledgeBases.DeleteKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.DeleteKnowledgeBase].
+ * Request message for
+ * [KnowledgeBases.DeleteKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.DeleteKnowledgeBase].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.DeleteKnowledgeBaseRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -125,7 +128,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int FORCE_FIELD_NUMBER = 2;
-  private boolean force_;
+  private boolean force_ = false;
   /**
    *
    *
@@ -316,7 +319,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Request message for [KnowledgeBases.DeleteKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.DeleteKnowledgeBase].
+   * Request message for
+   * [KnowledgeBases.DeleteKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.DeleteKnowledgeBase].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.DeleteKnowledgeBaseRequest}
@@ -350,10 +354,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       force_ = false;
-
       return this;
     }
 
@@ -381,12 +384,23 @@ public com.google.cloud.dialogflow.v2.DeleteKnowledgeBaseRequest build() {
     public com.google.cloud.dialogflow.v2.DeleteKnowledgeBaseRequest buildPartial() {
       com.google.cloud.dialogflow.v2.DeleteKnowledgeBaseRequest result =
           new com.google.cloud.dialogflow.v2.DeleteKnowledgeBaseRequest(this);
-      result.name_ = name_;
-      result.force_ = force_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.DeleteKnowledgeBaseRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.force_ = force_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -435,6 +449,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.DeleteKnowledgeBaseReque
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getForce() != false) {
@@ -469,13 +484,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 force_ = input.readBool();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             default:
@@ -495,6 +510,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -568,8 +585,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -589,8 +606,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -615,8 +632,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -654,6 +671,7 @@ public boolean getForce() {
     public Builder setForce(boolean value) {
 
       force_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -670,7 +688,7 @@ public Builder setForce(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearForce() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       force_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteSessionEntityTypeRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteSessionEntityTypeRequest.java
index abdb97f96804..55676d5778c4 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteSessionEntityTypeRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteSessionEntityTypeRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [SessionEntityTypes.DeleteSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.DeleteSessionEntityType].
+ * The request message for
+ * [SessionEntityTypes.DeleteSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.DeleteSessionEntityType].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest}
@@ -69,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -297,7 +300,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [SessionEntityTypes.DeleteSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.DeleteSessionEntityType].
+   * The request message for
+   * [SessionEntityTypes.DeleteSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.DeleteSessionEntityType].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest}
@@ -331,8 +335,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -361,11 +365,21 @@ public com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest build() {
     public com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest result =
           new com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -415,6 +429,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeR
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -446,7 +461,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -466,6 +481,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -551,8 +568,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -576,8 +593,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -606,8 +623,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteVersionRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteVersionRequest.java
index 287204721871..0e4800ff7f27 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteVersionRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteVersionRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Versions.DeleteVersion][google.cloud.dialogflow.v2.Versions.DeleteVersion].
+ * The request message for
+ * [Versions.DeleteVersion][google.cloud.dialogflow.v2.Versions.DeleteVersion].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.DeleteVersionRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -291,7 +294,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Versions.DeleteVersion][google.cloud.dialogflow.v2.Versions.DeleteVersion].
+   * The request message for
+   * [Versions.DeleteVersion][google.cloud.dialogflow.v2.Versions.DeleteVersion].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.DeleteVersionRequest}
@@ -325,8 +329,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -354,11 +358,20 @@ public com.google.cloud.dialogflow.v2.DeleteVersionRequest build() {
     public com.google.cloud.dialogflow.v2.DeleteVersionRequest buildPartial() {
       com.google.cloud.dialogflow.v2.DeleteVersionRequest result =
           new com.google.cloud.dialogflow.v2.DeleteVersionRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.DeleteVersionRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -407,6 +420,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.DeleteVersionRequest oth
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -438,7 +452,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -458,6 +472,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -537,8 +553,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -560,8 +576,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -588,8 +604,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeployConversationModelOperationMetadata.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeployConversationModelOperationMetadata.java
index 60a5e55894be..7739afce4976 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeployConversationModelOperationMetadata.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeployConversationModelOperationMetadata.java
@@ -22,7 +22,9 @@
  *
  *
  * <pre>
- * Metadata for a [ConversationModels.DeployConversationModel][google.cloud.dialogflow.v2.ConversationModels.DeployConversationModel] operation.
+ * Metadata for a
+ * [ConversationModels.DeployConversationModel][google.cloud.dialogflow.v2.ConversationModels.DeployConversationModel]
+ * operation.
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata}
@@ -70,7 +72,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_MODEL_FIELD_NUMBER = 1;
-  private volatile java.lang.Object conversationModel_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversationModel_ = "";
   /**
    *
    *
@@ -166,7 +170,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -348,7 +352,9 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Metadata for a [ConversationModels.DeployConversationModel][google.cloud.dialogflow.v2.ConversationModels.DeployConversationModel] operation.
+   * Metadata for a
+   * [ConversationModels.DeployConversationModel][google.cloud.dialogflow.v2.ConversationModels.DeployConversationModel]
+   * operation.
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata}
@@ -384,12 +390,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       conversationModel_ = "";
-
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
       return this;
@@ -422,16 +427,24 @@ public com.google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata b
     public com.google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata buildPartial() {
       com.google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata result =
           new com.google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata(this);
-      result.conversationModel_ = conversationModel_;
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversationModel_ = conversationModel_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -484,6 +497,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getConversationModel().isEmpty()) {
         conversationModel_ = other.conversationModel_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasCreateTime()) {
@@ -518,13 +532,13 @@ public Builder mergeFrom(
             case 10:
               {
                 conversationModel_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 26:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 26
             default:
@@ -544,6 +558,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object conversationModel_ = "";
     /**
      *
@@ -608,8 +624,8 @@ public Builder setConversationModel(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversationModel_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -626,8 +642,8 @@ public Builder setConversationModel(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationModel() {
-
       conversationModel_ = getDefaultInstance().getConversationModel();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -649,8 +665,8 @@ public Builder setConversationModelBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversationModel_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -674,7 +690,7 @@ public Builder setConversationModelBytes(com.google.protobuf.ByteString value) {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -713,11 +729,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -733,11 +749,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -752,17 +768,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
         } else {
           createTime_ = value;
         }
-        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -776,14 +793,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * <code>.google.protobuf.Timestamp create_time = 3;</code>
      */
     public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -797,7 +813,7 @@ public Builder clearCreateTime() {
      * <code>.google.protobuf.Timestamp create_time = 3;</code>
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeployConversationModelRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeployConversationModelRequest.java
index 7cb0d14c4b53..9a5a56772073 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeployConversationModelRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeployConversationModelRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -319,8 +321,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -349,11 +351,21 @@ public com.google.cloud.dialogflow.v2.DeployConversationModelRequest build() {
     public com.google.cloud.dialogflow.v2.DeployConversationModelRequest buildPartial() {
       com.google.cloud.dialogflow.v2.DeployConversationModelRequest result =
           new com.google.cloud.dialogflow.v2.DeployConversationModelRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.DeployConversationModelRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -403,6 +415,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.DeployConversationModelR
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -434,7 +447,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -454,6 +467,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -518,8 +533,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -536,8 +551,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -559,8 +574,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java
index 360ce41f1b20..04331e3d1a8f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SESSION_FIELD_NUMBER = 1;
-  private volatile java.lang.Object session_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object session_ = "";
   /**
    *
    *
@@ -194,7 +196,9 @@ public com.google.cloud.dialogflow.v2.QueryParameters getQueryParams() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.QueryParametersOrBuilder getQueryParamsOrBuilder() {
-    return getQueryParams();
+    return queryParams_ == null
+        ? com.google.cloud.dialogflow.v2.QueryParameters.getDefaultInstance()
+        : queryParams_;
   }
 
   public static final int QUERY_INPUT_FIELD_NUMBER = 3;
@@ -260,7 +264,9 @@ public com.google.cloud.dialogflow.v2.QueryInput getQueryInput() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.QueryInputOrBuilder getQueryInputOrBuilder() {
-    return getQueryInput();
+    return queryInput_ == null
+        ? com.google.cloud.dialogflow.v2.QueryInput.getDefaultInstance()
+        : queryInput_;
   }
 
   public static final int OUTPUT_AUDIO_CONFIG_FIELD_NUMBER = 4;
@@ -314,7 +320,9 @@ public com.google.cloud.dialogflow.v2.OutputAudioConfig getOutputAudioConfig() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.OutputAudioConfigOrBuilder getOutputAudioConfigOrBuilder() {
-    return getOutputAudioConfig();
+    return outputAudioConfig_ == null
+        ? com.google.cloud.dialogflow.v2.OutputAudioConfig.getDefaultInstance()
+        : outputAudioConfig_;
   }
 
   public static final int OUTPUT_AUDIO_CONFIG_MASK_FIELD_NUMBER = 7;
@@ -323,11 +331,13 @@ public com.google.cloud.dialogflow.v2.OutputAudioConfigOrBuilder getOutputAudioC
    *
    *
    * <pre>
-   * Mask for [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] indicating which settings in this
-   * request-level config should override speech synthesizer settings defined at
-   * agent-level.
-   * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] replaces the agent-level
-   * config in its entirety.
+   * Mask for
+   * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+   * indicating which settings in this request-level config should override
+   * speech synthesizer settings defined at agent-level.
+   * If unspecified or empty,
+   * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+   * replaces the agent-level config in its entirety.
    * </pre>
    *
    * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
@@ -342,11 +352,13 @@ public boolean hasOutputAudioConfigMask() {
    *
    *
    * <pre>
-   * Mask for [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] indicating which settings in this
-   * request-level config should override speech synthesizer settings defined at
-   * agent-level.
-   * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] replaces the agent-level
-   * config in its entirety.
+   * Mask for
+   * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+   * indicating which settings in this request-level config should override
+   * speech synthesizer settings defined at agent-level.
+   * If unspecified or empty,
+   * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+   * replaces the agent-level config in its entirety.
    * </pre>
    *
    * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
@@ -363,22 +375,26 @@ public com.google.protobuf.FieldMask getOutputAudioConfigMask() {
    *
    *
    * <pre>
-   * Mask for [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] indicating which settings in this
-   * request-level config should override speech synthesizer settings defined at
-   * agent-level.
-   * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] replaces the agent-level
-   * config in its entirety.
+   * Mask for
+   * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+   * indicating which settings in this request-level config should override
+   * speech synthesizer settings defined at agent-level.
+   * If unspecified or empty,
+   * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+   * replaces the agent-level config in its entirety.
    * </pre>
    *
    * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getOutputAudioConfigMaskOrBuilder() {
-    return getOutputAudioConfigMask();
+    return outputAudioConfigMask_ == null
+        ? com.google.protobuf.FieldMask.getDefaultInstance()
+        : outputAudioConfigMask_;
   }
 
   public static final int INPUT_AUDIO_FIELD_NUMBER = 5;
-  private com.google.protobuf.ByteString inputAudio_;
+  private com.google.protobuf.ByteString inputAudio_ = com.google.protobuf.ByteString.EMPTY;
   /**
    *
    *
@@ -660,34 +676,29 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       session_ = "";
-
-      if (queryParamsBuilder_ == null) {
-        queryParams_ = null;
-      } else {
-        queryParams_ = null;
+      queryParams_ = null;
+      if (queryParamsBuilder_ != null) {
+        queryParamsBuilder_.dispose();
         queryParamsBuilder_ = null;
       }
-      if (queryInputBuilder_ == null) {
-        queryInput_ = null;
-      } else {
-        queryInput_ = null;
+      queryInput_ = null;
+      if (queryInputBuilder_ != null) {
+        queryInputBuilder_.dispose();
         queryInputBuilder_ = null;
       }
-      if (outputAudioConfigBuilder_ == null) {
-        outputAudioConfig_ = null;
-      } else {
-        outputAudioConfig_ = null;
+      outputAudioConfig_ = null;
+      if (outputAudioConfigBuilder_ != null) {
+        outputAudioConfigBuilder_.dispose();
         outputAudioConfigBuilder_ = null;
       }
-      if (outputAudioConfigMaskBuilder_ == null) {
-        outputAudioConfigMask_ = null;
-      } else {
-        outputAudioConfigMask_ = null;
+      outputAudioConfigMask_ = null;
+      if (outputAudioConfigMaskBuilder_ != null) {
+        outputAudioConfigMaskBuilder_.dispose();
         outputAudioConfigMaskBuilder_ = null;
       }
       inputAudio_ = com.google.protobuf.ByteString.EMPTY;
-
       return this;
     }
 
@@ -715,30 +726,40 @@ public com.google.cloud.dialogflow.v2.DetectIntentRequest build() {
     public com.google.cloud.dialogflow.v2.DetectIntentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.DetectIntentRequest result =
           new com.google.cloud.dialogflow.v2.DetectIntentRequest(this);
-      result.session_ = session_;
-      if (queryParamsBuilder_ == null) {
-        result.queryParams_ = queryParams_;
-      } else {
-        result.queryParams_ = queryParamsBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (queryInputBuilder_ == null) {
-        result.queryInput_ = queryInput_;
-      } else {
-        result.queryInput_ = queryInputBuilder_.build();
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.DetectIntentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.session_ = session_;
       }
-      if (outputAudioConfigBuilder_ == null) {
-        result.outputAudioConfig_ = outputAudioConfig_;
-      } else {
-        result.outputAudioConfig_ = outputAudioConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.queryParams_ =
+            queryParamsBuilder_ == null ? queryParams_ : queryParamsBuilder_.build();
       }
-      if (outputAudioConfigMaskBuilder_ == null) {
-        result.outputAudioConfigMask_ = outputAudioConfigMask_;
-      } else {
-        result.outputAudioConfigMask_ = outputAudioConfigMaskBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.queryInput_ = queryInputBuilder_ == null ? queryInput_ : queryInputBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.outputAudioConfig_ =
+            outputAudioConfigBuilder_ == null
+                ? outputAudioConfig_
+                : outputAudioConfigBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.outputAudioConfigMask_ =
+            outputAudioConfigMaskBuilder_ == null
+                ? outputAudioConfigMask_
+                : outputAudioConfigMaskBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.inputAudio_ = inputAudio_;
       }
-      result.inputAudio_ = inputAudio_;
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -789,6 +810,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.DetectIntentRequest othe
         return this;
       if (!other.getSession().isEmpty()) {
         session_ = other.session_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasQueryParams()) {
@@ -835,39 +857,39 @@ public Builder mergeFrom(
             case 10:
               {
                 session_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getQueryParamsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getQueryInputFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(
                     getOutputAudioConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 42:
               {
                 inputAudio_ = input.readBytes();
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 42
             case 58:
               {
                 input.readMessage(
                     getOutputAudioConfigMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 58
             default:
@@ -887,6 +909,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object session_ = "";
     /**
      *
@@ -996,8 +1020,8 @@ public Builder setSession(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       session_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1029,8 +1053,8 @@ public Builder setSession(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSession() {
-
       session_ = getDefaultInstance().getSession();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1067,8 +1091,8 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       session_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1091,7 +1115,7 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
      * @return Whether the queryParams field is set.
      */
     public boolean hasQueryParams() {
-      return queryParamsBuilder_ != null || queryParams_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -1128,11 +1152,11 @@ public Builder setQueryParams(com.google.cloud.dialogflow.v2.QueryParameters val
           throw new NullPointerException();
         }
         queryParams_ = value;
-        onChanged();
       } else {
         queryParamsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1148,11 +1172,11 @@ public Builder setQueryParams(
         com.google.cloud.dialogflow.v2.QueryParameters.Builder builderForValue) {
       if (queryParamsBuilder_ == null) {
         queryParams_ = builderForValue.build();
-        onChanged();
       } else {
         queryParamsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1166,19 +1190,19 @@ public Builder setQueryParams(
      */
     public Builder mergeQueryParams(com.google.cloud.dialogflow.v2.QueryParameters value) {
       if (queryParamsBuilder_ == null) {
-        if (queryParams_ != null) {
-          queryParams_ =
-              com.google.cloud.dialogflow.v2.QueryParameters.newBuilder(queryParams_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && queryParams_ != null
+            && queryParams_
+                != com.google.cloud.dialogflow.v2.QueryParameters.getDefaultInstance()) {
+          getQueryParamsBuilder().mergeFrom(value);
         } else {
           queryParams_ = value;
         }
-        onChanged();
       } else {
         queryParamsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1191,14 +1215,13 @@ public Builder mergeQueryParams(com.google.cloud.dialogflow.v2.QueryParameters v
      * <code>.google.cloud.dialogflow.v2.QueryParameters query_params = 2;</code>
      */
     public Builder clearQueryParams() {
-      if (queryParamsBuilder_ == null) {
-        queryParams_ = null;
-        onChanged();
-      } else {
-        queryParams_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      queryParams_ = null;
+      if (queryParamsBuilder_ != null) {
+        queryParamsBuilder_.dispose();
         queryParamsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1211,7 +1234,7 @@ public Builder clearQueryParams() {
      * <code>.google.cloud.dialogflow.v2.QueryParameters query_params = 2;</code>
      */
     public com.google.cloud.dialogflow.v2.QueryParameters.Builder getQueryParamsBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getQueryParamsFieldBuilder().getBuilder();
     }
@@ -1283,7 +1306,7 @@ public com.google.cloud.dialogflow.v2.QueryParametersOrBuilder getQueryParamsOrB
      * @return Whether the queryInput field is set.
      */
     public boolean hasQueryInput() {
-      return queryInputBuilder_ != null || queryInput_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1332,11 +1355,11 @@ public Builder setQueryInput(com.google.cloud.dialogflow.v2.QueryInput value) {
           throw new NullPointerException();
         }
         queryInput_ = value;
-        onChanged();
       } else {
         queryInputBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1358,11 +1381,11 @@ public Builder setQueryInput(
         com.google.cloud.dialogflow.v2.QueryInput.Builder builderForValue) {
       if (queryInputBuilder_ == null) {
         queryInput_ = builderForValue.build();
-        onChanged();
       } else {
         queryInputBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1382,19 +1405,18 @@ public Builder setQueryInput(
      */
     public Builder mergeQueryInput(com.google.cloud.dialogflow.v2.QueryInput value) {
       if (queryInputBuilder_ == null) {
-        if (queryInput_ != null) {
-          queryInput_ =
-              com.google.cloud.dialogflow.v2.QueryInput.newBuilder(queryInput_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && queryInput_ != null
+            && queryInput_ != com.google.cloud.dialogflow.v2.QueryInput.getDefaultInstance()) {
+          getQueryInputBuilder().mergeFrom(value);
         } else {
           queryInput_ = value;
         }
-        onChanged();
       } else {
         queryInputBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1413,14 +1435,13 @@ public Builder mergeQueryInput(com.google.cloud.dialogflow.v2.QueryInput value)
      * </code>
      */
     public Builder clearQueryInput() {
-      if (queryInputBuilder_ == null) {
-        queryInput_ = null;
-        onChanged();
-      } else {
-        queryInput_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      queryInput_ = null;
+      if (queryInputBuilder_ != null) {
+        queryInputBuilder_.dispose();
         queryInputBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1439,7 +1460,7 @@ public Builder clearQueryInput() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.QueryInput.Builder getQueryInputBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getQueryInputFieldBuilder().getBuilder();
     }
@@ -1519,7 +1540,7 @@ public com.google.cloud.dialogflow.v2.QueryInputOrBuilder getQueryInputOrBuilder
      * @return Whether the outputAudioConfig field is set.
      */
     public boolean hasOutputAudioConfig() {
-      return outputAudioConfigBuilder_ != null || outputAudioConfig_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1560,11 +1581,11 @@ public Builder setOutputAudioConfig(com.google.cloud.dialogflow.v2.OutputAudioCo
           throw new NullPointerException();
         }
         outputAudioConfig_ = value;
-        onChanged();
       } else {
         outputAudioConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1582,11 +1603,11 @@ public Builder setOutputAudioConfig(
         com.google.cloud.dialogflow.v2.OutputAudioConfig.Builder builderForValue) {
       if (outputAudioConfigBuilder_ == null) {
         outputAudioConfig_ = builderForValue.build();
-        onChanged();
       } else {
         outputAudioConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1602,19 +1623,19 @@ public Builder setOutputAudioConfig(
      */
     public Builder mergeOutputAudioConfig(com.google.cloud.dialogflow.v2.OutputAudioConfig value) {
       if (outputAudioConfigBuilder_ == null) {
-        if (outputAudioConfig_ != null) {
-          outputAudioConfig_ =
-              com.google.cloud.dialogflow.v2.OutputAudioConfig.newBuilder(outputAudioConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && outputAudioConfig_ != null
+            && outputAudioConfig_
+                != com.google.cloud.dialogflow.v2.OutputAudioConfig.getDefaultInstance()) {
+          getOutputAudioConfigBuilder().mergeFrom(value);
         } else {
           outputAudioConfig_ = value;
         }
-        onChanged();
       } else {
         outputAudioConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1629,14 +1650,13 @@ public Builder mergeOutputAudioConfig(com.google.cloud.dialogflow.v2.OutputAudio
      * <code>.google.cloud.dialogflow.v2.OutputAudioConfig output_audio_config = 4;</code>
      */
     public Builder clearOutputAudioConfig() {
-      if (outputAudioConfigBuilder_ == null) {
-        outputAudioConfig_ = null;
-        onChanged();
-      } else {
-        outputAudioConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      outputAudioConfig_ = null;
+      if (outputAudioConfigBuilder_ != null) {
+        outputAudioConfigBuilder_.dispose();
         outputAudioConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1651,7 +1671,7 @@ public Builder clearOutputAudioConfig() {
      * <code>.google.cloud.dialogflow.v2.OutputAudioConfig output_audio_config = 4;</code>
      */
     public com.google.cloud.dialogflow.v2.OutputAudioConfig.Builder getOutputAudioConfigBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getOutputAudioConfigFieldBuilder().getBuilder();
     }
@@ -1714,11 +1734,13 @@ public com.google.cloud.dialogflow.v2.OutputAudioConfig.Builder getOutputAudioCo
      *
      *
      * <pre>
-     * Mask for [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] indicating which settings in this
-     * request-level config should override speech synthesizer settings defined at
-     * agent-level.
-     * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] replaces the agent-level
-     * config in its entirety.
+     * Mask for
+     * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+     * indicating which settings in this request-level config should override
+     * speech synthesizer settings defined at agent-level.
+     * If unspecified or empty,
+     * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+     * replaces the agent-level config in its entirety.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
@@ -1726,17 +1748,19 @@ public com.google.cloud.dialogflow.v2.OutputAudioConfig.Builder getOutputAudioCo
      * @return Whether the outputAudioConfigMask field is set.
      */
     public boolean hasOutputAudioConfigMask() {
-      return outputAudioConfigMaskBuilder_ != null || outputAudioConfigMask_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
      *
      * <pre>
-     * Mask for [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] indicating which settings in this
-     * request-level config should override speech synthesizer settings defined at
-     * agent-level.
-     * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] replaces the agent-level
-     * config in its entirety.
+     * Mask for
+     * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+     * indicating which settings in this request-level config should override
+     * speech synthesizer settings defined at agent-level.
+     * If unspecified or empty,
+     * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+     * replaces the agent-level config in its entirety.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
@@ -1756,11 +1780,13 @@ public com.google.protobuf.FieldMask getOutputAudioConfigMask() {
      *
      *
      * <pre>
-     * Mask for [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] indicating which settings in this
-     * request-level config should override speech synthesizer settings defined at
-     * agent-level.
-     * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] replaces the agent-level
-     * config in its entirety.
+     * Mask for
+     * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+     * indicating which settings in this request-level config should override
+     * speech synthesizer settings defined at agent-level.
+     * If unspecified or empty,
+     * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+     * replaces the agent-level config in its entirety.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
@@ -1771,22 +1797,24 @@ public Builder setOutputAudioConfigMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         outputAudioConfigMask_ = value;
-        onChanged();
       } else {
         outputAudioConfigMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Mask for [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] indicating which settings in this
-     * request-level config should override speech synthesizer settings defined at
-     * agent-level.
-     * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] replaces the agent-level
-     * config in its entirety.
+     * Mask for
+     * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+     * indicating which settings in this request-level config should override
+     * speech synthesizer settings defined at agent-level.
+     * If unspecified or empty,
+     * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+     * replaces the agent-level config in its entirety.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
@@ -1794,82 +1822,86 @@ public Builder setOutputAudioConfigMask(com.google.protobuf.FieldMask value) {
     public Builder setOutputAudioConfigMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (outputAudioConfigMaskBuilder_ == null) {
         outputAudioConfigMask_ = builderForValue.build();
-        onChanged();
       } else {
         outputAudioConfigMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Mask for [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] indicating which settings in this
-     * request-level config should override speech synthesizer settings defined at
-     * agent-level.
-     * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] replaces the agent-level
-     * config in its entirety.
+     * Mask for
+     * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+     * indicating which settings in this request-level config should override
+     * speech synthesizer settings defined at agent-level.
+     * If unspecified or empty,
+     * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+     * replaces the agent-level config in its entirety.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
      */
     public Builder mergeOutputAudioConfigMask(com.google.protobuf.FieldMask value) {
       if (outputAudioConfigMaskBuilder_ == null) {
-        if (outputAudioConfigMask_ != null) {
-          outputAudioConfigMask_ =
-              com.google.protobuf.FieldMask.newBuilder(outputAudioConfigMask_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && outputAudioConfigMask_ != null
+            && outputAudioConfigMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getOutputAudioConfigMaskBuilder().mergeFrom(value);
         } else {
           outputAudioConfigMask_ = value;
         }
-        onChanged();
       } else {
         outputAudioConfigMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Mask for [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] indicating which settings in this
-     * request-level config should override speech synthesizer settings defined at
-     * agent-level.
-     * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] replaces the agent-level
-     * config in its entirety.
+     * Mask for
+     * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+     * indicating which settings in this request-level config should override
+     * speech synthesizer settings defined at agent-level.
+     * If unspecified or empty,
+     * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+     * replaces the agent-level config in its entirety.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
      */
     public Builder clearOutputAudioConfigMask() {
-      if (outputAudioConfigMaskBuilder_ == null) {
-        outputAudioConfigMask_ = null;
-        onChanged();
-      } else {
-        outputAudioConfigMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      outputAudioConfigMask_ = null;
+      if (outputAudioConfigMaskBuilder_ != null) {
+        outputAudioConfigMaskBuilder_.dispose();
         outputAudioConfigMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Mask for [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] indicating which settings in this
-     * request-level config should override speech synthesizer settings defined at
-     * agent-level.
-     * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] replaces the agent-level
-     * config in its entirety.
+     * Mask for
+     * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+     * indicating which settings in this request-level config should override
+     * speech synthesizer settings defined at agent-level.
+     * If unspecified or empty,
+     * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+     * replaces the agent-level config in its entirety.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
      */
     public com.google.protobuf.FieldMask.Builder getOutputAudioConfigMaskBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getOutputAudioConfigMaskFieldBuilder().getBuilder();
     }
@@ -1877,11 +1909,13 @@ public com.google.protobuf.FieldMask.Builder getOutputAudioConfigMaskBuilder() {
      *
      *
      * <pre>
-     * Mask for [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] indicating which settings in this
-     * request-level config should override speech synthesizer settings defined at
-     * agent-level.
-     * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] replaces the agent-level
-     * config in its entirety.
+     * Mask for
+     * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+     * indicating which settings in this request-level config should override
+     * speech synthesizer settings defined at agent-level.
+     * If unspecified or empty,
+     * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+     * replaces the agent-level config in its entirety.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
@@ -1899,11 +1933,13 @@ public com.google.protobuf.FieldMaskOrBuilder getOutputAudioConfigMaskOrBuilder(
      *
      *
      * <pre>
-     * Mask for [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] indicating which settings in this
-     * request-level config should override speech synthesizer settings defined at
-     * agent-level.
-     * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] replaces the agent-level
-     * config in its entirety.
+     * Mask for
+     * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+     * indicating which settings in this request-level config should override
+     * speech synthesizer settings defined at agent-level.
+     * If unspecified or empty,
+     * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+     * replaces the agent-level config in its entirety.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
@@ -1961,8 +1997,8 @@ public Builder setInputAudio(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       inputAudio_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1980,7 +2016,7 @@ public Builder setInputAudio(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearInputAudio() {
-
+      bitField0_ = (bitField0_ & ~0x00000020);
       inputAudio_ = getDefaultInstance().getInputAudio();
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequestOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequestOrBuilder.java
index 3bbe69d16534..dc022fec6636 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequestOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequestOrBuilder.java
@@ -213,11 +213,13 @@ public interface DetectIntentRequestOrBuilder
    *
    *
    * <pre>
-   * Mask for [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] indicating which settings in this
-   * request-level config should override speech synthesizer settings defined at
-   * agent-level.
-   * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] replaces the agent-level
-   * config in its entirety.
+   * Mask for
+   * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+   * indicating which settings in this request-level config should override
+   * speech synthesizer settings defined at agent-level.
+   * If unspecified or empty,
+   * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+   * replaces the agent-level config in its entirety.
    * </pre>
    *
    * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
@@ -229,11 +231,13 @@ public interface DetectIntentRequestOrBuilder
    *
    *
    * <pre>
-   * Mask for [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] indicating which settings in this
-   * request-level config should override speech synthesizer settings defined at
-   * agent-level.
-   * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] replaces the agent-level
-   * config in its entirety.
+   * Mask for
+   * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+   * indicating which settings in this request-level config should override
+   * speech synthesizer settings defined at agent-level.
+   * If unspecified or empty,
+   * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+   * replaces the agent-level config in its entirety.
    * </pre>
    *
    * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
@@ -245,11 +249,13 @@ public interface DetectIntentRequestOrBuilder
    *
    *
    * <pre>
-   * Mask for [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] indicating which settings in this
-   * request-level config should override speech synthesizer settings defined at
-   * agent-level.
-   * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] replaces the agent-level
-   * config in its entirety.
+   * Mask for
+   * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+   * indicating which settings in this request-level config should override
+   * speech synthesizer settings defined at agent-level.
+   * If unspecified or empty,
+   * [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+   * replaces the agent-level config in its entirety.
    * </pre>
    *
    * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentResponse.java
index 0941bf5f774a..4741e6f74f0e 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentResponse.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RESPONSE_ID_FIELD_NUMBER = 1;
-  private volatile java.lang.Object responseId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object responseId_ = "";
   /**
    *
    *
@@ -167,7 +169,9 @@ public com.google.cloud.dialogflow.v2.QueryResult getQueryResult() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.QueryResultOrBuilder getQueryResultOrBuilder() {
-    return getQueryResult();
+    return queryResult_ == null
+        ? com.google.cloud.dialogflow.v2.QueryResult.getDefaultInstance()
+        : queryResult_;
   }
 
   public static final int WEBHOOK_STATUS_FIELD_NUMBER = 3;
@@ -213,11 +217,11 @@ public com.google.rpc.Status getWebhookStatus() {
    */
   @java.lang.Override
   public com.google.rpc.StatusOrBuilder getWebhookStatusOrBuilder() {
-    return getWebhookStatus();
+    return webhookStatus_ == null ? com.google.rpc.Status.getDefaultInstance() : webhookStatus_;
   }
 
   public static final int OUTPUT_AUDIO_FIELD_NUMBER = 4;
-  private com.google.protobuf.ByteString outputAudio_;
+  private com.google.protobuf.ByteString outputAudio_ = com.google.protobuf.ByteString.EMPTY;
   /**
    *
    *
@@ -287,7 +291,9 @@ public com.google.cloud.dialogflow.v2.OutputAudioConfig getOutputAudioConfig() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.OutputAudioConfigOrBuilder getOutputAudioConfigOrBuilder() {
-    return getOutputAudioConfig();
+    return outputAudioConfig_ == null
+        ? com.google.cloud.dialogflow.v2.OutputAudioConfig.getDefaultInstance()
+        : outputAudioConfig_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -538,26 +544,22 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       responseId_ = "";
-
-      if (queryResultBuilder_ == null) {
-        queryResult_ = null;
-      } else {
-        queryResult_ = null;
+      queryResult_ = null;
+      if (queryResultBuilder_ != null) {
+        queryResultBuilder_.dispose();
         queryResultBuilder_ = null;
       }
-      if (webhookStatusBuilder_ == null) {
-        webhookStatus_ = null;
-      } else {
-        webhookStatus_ = null;
+      webhookStatus_ = null;
+      if (webhookStatusBuilder_ != null) {
+        webhookStatusBuilder_.dispose();
         webhookStatusBuilder_ = null;
       }
       outputAudio_ = com.google.protobuf.ByteString.EMPTY;
-
-      if (outputAudioConfigBuilder_ == null) {
-        outputAudioConfig_ = null;
-      } else {
-        outputAudioConfig_ = null;
+      outputAudioConfig_ = null;
+      if (outputAudioConfigBuilder_ != null) {
+        outputAudioConfigBuilder_.dispose();
         outputAudioConfigBuilder_ = null;
       }
       return this;
@@ -587,27 +589,37 @@ public com.google.cloud.dialogflow.v2.DetectIntentResponse build() {
     public com.google.cloud.dialogflow.v2.DetectIntentResponse buildPartial() {
       com.google.cloud.dialogflow.v2.DetectIntentResponse result =
           new com.google.cloud.dialogflow.v2.DetectIntentResponse(this);
-      result.responseId_ = responseId_;
-      if (queryResultBuilder_ == null) {
-        result.queryResult_ = queryResult_;
-      } else {
-        result.queryResult_ = queryResultBuilder_.build();
-      }
-      if (webhookStatusBuilder_ == null) {
-        result.webhookStatus_ = webhookStatus_;
-      } else {
-        result.webhookStatus_ = webhookStatusBuilder_.build();
-      }
-      result.outputAudio_ = outputAudio_;
-      if (outputAudioConfigBuilder_ == null) {
-        result.outputAudioConfig_ = outputAudioConfig_;
-      } else {
-        result.outputAudioConfig_ = outputAudioConfigBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.DetectIntentResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.responseId_ = responseId_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.queryResult_ =
+            queryResultBuilder_ == null ? queryResult_ : queryResultBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.webhookStatus_ =
+            webhookStatusBuilder_ == null ? webhookStatus_ : webhookStatusBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.outputAudio_ = outputAudio_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.outputAudioConfig_ =
+            outputAudioConfigBuilder_ == null
+                ? outputAudioConfig_
+                : outputAudioConfigBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -656,6 +668,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.DetectIntentResponse oth
         return this;
       if (!other.getResponseId().isEmpty()) {
         responseId_ = other.responseId_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasQueryResult()) {
@@ -699,32 +712,32 @@ public Builder mergeFrom(
             case 10:
               {
                 responseId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getQueryResultFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getWebhookStatusFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 outputAudio_ = input.readBytes();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 50:
               {
                 input.readMessage(
                     getOutputAudioConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 50
             default:
@@ -744,6 +757,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object responseId_ = "";
     /**
      *
@@ -808,8 +823,8 @@ public Builder setResponseId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       responseId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -826,8 +841,8 @@ public Builder setResponseId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearResponseId() {
-
       responseId_ = getDefaultInstance().getResponseId();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -849,8 +864,8 @@ public Builder setResponseIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       responseId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -874,7 +889,7 @@ public Builder setResponseIdBytes(com.google.protobuf.ByteString value) {
      * @return Whether the queryResult field is set.
      */
     public boolean hasQueryResult() {
-      return queryResultBuilder_ != null || queryResult_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -913,11 +928,11 @@ public Builder setQueryResult(com.google.cloud.dialogflow.v2.QueryResult value)
           throw new NullPointerException();
         }
         queryResult_ = value;
-        onChanged();
       } else {
         queryResultBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -934,11 +949,11 @@ public Builder setQueryResult(
         com.google.cloud.dialogflow.v2.QueryResult.Builder builderForValue) {
       if (queryResultBuilder_ == null) {
         queryResult_ = builderForValue.build();
-        onChanged();
       } else {
         queryResultBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -953,19 +968,18 @@ public Builder setQueryResult(
      */
     public Builder mergeQueryResult(com.google.cloud.dialogflow.v2.QueryResult value) {
       if (queryResultBuilder_ == null) {
-        if (queryResult_ != null) {
-          queryResult_ =
-              com.google.cloud.dialogflow.v2.QueryResult.newBuilder(queryResult_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && queryResult_ != null
+            && queryResult_ != com.google.cloud.dialogflow.v2.QueryResult.getDefaultInstance()) {
+          getQueryResultBuilder().mergeFrom(value);
         } else {
           queryResult_ = value;
         }
-        onChanged();
       } else {
         queryResultBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -979,14 +993,13 @@ public Builder mergeQueryResult(com.google.cloud.dialogflow.v2.QueryResult value
      * <code>.google.cloud.dialogflow.v2.QueryResult query_result = 2;</code>
      */
     public Builder clearQueryResult() {
-      if (queryResultBuilder_ == null) {
-        queryResult_ = null;
-        onChanged();
-      } else {
-        queryResult_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      queryResult_ = null;
+      if (queryResultBuilder_ != null) {
+        queryResultBuilder_.dispose();
         queryResultBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1000,7 +1013,7 @@ public Builder clearQueryResult() {
      * <code>.google.cloud.dialogflow.v2.QueryResult query_result = 2;</code>
      */
     public com.google.cloud.dialogflow.v2.QueryResult.Builder getQueryResultBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getQueryResultFieldBuilder().getBuilder();
     }
@@ -1066,7 +1079,7 @@ public com.google.cloud.dialogflow.v2.QueryResultOrBuilder getQueryResultOrBuild
      * @return Whether the webhookStatus field is set.
      */
     public boolean hasWebhookStatus() {
-      return webhookStatusBuilder_ != null || webhookStatus_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1101,11 +1114,11 @@ public Builder setWebhookStatus(com.google.rpc.Status value) {
           throw new NullPointerException();
         }
         webhookStatus_ = value;
-        onChanged();
       } else {
         webhookStatusBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1120,11 +1133,11 @@ public Builder setWebhookStatus(com.google.rpc.Status value) {
     public Builder setWebhookStatus(com.google.rpc.Status.Builder builderForValue) {
       if (webhookStatusBuilder_ == null) {
         webhookStatus_ = builderForValue.build();
-        onChanged();
       } else {
         webhookStatusBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1138,17 +1151,18 @@ public Builder setWebhookStatus(com.google.rpc.Status.Builder builderForValue) {
      */
     public Builder mergeWebhookStatus(com.google.rpc.Status value) {
       if (webhookStatusBuilder_ == null) {
-        if (webhookStatus_ != null) {
-          webhookStatus_ =
-              com.google.rpc.Status.newBuilder(webhookStatus_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && webhookStatus_ != null
+            && webhookStatus_ != com.google.rpc.Status.getDefaultInstance()) {
+          getWebhookStatusBuilder().mergeFrom(value);
         } else {
           webhookStatus_ = value;
         }
-        onChanged();
       } else {
         webhookStatusBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1161,14 +1175,13 @@ public Builder mergeWebhookStatus(com.google.rpc.Status value) {
      * <code>.google.rpc.Status webhook_status = 3;</code>
      */
     public Builder clearWebhookStatus() {
-      if (webhookStatusBuilder_ == null) {
-        webhookStatus_ = null;
-        onChanged();
-      } else {
-        webhookStatus_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      webhookStatus_ = null;
+      if (webhookStatusBuilder_ != null) {
+        webhookStatusBuilder_.dispose();
         webhookStatusBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1181,7 +1194,7 @@ public Builder clearWebhookStatus() {
      * <code>.google.rpc.Status webhook_status = 3;</code>
      */
     public com.google.rpc.Status.Builder getWebhookStatusBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getWebhookStatusFieldBuilder().getBuilder();
     }
@@ -1273,8 +1286,8 @@ public Builder setOutputAudio(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       outputAudio_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1298,7 +1311,7 @@ public Builder setOutputAudio(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearOutputAudio() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       outputAudio_ = getDefaultInstance().getOutputAudio();
       onChanged();
       return this;
@@ -1322,7 +1335,7 @@ public Builder clearOutputAudio() {
      * @return Whether the outputAudioConfig field is set.
      */
     public boolean hasOutputAudioConfig() {
-      return outputAudioConfigBuilder_ != null || outputAudioConfig_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -1359,11 +1372,11 @@ public Builder setOutputAudioConfig(com.google.cloud.dialogflow.v2.OutputAudioCo
           throw new NullPointerException();
         }
         outputAudioConfig_ = value;
-        onChanged();
       } else {
         outputAudioConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1379,11 +1392,11 @@ public Builder setOutputAudioConfig(
         com.google.cloud.dialogflow.v2.OutputAudioConfig.Builder builderForValue) {
       if (outputAudioConfigBuilder_ == null) {
         outputAudioConfig_ = builderForValue.build();
-        onChanged();
       } else {
         outputAudioConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1397,19 +1410,19 @@ public Builder setOutputAudioConfig(
      */
     public Builder mergeOutputAudioConfig(com.google.cloud.dialogflow.v2.OutputAudioConfig value) {
       if (outputAudioConfigBuilder_ == null) {
-        if (outputAudioConfig_ != null) {
-          outputAudioConfig_ =
-              com.google.cloud.dialogflow.v2.OutputAudioConfig.newBuilder(outputAudioConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && outputAudioConfig_ != null
+            && outputAudioConfig_
+                != com.google.cloud.dialogflow.v2.OutputAudioConfig.getDefaultInstance()) {
+          getOutputAudioConfigBuilder().mergeFrom(value);
         } else {
           outputAudioConfig_ = value;
         }
-        onChanged();
       } else {
         outputAudioConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1422,14 +1435,13 @@ public Builder mergeOutputAudioConfig(com.google.cloud.dialogflow.v2.OutputAudio
      * <code>.google.cloud.dialogflow.v2.OutputAudioConfig output_audio_config = 6;</code>
      */
     public Builder clearOutputAudioConfig() {
-      if (outputAudioConfigBuilder_ == null) {
-        outputAudioConfig_ = null;
-        onChanged();
-      } else {
-        outputAudioConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      outputAudioConfig_ = null;
+      if (outputAudioConfigBuilder_ != null) {
+        outputAudioConfigBuilder_.dispose();
         outputAudioConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1442,7 +1454,7 @@ public Builder clearOutputAudioConfig() {
      * <code>.google.cloud.dialogflow.v2.OutputAudioConfig output_audio_config = 6;</code>
      */
     public com.google.cloud.dialogflow.v2.OutputAudioConfig.Builder getOutputAudioConfigBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getOutputAudioConfigFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Document.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Document.java
index f8d7eb2eda97..5bf9d280131b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Document.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Document.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * A knowledge document to be used by a [KnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBase].
+ * A knowledge document to be used by a
+ * [KnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBase].
  * For more information, see the [knowledge base
  * guide](https://cloud.google.com/dialogflow/docs/how/knowledge-bases).
  * Note: The `projects.agent.knowledgeBases.documents` resource is deprecated;
@@ -701,7 +702,7 @@ public com.google.protobuf.Timestamp getTime() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getTimeOrBuilder() {
-      return getTime();
+      return time_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : time_;
     }
 
     public static final int STATUS_FIELD_NUMBER = 2;
@@ -747,7 +748,7 @@ public com.google.rpc.Status getStatus() {
      */
     @java.lang.Override
     public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
-      return getStatus();
+      return status_ == null ? com.google.rpc.Status.getDefaultInstance() : status_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -969,16 +970,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (timeBuilder_ == null) {
-          time_ = null;
-        } else {
-          time_ = null;
+        bitField0_ = 0;
+        time_ = null;
+        if (timeBuilder_ != null) {
+          timeBuilder_.dispose();
           timeBuilder_ = null;
         }
-        if (statusBuilder_ == null) {
-          status_ = null;
-        } else {
-          status_ = null;
+        status_ = null;
+        if (statusBuilder_ != null) {
+          statusBuilder_.dispose();
           statusBuilder_ = null;
         }
         return this;
@@ -1008,20 +1008,23 @@ public com.google.cloud.dialogflow.v2.Document.ReloadStatus build() {
       public com.google.cloud.dialogflow.v2.Document.ReloadStatus buildPartial() {
         com.google.cloud.dialogflow.v2.Document.ReloadStatus result =
             new com.google.cloud.dialogflow.v2.Document.ReloadStatus(this);
-        if (timeBuilder_ == null) {
-          result.time_ = time_;
-        } else {
-          result.time_ = timeBuilder_.build();
-        }
-        if (statusBuilder_ == null) {
-          result.status_ = status_;
-        } else {
-          result.status_ = statusBuilder_.build();
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(com.google.cloud.dialogflow.v2.Document.ReloadStatus result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.time_ = timeBuilder_ == null ? time_ : timeBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.status_ = statusBuilder_ == null ? status_ : statusBuilder_.build();
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1105,13 +1108,13 @@ public Builder mergeFrom(
               case 10:
                 {
                   input.readMessage(getTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
                 {
                   input.readMessage(getStatusFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 18
               default:
@@ -1131,6 +1134,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private com.google.protobuf.Timestamp time_;
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.protobuf.Timestamp,
@@ -1151,7 +1156,7 @@ public Builder mergeFrom(
        * @return Whether the time field is set.
        */
       public boolean hasTime() {
-        return timeBuilder_ != null || time_ != null;
+        return ((bitField0_ & 0x00000001) != 0);
       }
       /**
        *
@@ -1190,11 +1195,11 @@ public Builder setTime(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           time_ = value;
-          onChanged();
         } else {
           timeBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1211,11 +1216,11 @@ public Builder setTime(com.google.protobuf.Timestamp value) {
       public Builder setTime(com.google.protobuf.Timestamp.Builder builderForValue) {
         if (timeBuilder_ == null) {
           time_ = builderForValue.build();
-          onChanged();
         } else {
           timeBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1231,16 +1236,18 @@ public Builder setTime(com.google.protobuf.Timestamp.Builder builderForValue) {
        */
       public Builder mergeTime(com.google.protobuf.Timestamp value) {
         if (timeBuilder_ == null) {
-          if (time_ != null) {
-            time_ = com.google.protobuf.Timestamp.newBuilder(time_).mergeFrom(value).buildPartial();
+          if (((bitField0_ & 0x00000001) != 0)
+              && time_ != null
+              && time_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+            getTimeBuilder().mergeFrom(value);
           } else {
             time_ = value;
           }
-          onChanged();
         } else {
           timeBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1255,14 +1262,13 @@ public Builder mergeTime(com.google.protobuf.Timestamp value) {
        * <code>.google.protobuf.Timestamp time = 1;</code>
        */
       public Builder clearTime() {
-        if (timeBuilder_ == null) {
-          time_ = null;
-          onChanged();
-        } else {
-          time_ = null;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        time_ = null;
+        if (timeBuilder_ != null) {
+          timeBuilder_.dispose();
           timeBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -1277,7 +1283,7 @@ public Builder clearTime() {
        * <code>.google.protobuf.Timestamp time = 1;</code>
        */
       public com.google.protobuf.Timestamp.Builder getTimeBuilder() {
-
+        bitField0_ |= 0x00000001;
         onChanged();
         return getTimeFieldBuilder().getBuilder();
       }
@@ -1343,7 +1349,7 @@ public com.google.protobuf.TimestampOrBuilder getTimeOrBuilder() {
        * @return Whether the status field is set.
        */
       public boolean hasStatus() {
-        return statusBuilder_ != null || status_ != null;
+        return ((bitField0_ & 0x00000002) != 0);
       }
       /**
        *
@@ -1378,11 +1384,11 @@ public Builder setStatus(com.google.rpc.Status value) {
             throw new NullPointerException();
           }
           status_ = value;
-          onChanged();
         } else {
           statusBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -1397,11 +1403,11 @@ public Builder setStatus(com.google.rpc.Status value) {
       public Builder setStatus(com.google.rpc.Status.Builder builderForValue) {
         if (statusBuilder_ == null) {
           status_ = builderForValue.build();
-          onChanged();
         } else {
           statusBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -1415,16 +1421,18 @@ public Builder setStatus(com.google.rpc.Status.Builder builderForValue) {
        */
       public Builder mergeStatus(com.google.rpc.Status value) {
         if (statusBuilder_ == null) {
-          if (status_ != null) {
-            status_ = com.google.rpc.Status.newBuilder(status_).mergeFrom(value).buildPartial();
+          if (((bitField0_ & 0x00000002) != 0)
+              && status_ != null
+              && status_ != com.google.rpc.Status.getDefaultInstance()) {
+            getStatusBuilder().mergeFrom(value);
           } else {
             status_ = value;
           }
-          onChanged();
         } else {
           statusBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -1437,14 +1445,13 @@ public Builder mergeStatus(com.google.rpc.Status value) {
        * <code>.google.rpc.Status status = 2;</code>
        */
       public Builder clearStatus() {
-        if (statusBuilder_ == null) {
-          status_ = null;
-          onChanged();
-        } else {
-          status_ = null;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        status_ = null;
+        if (statusBuilder_ != null) {
+          statusBuilder_.dispose();
           statusBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -1457,7 +1464,7 @@ public Builder clearStatus() {
        * <code>.google.rpc.Status status = 2;</code>
        */
       public com.google.rpc.Status.Builder getStatusBuilder() {
-
+        bitField0_ |= 0x00000002;
         onChanged();
         return getStatusFieldBuilder().getBuilder();
       }
@@ -1612,7 +1619,9 @@ public SourceCase getSourceCase() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -1667,7 +1676,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
@@ -1718,7 +1729,9 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
   }
 
   public static final int MIME_TYPE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object mimeType_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object mimeType_ = "";
   /**
    *
    *
@@ -1767,7 +1780,10 @@ public com.google.protobuf.ByteString getMimeTypeBytes() {
   }
 
   public static final int KNOWLEDGE_TYPES_FIELD_NUMBER = 4;
+
+  @SuppressWarnings("serial")
   private java.util.List<java.lang.Integer> knowledgeTypes_;
+
   private static final com.google.protobuf.Internal.ListAdapter.Converter<
           java.lang.Integer, com.google.cloud.dialogflow.v2.Document.KnowledgeType>
       knowledgeTypes_converter_ =
@@ -1775,9 +1791,8 @@ public com.google.protobuf.ByteString getMimeTypeBytes() {
               java.lang.Integer, com.google.cloud.dialogflow.v2.Document.KnowledgeType>() {
             public com.google.cloud.dialogflow.v2.Document.KnowledgeType convert(
                 java.lang.Integer from) {
-              @SuppressWarnings("deprecation")
               com.google.cloud.dialogflow.v2.Document.KnowledgeType result =
-                  com.google.cloud.dialogflow.v2.Document.KnowledgeType.valueOf(from);
+                  com.google.cloud.dialogflow.v2.Document.KnowledgeType.forNumber(from);
               return result == null
                   ? com.google.cloud.dialogflow.v2.Document.KnowledgeType.UNRECOGNIZED
                   : result;
@@ -2002,7 +2017,7 @@ public com.google.protobuf.ByteString getRawContent() {
   }
 
   public static final int ENABLE_AUTO_RELOAD_FIELD_NUMBER = 11;
-  private boolean enableAutoReload_;
+  private boolean enableAutoReload_ = false;
   /**
    *
    *
@@ -2089,7 +2104,9 @@ public com.google.cloud.dialogflow.v2.Document.ReloadStatus getLatestReloadStatu
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.Document.ReloadStatusOrBuilder
       getLatestReloadStatusOrBuilder() {
-    return getLatestReloadStatus();
+    return latestReloadStatus_ == null
+        ? com.google.cloud.dialogflow.v2.Document.ReloadStatus.getDefaultInstance()
+        : latestReloadStatus_;
   }
 
   public static final int METADATA_FIELD_NUMBER = 7;
@@ -2105,6 +2122,7 @@ private static final class MetadataDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> metadata_;
 
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> internalGetMetadata() {
@@ -2171,8 +2189,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
    * <code>map&lt;string, string&gt; metadata = 7 [(.google.api.field_behavior) = OPTIONAL];</code>
    */
   @java.lang.Override
-  public java.lang.String getMetadataOrDefault(
-      java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getMetadataOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -2204,7 +2224,7 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
   }
 
   public static final int STATE_FIELD_NUMBER = 13;
-  private int state_;
+  private int state_ = 0;
   /**
    *
    *
@@ -2237,9 +2257,8 @@ public int getStateValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.Document.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.Document.State result =
-        com.google.cloud.dialogflow.v2.Document.State.valueOf(state_);
+        com.google.cloud.dialogflow.v2.Document.State.forNumber(state_);
     return result == null ? com.google.cloud.dialogflow.v2.Document.State.UNRECOGNIZED : result;
   }
 
@@ -2535,7 +2554,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * A knowledge document to be used by a [KnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBase].
+   * A knowledge document to be used by a
+   * [KnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBase].
    * For more information, see the [knowledge base
    * guide](https://cloud.google.com/dialogflow/docs/how/knowledge-bases).
    * Note: The `projects.agent.knowledgeBases.documents` resource is deprecated;
@@ -2593,25 +2613,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       displayName_ = "";
-
       mimeType_ = "";
-
       knowledgeTypes_ = java.util.Collections.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000008);
       enableAutoReload_ = false;
-
-      if (latestReloadStatusBuilder_ == null) {
-        latestReloadStatus_ = null;
-      } else {
-        latestReloadStatus_ = null;
+      latestReloadStatus_ = null;
+      if (latestReloadStatusBuilder_ != null) {
+        latestReloadStatusBuilder_.dispose();
         latestReloadStatusBuilder_ = null;
       }
       internalGetMutableMetadata().clear();
       state_ = 0;
-
       sourceCase_ = 0;
       source_ = null;
       return this;
@@ -2641,33 +2656,55 @@ public com.google.cloud.dialogflow.v2.Document build() {
     public com.google.cloud.dialogflow.v2.Document buildPartial() {
       com.google.cloud.dialogflow.v2.Document result =
           new com.google.cloud.dialogflow.v2.Document(this);
-      int from_bitField0_ = bitField0_;
-      result.name_ = name_;
-      result.displayName_ = displayName_;
-      result.mimeType_ = mimeType_;
-      if (((bitField0_ & 0x00000001) != 0)) {
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.cloud.dialogflow.v2.Document result) {
+      if (((bitField0_ & 0x00000008) != 0)) {
         knowledgeTypes_ = java.util.Collections.unmodifiableList(knowledgeTypes_);
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000008);
       }
       result.knowledgeTypes_ = knowledgeTypes_;
-      if (sourceCase_ == 5) {
-        result.source_ = source_;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.Document result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
       }
-      if (sourceCase_ == 9) {
-        result.source_ = source_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.displayName_ = displayName_;
       }
-      result.enableAutoReload_ = enableAutoReload_;
-      if (latestReloadStatusBuilder_ == null) {
-        result.latestReloadStatus_ = latestReloadStatus_;
-      } else {
-        result.latestReloadStatus_ = latestReloadStatusBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.mimeType_ = mimeType_;
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.enableAutoReload_ = enableAutoReload_;
       }
-      result.metadata_ = internalGetMetadata();
-      result.metadata_.makeImmutable();
-      result.state_ = state_;
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.latestReloadStatus_ =
+            latestReloadStatusBuilder_ == null
+                ? latestReloadStatus_
+                : latestReloadStatusBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000100) != 0)) {
+        result.metadata_ = internalGetMetadata();
+        result.metadata_.makeImmutable();
+      }
+      if (((from_bitField0_ & 0x00000200) != 0)) {
+        result.state_ = state_;
+      }
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2.Document result) {
       result.sourceCase_ = sourceCase_;
-      onBuilt();
-      return result;
+      result.source_ = this.source_;
     }
 
     @java.lang.Override
@@ -2717,20 +2754,23 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Document other) {
       if (other == com.google.cloud.dialogflow.v2.Document.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getMimeType().isEmpty()) {
         mimeType_ = other.mimeType_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.knowledgeTypes_.isEmpty()) {
         if (knowledgeTypes_.isEmpty()) {
           knowledgeTypes_ = other.knowledgeTypes_;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000008);
         } else {
           ensureKnowledgeTypesIsMutable();
           knowledgeTypes_.addAll(other.knowledgeTypes_);
@@ -2744,6 +2784,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Document other) {
         mergeLatestReloadStatus(other.getLatestReloadStatus());
       }
       internalGetMutableMetadata().mergeFrom(other.internalGetMetadata());
+      bitField0_ |= 0x00000100;
       if (other.state_ != 0) {
         setStateValue(other.getStateValue());
       }
@@ -2794,19 +2835,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 displayName_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 mimeType_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 32:
@@ -2844,6 +2885,7 @@ public Builder mergeFrom(
                 internalGetMutableMetadata()
                     .getMutableMap()
                     .put(metadata__.getKey(), metadata__.getValue());
+                bitField0_ |= 0x00000100;
                 break;
               } // case 58
             case 74:
@@ -2855,20 +2897,20 @@ public Builder mergeFrom(
             case 88:
               {
                 enableAutoReload_ = input.readBool();
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 88
             case 98:
               {
                 input.readMessage(
                     getLatestReloadStatusFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 98
             case 104:
               {
                 state_ = input.readEnum();
-
+                bitField0_ |= 0x00000200;
                 break;
               } // case 104
             default:
@@ -2974,8 +3016,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2994,8 +3036,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -3019,8 +3061,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -3089,8 +3131,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -3107,8 +3149,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
-
       displayName_ = getDefaultInstance().getDisplayName();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -3130,8 +3172,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -3197,8 +3239,8 @@ public Builder setMimeType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       mimeType_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -3214,8 +3256,8 @@ public Builder setMimeType(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearMimeType() {
-
       mimeType_ = getDefaultInstance().getMimeType();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -3236,8 +3278,8 @@ public Builder setMimeTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       mimeType_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -3245,9 +3287,9 @@ public Builder setMimeTypeBytes(com.google.protobuf.ByteString value) {
     private java.util.List<java.lang.Integer> knowledgeTypes_ = java.util.Collections.emptyList();
 
     private void ensureKnowledgeTypesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         knowledgeTypes_ = new java.util.ArrayList<java.lang.Integer>(knowledgeTypes_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000008;
       }
     }
     /**
@@ -3389,7 +3431,7 @@ public Builder addAllKnowledgeTypes(
      */
     public Builder clearKnowledgeTypes() {
       knowledgeTypes_ = java.util.Collections.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -3791,6 +3833,7 @@ public boolean getEnableAutoReload() {
     public Builder setEnableAutoReload(boolean value) {
 
       enableAutoReload_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -3818,7 +3861,7 @@ public Builder setEnableAutoReload(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearEnableAutoReload() {
-
+      bitField0_ = (bitField0_ & ~0x00000040);
       enableAutoReload_ = false;
       onChanged();
       return this;
@@ -3846,7 +3889,7 @@ public Builder clearEnableAutoReload() {
      * @return Whether the latestReloadStatus field is set.
      */
     public boolean hasLatestReloadStatus() {
-      return latestReloadStatusBuilder_ != null || latestReloadStatus_ != null;
+      return ((bitField0_ & 0x00000080) != 0);
     }
     /**
      *
@@ -3892,11 +3935,11 @@ public Builder setLatestReloadStatus(
           throw new NullPointerException();
         }
         latestReloadStatus_ = value;
-        onChanged();
       } else {
         latestReloadStatusBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -3916,11 +3959,11 @@ public Builder setLatestReloadStatus(
         com.google.cloud.dialogflow.v2.Document.ReloadStatus.Builder builderForValue) {
       if (latestReloadStatusBuilder_ == null) {
         latestReloadStatus_ = builderForValue.build();
-        onChanged();
       } else {
         latestReloadStatusBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -3939,19 +3982,19 @@ public Builder setLatestReloadStatus(
     public Builder mergeLatestReloadStatus(
         com.google.cloud.dialogflow.v2.Document.ReloadStatus value) {
       if (latestReloadStatusBuilder_ == null) {
-        if (latestReloadStatus_ != null) {
-          latestReloadStatus_ =
-              com.google.cloud.dialogflow.v2.Document.ReloadStatus.newBuilder(latestReloadStatus_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000080) != 0)
+            && latestReloadStatus_ != null
+            && latestReloadStatus_
+                != com.google.cloud.dialogflow.v2.Document.ReloadStatus.getDefaultInstance()) {
+          getLatestReloadStatusBuilder().mergeFrom(value);
         } else {
           latestReloadStatus_ = value;
         }
-        onChanged();
       } else {
         latestReloadStatusBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -3968,14 +4011,13 @@ public Builder mergeLatestReloadStatus(
      * </code>
      */
     public Builder clearLatestReloadStatus() {
-      if (latestReloadStatusBuilder_ == null) {
-        latestReloadStatus_ = null;
-        onChanged();
-      } else {
-        latestReloadStatus_ = null;
+      bitField0_ = (bitField0_ & ~0x00000080);
+      latestReloadStatus_ = null;
+      if (latestReloadStatusBuilder_ != null) {
+        latestReloadStatusBuilder_.dispose();
         latestReloadStatusBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3993,7 +4035,7 @@ public Builder clearLatestReloadStatus() {
      */
     public com.google.cloud.dialogflow.v2.Document.ReloadStatus.Builder
         getLatestReloadStatusBuilder() {
-
+      bitField0_ |= 0x00000080;
       onChanged();
       return getLatestReloadStatusFieldBuilder().getBuilder();
     }
@@ -4061,8 +4103,6 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
         internalGetMutableMetadata() {
-      onChanged();
-      ;
       if (metadata_ == null) {
         metadata_ =
             com.google.protobuf.MapField.newMapField(MetadataDefaultEntryHolder.defaultEntry);
@@ -4070,6 +4110,8 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
       if (!metadata_.isMutable()) {
         metadata_ = metadata_.copy();
       }
+      bitField0_ |= 0x00000100;
+      onChanged();
       return metadata_;
     }
 
@@ -4133,8 +4175,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
      * </code>
      */
     @java.lang.Override
-    public java.lang.String getMetadataOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getMetadataOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -4167,6 +4211,7 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
     }
 
     public Builder clearMetadata() {
+      bitField0_ = (bitField0_ & ~0x00000100);
       internalGetMutableMetadata().getMutableMap().clear();
       return this;
     }
@@ -4193,6 +4238,7 @@ public Builder removeMetadata(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMutableMetadata() {
+      bitField0_ |= 0x00000100;
       return internalGetMutableMetadata().getMutableMap();
     }
     /**
@@ -4215,8 +4261,8 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableMetadata().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000100;
       return this;
     }
     /**
@@ -4234,6 +4280,7 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllMetadata(java.util.Map<java.lang.String, java.lang.String> values) {
       internalGetMutableMetadata().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000100;
       return this;
     }
 
@@ -4270,8 +4317,8 @@ public int getStateValue() {
      * @return This builder for chaining.
      */
     public Builder setStateValue(int value) {
-
       state_ = value;
+      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -4290,9 +4337,8 @@ public Builder setStateValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.Document.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.Document.State result =
-          com.google.cloud.dialogflow.v2.Document.State.valueOf(state_);
+          com.google.cloud.dialogflow.v2.Document.State.forNumber(state_);
       return result == null ? com.google.cloud.dialogflow.v2.Document.State.UNRECOGNIZED : result;
     }
     /**
@@ -4313,7 +4359,7 @@ public Builder setState(com.google.cloud.dialogflow.v2.Document.State value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000200;
       state_ = value.getNumber();
       onChanged();
       return this;
@@ -4332,7 +4378,7 @@ public Builder setState(com.google.cloud.dialogflow.v2.Document.State value) {
      * @return This builder for chaining.
      */
     public Builder clearState() {
-
+      bitField0_ = (bitField0_ & ~0x00000200);
       state_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DocumentOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DocumentOrBuilder.java
index 6822ef7c8919..3b3fd01083bb 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DocumentOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DocumentOrBuilder.java
@@ -387,7 +387,6 @@ public interface DocumentOrBuilder
    *
    * <code>map&lt;string, string&gt; metadata = 7 [(.google.api.field_behavior) = OPTIONAL];</code>
    */
-
   /* nullable */
   java.lang.String getMetadataOrDefault(
       java.lang.String key,
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DocumentProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DocumentProto.java
index 8e87479b0578..6d5f9461da5a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DocumentProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DocumentProto.java
@@ -265,11 +265,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "perationMetadata\032x\312A\031dialogflow.googleap"
           + "is.com\322AYhttps://www.googleapis.com/auth"
           + "/cloud-platform,https://www.googleapis.c"
-          + "om/auth/dialogflowB\234\001\n\036com.google.cloud."
-          + "dialogflow.v2B\rDocumentProtoP\001ZDgoogle.g"
-          + "olang.org/genproto/googleapis/cloud/dial"
-          + "ogflow/v2;dialogflow\370\001\001\242\002\002DF\252\002\032Google.Cl"
-          + "oud.Dialogflow.V2b\006proto3"
+          + "om/auth/dialogflowB\226\001\n\036com.google.cloud."
+          + "dialogflow.v2B\rDocumentProtoP\001Z>cloud.go"
+          + "ogle.com/go/dialogflow/apiv2/dialogflowp"
+          + "b;dialogflowpb\370\001\001\242\002\002DF\252\002\032Google.Cloud.Di"
+          + "alogflow.V2b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DtmfParameters.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DtmfParameters.java
index 13f008c7ab9a..b47511b41381 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DtmfParameters.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DtmfParameters.java
@@ -66,7 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ACCEPTS_DTMF_INPUT_FIELD_NUMBER = 1;
-  private boolean acceptsDtmfInput_;
+  private boolean acceptsDtmfInput_ = false;
   /**
    *
    *
@@ -280,8 +280,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       acceptsDtmfInput_ = false;
-
       return this;
     }
 
@@ -309,11 +309,20 @@ public com.google.cloud.dialogflow.v2.DtmfParameters build() {
     public com.google.cloud.dialogflow.v2.DtmfParameters buildPartial() {
       com.google.cloud.dialogflow.v2.DtmfParameters result =
           new com.google.cloud.dialogflow.v2.DtmfParameters(this);
-      result.acceptsDtmfInput_ = acceptsDtmfInput_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.DtmfParameters result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.acceptsDtmfInput_ = acceptsDtmfInput_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -391,7 +400,7 @@ public Builder mergeFrom(
             case 8:
               {
                 acceptsDtmfInput_ = input.readBool();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             default:
@@ -411,6 +420,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private boolean acceptsDtmfInput_;
     /**
      *
@@ -442,6 +453,7 @@ public boolean getAcceptsDtmfInput() {
     public Builder setAcceptsDtmfInput(boolean value) {
 
       acceptsDtmfInput_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -457,7 +469,7 @@ public Builder setAcceptsDtmfInput(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearAcceptsDtmfInput() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       acceptsDtmfInput_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityType.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityType.java
index da4217822cd7..d0dad18f6be1 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityType.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityType.java
@@ -571,7 +571,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int VALUE_FIELD_NUMBER = 1;
-    private volatile java.lang.Object value_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object value_ = "";
     /**
      *
      *
@@ -634,6 +636,8 @@ public com.google.protobuf.ByteString getValueBytes() {
     }
 
     public static final int SYNONYMS_FIELD_NUMBER = 2;
+
+    @SuppressWarnings("serial")
     private com.google.protobuf.LazyStringList synonyms_;
     /**
      *
@@ -925,10 +929,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         value_ = "";
-
         synonyms_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -956,17 +960,30 @@ public com.google.cloud.dialogflow.v2.EntityType.Entity build() {
       public com.google.cloud.dialogflow.v2.EntityType.Entity buildPartial() {
         com.google.cloud.dialogflow.v2.EntityType.Entity result =
             new com.google.cloud.dialogflow.v2.EntityType.Entity(this);
-        int from_bitField0_ = bitField0_;
-        result.value_ = value_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          synonyms_ = synonyms_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000001);
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
-        result.synonyms_ = synonyms_;
         onBuilt();
         return result;
       }
 
+      private void buildPartialRepeatedFields(
+          com.google.cloud.dialogflow.v2.EntityType.Entity result) {
+        if (((bitField0_ & 0x00000002) != 0)) {
+          synonyms_ = synonyms_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.synonyms_ = synonyms_;
+      }
+
+      private void buildPartial0(com.google.cloud.dialogflow.v2.EntityType.Entity result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.value_ = value_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1017,12 +1034,13 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.EntityType.Entity other)
           return this;
         if (!other.getValue().isEmpty()) {
           value_ = other.value_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.synonyms_.isEmpty()) {
           if (synonyms_.isEmpty()) {
             synonyms_ = other.synonyms_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureSynonymsIsMutable();
             synonyms_.addAll(other.synonyms_);
@@ -1058,7 +1076,7 @@ public Builder mergeFrom(
               case 10:
                 {
                   value_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
@@ -1169,8 +1187,8 @@ public Builder setValue(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         value_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1193,8 +1211,8 @@ public Builder setValue(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearValue() {
-
         value_ = getDefaultInstance().getValue();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1222,8 +1240,8 @@ public Builder setValueBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         value_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1232,9 +1250,9 @@ public Builder setValueBytes(com.google.protobuf.ByteString value) {
           com.google.protobuf.LazyStringArrayList.EMPTY;
 
       private void ensureSynonymsIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
           synonyms_ = new com.google.protobuf.LazyStringArrayList(synonyms_);
-          bitField0_ |= 0x00000001;
+          bitField0_ |= 0x00000002;
         }
       }
       /**
@@ -1401,7 +1419,7 @@ public Builder addAllSynonyms(java.lang.Iterable<java.lang.String> values) {
        */
       public Builder clearSynonyms() {
         synonyms_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1497,15 +1515,20 @@ public com.google.cloud.dialogflow.v2.EntityType.Entity getDefaultInstanceForTyp
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
    * <pre>
    * The unique identifier of the entity type.
-   * Required for [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType] and
-   * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes] methods.
-   * Format: `projects/&lt;Project ID&gt;/agent/entityTypes/&lt;Entity Type ID&gt;`.
+   * Required for
+   * [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType]
+   * and
+   * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes]
+   * methods. Format: `projects/&lt;Project ID&gt;/agent/entityTypes/&lt;Entity Type
+   * ID&gt;`.
    * </pre>
    *
    * <code>string name = 1;</code>
@@ -1529,9 +1552,12 @@ public java.lang.String getName() {
    *
    * <pre>
    * The unique identifier of the entity type.
-   * Required for [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType] and
-   * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes] methods.
-   * Format: `projects/&lt;Project ID&gt;/agent/entityTypes/&lt;Entity Type ID&gt;`.
+   * Required for
+   * [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType]
+   * and
+   * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes]
+   * methods. Format: `projects/&lt;Project ID&gt;/agent/entityTypes/&lt;Entity Type
+   * ID&gt;`.
    * </pre>
    *
    * <code>string name = 1;</code>
@@ -1552,7 +1578,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
@@ -1601,7 +1629,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
   }
 
   public static final int KIND_FIELD_NUMBER = 3;
-  private int kind_;
+  private int kind_ = 0;
   /**
    *
    *
@@ -1634,14 +1662,13 @@ public int getKindValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.EntityType.Kind getKind() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.EntityType.Kind result =
-        com.google.cloud.dialogflow.v2.EntityType.Kind.valueOf(kind_);
+        com.google.cloud.dialogflow.v2.EntityType.Kind.forNumber(kind_);
     return result == null ? com.google.cloud.dialogflow.v2.EntityType.Kind.UNRECOGNIZED : result;
   }
 
   public static final int AUTO_EXPANSION_MODE_FIELD_NUMBER = 4;
-  private int autoExpansionMode_;
+  private int autoExpansionMode_ = 0;
   /**
    *
    *
@@ -1676,15 +1703,16 @@ public int getAutoExpansionModeValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.EntityType.AutoExpansionMode getAutoExpansionMode() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.EntityType.AutoExpansionMode result =
-        com.google.cloud.dialogflow.v2.EntityType.AutoExpansionMode.valueOf(autoExpansionMode_);
+        com.google.cloud.dialogflow.v2.EntityType.AutoExpansionMode.forNumber(autoExpansionMode_);
     return result == null
         ? com.google.cloud.dialogflow.v2.EntityType.AutoExpansionMode.UNRECOGNIZED
         : result;
   }
 
   public static final int ENTITIES_FIELD_NUMBER = 6;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.EntityType.Entity> entities_;
   /**
    *
@@ -1764,7 +1792,7 @@ public com.google.cloud.dialogflow.v2.EntityType.EntityOrBuilder getEntitiesOrBu
   }
 
   public static final int ENABLE_FUZZY_EXTRACTION_FIELD_NUMBER = 7;
-  private boolean enableFuzzyExtraction_;
+  private boolean enableFuzzyExtraction_ = false;
   /**
    *
    *
@@ -2040,23 +2068,19 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       displayName_ = "";
-
       kind_ = 0;
-
       autoExpansionMode_ = 0;
-
       if (entitiesBuilder_ == null) {
         entities_ = java.util.Collections.emptyList();
       } else {
         entities_ = null;
         entitiesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000010);
       enableFuzzyExtraction_ = false;
-
       return this;
     }
 
@@ -2084,23 +2108,43 @@ public com.google.cloud.dialogflow.v2.EntityType build() {
     public com.google.cloud.dialogflow.v2.EntityType buildPartial() {
       com.google.cloud.dialogflow.v2.EntityType result =
           new com.google.cloud.dialogflow.v2.EntityType(this);
-      int from_bitField0_ = bitField0_;
-      result.name_ = name_;
-      result.displayName_ = displayName_;
-      result.kind_ = kind_;
-      result.autoExpansionMode_ = autoExpansionMode_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.cloud.dialogflow.v2.EntityType result) {
       if (entitiesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000010) != 0)) {
           entities_ = java.util.Collections.unmodifiableList(entities_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000010);
         }
         result.entities_ = entities_;
       } else {
         result.entities_ = entitiesBuilder_.build();
       }
-      result.enableFuzzyExtraction_ = enableFuzzyExtraction_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.EntityType result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.displayName_ = displayName_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.kind_ = kind_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.autoExpansionMode_ = autoExpansionMode_;
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.enableFuzzyExtraction_ = enableFuzzyExtraction_;
+      }
     }
 
     @java.lang.Override
@@ -2150,10 +2194,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.EntityType other) {
       if (other == com.google.cloud.dialogflow.v2.EntityType.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.kind_ != 0) {
@@ -2166,7 +2212,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.EntityType other) {
         if (!other.entities_.isEmpty()) {
           if (entities_.isEmpty()) {
             entities_ = other.entities_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
             ensureEntitiesIsMutable();
             entities_.addAll(other.entities_);
@@ -2179,7 +2225,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.EntityType other) {
             entitiesBuilder_.dispose();
             entitiesBuilder_ = null;
             entities_ = other.entities_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
             entitiesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getEntitiesFieldBuilder()
@@ -2221,25 +2267,25 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 displayName_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 kind_ = input.readEnum();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 32:
               {
                 autoExpansionMode_ = input.readEnum();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 32
             case 50:
@@ -2259,7 +2305,7 @@ public Builder mergeFrom(
             case 56:
               {
                 enableFuzzyExtraction_ = input.readBool();
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 56
             default:
@@ -2287,9 +2333,12 @@ public Builder mergeFrom(
      *
      * <pre>
      * The unique identifier of the entity type.
-     * Required for [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType] and
-     * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes] methods.
-     * Format: `projects/&lt;Project ID&gt;/agent/entityTypes/&lt;Entity Type ID&gt;`.
+     * Required for
+     * [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType]
+     * and
+     * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes]
+     * methods. Format: `projects/&lt;Project ID&gt;/agent/entityTypes/&lt;Entity Type
+     * ID&gt;`.
      * </pre>
      *
      * <code>string name = 1;</code>
@@ -2312,9 +2361,12 @@ public java.lang.String getName() {
      *
      * <pre>
      * The unique identifier of the entity type.
-     * Required for [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType] and
-     * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes] methods.
-     * Format: `projects/&lt;Project ID&gt;/agent/entityTypes/&lt;Entity Type ID&gt;`.
+     * Required for
+     * [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType]
+     * and
+     * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes]
+     * methods. Format: `projects/&lt;Project ID&gt;/agent/entityTypes/&lt;Entity Type
+     * ID&gt;`.
      * </pre>
      *
      * <code>string name = 1;</code>
@@ -2337,9 +2389,12 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      * <pre>
      * The unique identifier of the entity type.
-     * Required for [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType] and
-     * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes] methods.
-     * Format: `projects/&lt;Project ID&gt;/agent/entityTypes/&lt;Entity Type ID&gt;`.
+     * Required for
+     * [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType]
+     * and
+     * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes]
+     * methods. Format: `projects/&lt;Project ID&gt;/agent/entityTypes/&lt;Entity Type
+     * ID&gt;`.
      * </pre>
      *
      * <code>string name = 1;</code>
@@ -2351,8 +2406,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2361,9 +2416,12 @@ public Builder setName(java.lang.String value) {
      *
      * <pre>
      * The unique identifier of the entity type.
-     * Required for [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType] and
-     * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes] methods.
-     * Format: `projects/&lt;Project ID&gt;/agent/entityTypes/&lt;Entity Type ID&gt;`.
+     * Required for
+     * [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType]
+     * and
+     * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes]
+     * methods. Format: `projects/&lt;Project ID&gt;/agent/entityTypes/&lt;Entity Type
+     * ID&gt;`.
      * </pre>
      *
      * <code>string name = 1;</code>
@@ -2371,8 +2429,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -2381,9 +2439,12 @@ public Builder clearName() {
      *
      * <pre>
      * The unique identifier of the entity type.
-     * Required for [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType] and
-     * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes] methods.
-     * Format: `projects/&lt;Project ID&gt;/agent/entityTypes/&lt;Entity Type ID&gt;`.
+     * Required for
+     * [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType]
+     * and
+     * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes]
+     * methods. Format: `projects/&lt;Project ID&gt;/agent/entityTypes/&lt;Entity Type
+     * ID&gt;`.
      * </pre>
      *
      * <code>string name = 1;</code>
@@ -2396,8 +2457,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2463,8 +2524,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -2480,8 +2541,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
-
       displayName_ = getDefaultInstance().getDisplayName();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -2502,8 +2563,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -2541,8 +2602,8 @@ public int getKindValue() {
      * @return This builder for chaining.
      */
     public Builder setKindValue(int value) {
-
       kind_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2561,9 +2622,8 @@ public Builder setKindValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.EntityType.Kind getKind() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.EntityType.Kind result =
-          com.google.cloud.dialogflow.v2.EntityType.Kind.valueOf(kind_);
+          com.google.cloud.dialogflow.v2.EntityType.Kind.forNumber(kind_);
       return result == null ? com.google.cloud.dialogflow.v2.EntityType.Kind.UNRECOGNIZED : result;
     }
     /**
@@ -2584,7 +2644,7 @@ public Builder setKind(com.google.cloud.dialogflow.v2.EntityType.Kind value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000004;
       kind_ = value.getNumber();
       onChanged();
       return this;
@@ -2603,7 +2663,7 @@ public Builder setKind(com.google.cloud.dialogflow.v2.EntityType.Kind value) {
      * @return This builder for chaining.
      */
     public Builder clearKind() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       kind_ = 0;
       onChanged();
       return this;
@@ -2644,8 +2704,8 @@ public int getAutoExpansionModeValue() {
      * @return This builder for chaining.
      */
     public Builder setAutoExpansionModeValue(int value) {
-
       autoExpansionMode_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2665,9 +2725,8 @@ public Builder setAutoExpansionModeValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.EntityType.AutoExpansionMode getAutoExpansionMode() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.EntityType.AutoExpansionMode result =
-          com.google.cloud.dialogflow.v2.EntityType.AutoExpansionMode.valueOf(autoExpansionMode_);
+          com.google.cloud.dialogflow.v2.EntityType.AutoExpansionMode.forNumber(autoExpansionMode_);
       return result == null
           ? com.google.cloud.dialogflow.v2.EntityType.AutoExpansionMode.UNRECOGNIZED
           : result;
@@ -2692,7 +2751,7 @@ public Builder setAutoExpansionMode(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000008;
       autoExpansionMode_ = value.getNumber();
       onChanged();
       return this;
@@ -2712,7 +2771,7 @@ public Builder setAutoExpansionMode(
      * @return This builder for chaining.
      */
     public Builder clearAutoExpansionMode() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       autoExpansionMode_ = 0;
       onChanged();
       return this;
@@ -2722,10 +2781,10 @@ public Builder clearAutoExpansionMode() {
         java.util.Collections.emptyList();
 
     private void ensureEntitiesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         entities_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.EntityType.Entity>(entities_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000010;
       }
     }
 
@@ -2963,7 +3022,7 @@ public Builder addAllEntities(
     public Builder clearEntities() {
       if (entitiesBuilder_ == null) {
         entities_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
       } else {
         entitiesBuilder_.clear();
@@ -3100,7 +3159,7 @@ public com.google.cloud.dialogflow.v2.EntityType.Entity.Builder addEntitiesBuild
                 com.google.cloud.dialogflow.v2.EntityType.Entity,
                 com.google.cloud.dialogflow.v2.EntityType.Entity.Builder,
                 com.google.cloud.dialogflow.v2.EntityType.EntityOrBuilder>(
-                entities_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                entities_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
         entities_ = null;
       }
       return entitiesBuilder_;
@@ -3137,6 +3196,7 @@ public boolean getEnableFuzzyExtraction() {
     public Builder setEnableFuzzyExtraction(boolean value) {
 
       enableFuzzyExtraction_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -3152,7 +3212,7 @@ public Builder setEnableFuzzyExtraction(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearEnableFuzzyExtraction() {
-
+      bitField0_ = (bitField0_ & ~0x00000020);
       enableFuzzyExtraction_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeBatch.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeBatch.java
index dab0688121f8..cdfeaf015e9f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeBatch.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeBatch.java
@@ -68,6 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ENTITY_TYPES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.EntityType> entityTypes_;
   /**
    *
@@ -335,6 +337,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (entityTypesBuilder_ == null) {
         entityTypes_ = java.util.Collections.emptyList();
       } else {
@@ -369,7 +372,15 @@ public com.google.cloud.dialogflow.v2.EntityTypeBatch build() {
     public com.google.cloud.dialogflow.v2.EntityTypeBatch buildPartial() {
       com.google.cloud.dialogflow.v2.EntityTypeBatch result =
           new com.google.cloud.dialogflow.v2.EntityTypeBatch(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.cloud.dialogflow.v2.EntityTypeBatch result) {
       if (entityTypesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           entityTypes_ = java.util.Collections.unmodifiableList(entityTypes_);
@@ -379,8 +390,10 @@ public com.google.cloud.dialogflow.v2.EntityTypeBatch buildPartial() {
       } else {
         result.entityTypes_ = entityTypesBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.EntityTypeBatch result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeOrBuilder.java
index 59900abbaa9d..465dbf2f133f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeOrBuilder.java
@@ -28,9 +28,12 @@ public interface EntityTypeOrBuilder
    *
    * <pre>
    * The unique identifier of the entity type.
-   * Required for [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType] and
-   * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes] methods.
-   * Format: `projects/&lt;Project ID&gt;/agent/entityTypes/&lt;Entity Type ID&gt;`.
+   * Required for
+   * [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType]
+   * and
+   * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes]
+   * methods. Format: `projects/&lt;Project ID&gt;/agent/entityTypes/&lt;Entity Type
+   * ID&gt;`.
    * </pre>
    *
    * <code>string name = 1;</code>
@@ -43,9 +46,12 @@ public interface EntityTypeOrBuilder
    *
    * <pre>
    * The unique identifier of the entity type.
-   * Required for [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType] and
-   * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes] methods.
-   * Format: `projects/&lt;Project ID&gt;/agent/entityTypes/&lt;Entity Type ID&gt;`.
+   * Required for
+   * [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType]
+   * and
+   * [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes]
+   * methods. Format: `projects/&lt;Project ID&gt;/agent/entityTypes/&lt;Entity Type
+   * ID&gt;`.
    * </pre>
    *
    * <code>string name = 1;</code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeProto.java
index 7317426299f0..e41be5d6681b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeProto.java
@@ -254,11 +254,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + ".Struct\032x\312A\031dialogflow.googleapis.com\322AY"
           + "https://www.googleapis.com/auth/cloud-pl"
           + "atform,https://www.googleapis.com/auth/d"
-          + "ialogflowB\236\001\n\036com.google.cloud.dialogflo"
-          + "w.v2B\017EntityTypeProtoP\001ZDgoogle.golang.o"
-          + "rg/genproto/googleapis/cloud/dialogflow/"
-          + "v2;dialogflow\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dia"
-          + "logflow.V2b\006proto3"
+          + "ialogflowB\230\001\n\036com.google.cloud.dialogflo"
+          + "w.v2B\017EntityTypeProtoP\001Z>cloud.google.co"
+          + "m/go/dialogflow/apiv2/dialogflowpb;dialo"
+          + "gflowpb\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dialogflo"
+          + "w.V2b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Environment.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Environment.java
index eb288cc7a1f9..c3750d6829de 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Environment.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Environment.java
@@ -267,7 +267,9 @@ private State(int value) {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -326,7 +328,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 2;
-  private volatile java.lang.Object description_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object description_ = "";
   /**
    *
    *
@@ -377,7 +381,9 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
   }
 
   public static final int AGENT_VERSION_FIELD_NUMBER = 3;
-  private volatile java.lang.Object agentVersion_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object agentVersion_ = "";
   /**
    *
    *
@@ -438,13 +444,13 @@ public com.google.protobuf.ByteString getAgentVersionBytes() {
   }
 
   public static final int STATE_FIELD_NUMBER = 4;
-  private int state_;
+  private int state_ = 0;
   /**
    *
    *
    * <pre>
-   * Output only. The state of this environment. This field is read-only, i.e., it cannot be
-   * set by create and update methods.
+   * Output only. The state of this environment. This field is read-only, i.e.,
+   * it cannot be set by create and update methods.
    * </pre>
    *
    * <code>
@@ -461,8 +467,8 @@ public int getStateValue() {
    *
    *
    * <pre>
-   * Output only. The state of this environment. This field is read-only, i.e., it cannot be
-   * set by create and update methods.
+   * Output only. The state of this environment. This field is read-only, i.e.,
+   * it cannot be set by create and update methods.
    * </pre>
    *
    * <code>
@@ -473,9 +479,8 @@ public int getStateValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.Environment.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.Environment.State result =
-        com.google.cloud.dialogflow.v2.Environment.State.valueOf(state_);
+        com.google.cloud.dialogflow.v2.Environment.State.forNumber(state_);
     return result == null ? com.google.cloud.dialogflow.v2.Environment.State.UNRECOGNIZED : result;
   }
 
@@ -485,8 +490,8 @@ public com.google.cloud.dialogflow.v2.Environment.State getState() {
    *
    *
    * <pre>
-   * Output only. The last update time of this environment. This field is read-only, i.e., it
-   * cannot be set by create and update methods.
+   * Output only. The last update time of this environment. This field is
+   * read-only, i.e., it cannot be set by create and update methods.
    * </pre>
    *
    * <code>.google.protobuf.Timestamp update_time = 5 [(.google.api.field_behavior) = OUTPUT_ONLY];
@@ -502,8 +507,8 @@ public boolean hasUpdateTime() {
    *
    *
    * <pre>
-   * Output only. The last update time of this environment. This field is read-only, i.e., it
-   * cannot be set by create and update methods.
+   * Output only. The last update time of this environment. This field is
+   * read-only, i.e., it cannot be set by create and update methods.
    * </pre>
    *
    * <code>.google.protobuf.Timestamp update_time = 5 [(.google.api.field_behavior) = OUTPUT_ONLY];
@@ -519,8 +524,8 @@ public com.google.protobuf.Timestamp getUpdateTime() {
    *
    *
    * <pre>
-   * Output only. The last update time of this environment. This field is read-only, i.e., it
-   * cannot be set by create and update methods.
+   * Output only. The last update time of this environment. This field is
+   * read-only, i.e., it cannot be set by create and update methods.
    * </pre>
    *
    * <code>.google.protobuf.Timestamp update_time = 5 [(.google.api.field_behavior) = OUTPUT_ONLY];
@@ -528,7 +533,7 @@ public com.google.protobuf.Timestamp getUpdateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
-    return getUpdateTime();
+    return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
   }
 
   public static final int TEXT_TO_SPEECH_SETTINGS_FIELD_NUMBER = 7;
@@ -583,7 +588,9 @@ public com.google.cloud.dialogflow.v2.TextToSpeechSettings getTextToSpeechSettin
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.TextToSpeechSettingsOrBuilder
       getTextToSpeechSettingsOrBuilder() {
-    return getTextToSpeechSettings();
+    return textToSpeechSettings_ == null
+        ? com.google.cloud.dialogflow.v2.TextToSpeechSettings.getDefaultInstance()
+        : textToSpeechSettings_;
   }
 
   public static final int FULFILLMENT_FIELD_NUMBER = 8;
@@ -637,7 +644,9 @@ public com.google.cloud.dialogflow.v2.Fulfillment getFulfillment() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.FulfillmentOrBuilder getFulfillmentOrBuilder() {
-    return getFulfillment();
+    return fulfillment_ == null
+        ? com.google.cloud.dialogflow.v2.Fulfillment.getDefaultInstance()
+        : fulfillment_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -920,30 +929,24 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       description_ = "";
-
       agentVersion_ = "";
-
       state_ = 0;
-
-      if (updateTimeBuilder_ == null) {
-        updateTime_ = null;
-      } else {
-        updateTime_ = null;
+      updateTime_ = null;
+      if (updateTimeBuilder_ != null) {
+        updateTimeBuilder_.dispose();
         updateTimeBuilder_ = null;
       }
-      if (textToSpeechSettingsBuilder_ == null) {
-        textToSpeechSettings_ = null;
-      } else {
-        textToSpeechSettings_ = null;
+      textToSpeechSettings_ = null;
+      if (textToSpeechSettingsBuilder_ != null) {
+        textToSpeechSettingsBuilder_.dispose();
         textToSpeechSettingsBuilder_ = null;
       }
-      if (fulfillmentBuilder_ == null) {
-        fulfillment_ = null;
-      } else {
-        fulfillment_ = null;
+      fulfillment_ = null;
+      if (fulfillmentBuilder_ != null) {
+        fulfillmentBuilder_.dispose();
         fulfillmentBuilder_ = null;
       }
       return this;
@@ -973,29 +976,42 @@ public com.google.cloud.dialogflow.v2.Environment build() {
     public com.google.cloud.dialogflow.v2.Environment buildPartial() {
       com.google.cloud.dialogflow.v2.Environment result =
           new com.google.cloud.dialogflow.v2.Environment(this);
-      result.name_ = name_;
-      result.description_ = description_;
-      result.agentVersion_ = agentVersion_;
-      result.state_ = state_;
-      if (updateTimeBuilder_ == null) {
-        result.updateTime_ = updateTime_;
-      } else {
-        result.updateTime_ = updateTimeBuilder_.build();
-      }
-      if (textToSpeechSettingsBuilder_ == null) {
-        result.textToSpeechSettings_ = textToSpeechSettings_;
-      } else {
-        result.textToSpeechSettings_ = textToSpeechSettingsBuilder_.build();
-      }
-      if (fulfillmentBuilder_ == null) {
-        result.fulfillment_ = fulfillment_;
-      } else {
-        result.fulfillment_ = fulfillmentBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.Environment result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.description_ = description_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.agentVersion_ = agentVersion_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.state_ = state_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.textToSpeechSettings_ =
+            textToSpeechSettingsBuilder_ == null
+                ? textToSpeechSettings_
+                : textToSpeechSettingsBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.fulfillment_ =
+            fulfillmentBuilder_ == null ? fulfillment_ : fulfillmentBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -1043,14 +1059,17 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Environment other) {
       if (other == com.google.cloud.dialogflow.v2.Environment.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getAgentVersion().isEmpty()) {
         agentVersion_ = other.agentVersion_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.state_ != 0) {
@@ -1094,44 +1113,44 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 description_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 agentVersion_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 32:
               {
                 state_ = input.readEnum();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 32
             case 42:
               {
                 input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             case 58:
               {
                 input.readMessage(
                     getTextToSpeechSettingsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 58
             case 66:
               {
                 input.readMessage(getFulfillmentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 66
             default:
@@ -1151,6 +1170,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -1227,8 +1248,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1249,8 +1270,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1276,8 +1297,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1346,8 +1367,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       description_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1364,8 +1385,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
-
       description_ = getDefaultInstance().getDescription();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1387,8 +1408,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       description_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1472,8 +1493,8 @@ public Builder setAgentVersion(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       agentVersion_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1495,8 +1516,8 @@ public Builder setAgentVersion(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAgentVersion() {
-
       agentVersion_ = getDefaultInstance().getAgentVersion();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1523,8 +1544,8 @@ public Builder setAgentVersionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       agentVersion_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1534,8 +1555,8 @@ public Builder setAgentVersionBytes(com.google.protobuf.ByteString value) {
      *
      *
      * <pre>
-     * Output only. The state of this environment. This field is read-only, i.e., it cannot be
-     * set by create and update methods.
+     * Output only. The state of this environment. This field is read-only, i.e.,
+     * it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1552,8 +1573,8 @@ public int getStateValue() {
      *
      *
      * <pre>
-     * Output only. The state of this environment. This field is read-only, i.e., it cannot be
-     * set by create and update methods.
+     * Output only. The state of this environment. This field is read-only, i.e.,
+     * it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1564,8 +1585,8 @@ public int getStateValue() {
      * @return This builder for chaining.
      */
     public Builder setStateValue(int value) {
-
       state_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1573,8 +1594,8 @@ public Builder setStateValue(int value) {
      *
      *
      * <pre>
-     * Output only. The state of this environment. This field is read-only, i.e., it cannot be
-     * set by create and update methods.
+     * Output only. The state of this environment. This field is read-only, i.e.,
+     * it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1585,9 +1606,8 @@ public Builder setStateValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.Environment.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.Environment.State result =
-          com.google.cloud.dialogflow.v2.Environment.State.valueOf(state_);
+          com.google.cloud.dialogflow.v2.Environment.State.forNumber(state_);
       return result == null
           ? com.google.cloud.dialogflow.v2.Environment.State.UNRECOGNIZED
           : result;
@@ -1596,8 +1616,8 @@ public com.google.cloud.dialogflow.v2.Environment.State getState() {
      *
      *
      * <pre>
-     * Output only. The state of this environment. This field is read-only, i.e., it cannot be
-     * set by create and update methods.
+     * Output only. The state of this environment. This field is read-only, i.e.,
+     * it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1611,7 +1631,7 @@ public Builder setState(com.google.cloud.dialogflow.v2.Environment.State value)
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000008;
       state_ = value.getNumber();
       onChanged();
       return this;
@@ -1620,8 +1640,8 @@ public Builder setState(com.google.cloud.dialogflow.v2.Environment.State value)
      *
      *
      * <pre>
-     * Output only. The state of this environment. This field is read-only, i.e., it cannot be
-     * set by create and update methods.
+     * Output only. The state of this environment. This field is read-only, i.e.,
+     * it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1631,7 +1651,7 @@ public Builder setState(com.google.cloud.dialogflow.v2.Environment.State value)
      * @return This builder for chaining.
      */
     public Builder clearState() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       state_ = 0;
       onChanged();
       return this;
@@ -1647,8 +1667,8 @@ public Builder clearState() {
      *
      *
      * <pre>
-     * Output only. The last update time of this environment. This field is read-only, i.e., it
-     * cannot be set by create and update methods.
+     * Output only. The last update time of this environment. This field is
+     * read-only, i.e., it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1658,14 +1678,14 @@ public Builder clearState() {
      * @return Whether the updateTime field is set.
      */
     public boolean hasUpdateTime() {
-      return updateTimeBuilder_ != null || updateTime_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
      *
      * <pre>
-     * Output only. The last update time of this environment. This field is read-only, i.e., it
-     * cannot be set by create and update methods.
+     * Output only. The last update time of this environment. This field is
+     * read-only, i.e., it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1687,8 +1707,8 @@ public com.google.protobuf.Timestamp getUpdateTime() {
      *
      *
      * <pre>
-     * Output only. The last update time of this environment. This field is read-only, i.e., it
-     * cannot be set by create and update methods.
+     * Output only. The last update time of this environment. This field is
+     * read-only, i.e., it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1701,19 +1721,19 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         updateTime_ = value;
-        onChanged();
       } else {
         updateTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Output only. The last update time of this environment. This field is read-only, i.e., it
-     * cannot be set by create and update methods.
+     * Output only. The last update time of this environment. This field is
+     * read-only, i.e., it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1723,19 +1743,19 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
     public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (updateTimeBuilder_ == null) {
         updateTime_ = builderForValue.build();
-        onChanged();
       } else {
         updateTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Output only. The last update time of this environment. This field is read-only, i.e., it
-     * cannot be set by create and update methods.
+     * Output only. The last update time of this environment. This field is
+     * read-only, i.e., it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1744,25 +1764,26 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       if (updateTimeBuilder_ == null) {
-        if (updateTime_ != null) {
-          updateTime_ =
-              com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && updateTime_ != null
+            && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getUpdateTimeBuilder().mergeFrom(value);
         } else {
           updateTime_ = value;
         }
-        onChanged();
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Output only. The last update time of this environment. This field is read-only, i.e., it
-     * cannot be set by create and update methods.
+     * Output only. The last update time of this environment. This field is
+     * read-only, i.e., it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1770,22 +1791,21 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
      * </code>
      */
     public Builder clearUpdateTime() {
-      if (updateTimeBuilder_ == null) {
-        updateTime_ = null;
-        onChanged();
-      } else {
-        updateTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      updateTime_ = null;
+      if (updateTimeBuilder_ != null) {
+        updateTimeBuilder_.dispose();
         updateTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Output only. The last update time of this environment. This field is read-only, i.e., it
-     * cannot be set by create and update methods.
+     * Output only. The last update time of this environment. This field is
+     * read-only, i.e., it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1793,7 +1813,7 @@ public Builder clearUpdateTime() {
      * </code>
      */
     public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getUpdateTimeFieldBuilder().getBuilder();
     }
@@ -1801,8 +1821,8 @@ public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
      *
      *
      * <pre>
-     * Output only. The last update time of this environment. This field is read-only, i.e., it
-     * cannot be set by create and update methods.
+     * Output only. The last update time of this environment. This field is
+     * read-only, i.e., it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1822,8 +1842,8 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
      *
      *
      * <pre>
-     * Output only. The last update time of this environment. This field is read-only, i.e., it
-     * cannot be set by create and update methods.
+     * Output only. The last update time of this environment. This field is
+     * read-only, i.e., it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1867,7 +1887,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
      * @return Whether the textToSpeechSettings field is set.
      */
     public boolean hasTextToSpeechSettings() {
-      return textToSpeechSettingsBuilder_ != null || textToSpeechSettings_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -1909,11 +1929,11 @@ public Builder setTextToSpeechSettings(
           throw new NullPointerException();
         }
         textToSpeechSettings_ = value;
-        onChanged();
       } else {
         textToSpeechSettingsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1931,11 +1951,11 @@ public Builder setTextToSpeechSettings(
         com.google.cloud.dialogflow.v2.TextToSpeechSettings.Builder builderForValue) {
       if (textToSpeechSettingsBuilder_ == null) {
         textToSpeechSettings_ = builderForValue.build();
-        onChanged();
       } else {
         textToSpeechSettingsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1952,19 +1972,19 @@ public Builder setTextToSpeechSettings(
     public Builder mergeTextToSpeechSettings(
         com.google.cloud.dialogflow.v2.TextToSpeechSettings value) {
       if (textToSpeechSettingsBuilder_ == null) {
-        if (textToSpeechSettings_ != null) {
-          textToSpeechSettings_ =
-              com.google.cloud.dialogflow.v2.TextToSpeechSettings.newBuilder(textToSpeechSettings_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && textToSpeechSettings_ != null
+            && textToSpeechSettings_
+                != com.google.cloud.dialogflow.v2.TextToSpeechSettings.getDefaultInstance()) {
+          getTextToSpeechSettingsBuilder().mergeFrom(value);
         } else {
           textToSpeechSettings_ = value;
         }
-        onChanged();
       } else {
         textToSpeechSettingsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1979,14 +1999,13 @@ public Builder mergeTextToSpeechSettings(
      * </code>
      */
     public Builder clearTextToSpeechSettings() {
-      if (textToSpeechSettingsBuilder_ == null) {
-        textToSpeechSettings_ = null;
-        onChanged();
-      } else {
-        textToSpeechSettings_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      textToSpeechSettings_ = null;
+      if (textToSpeechSettingsBuilder_ != null) {
+        textToSpeechSettingsBuilder_.dispose();
         textToSpeechSettingsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2002,7 +2021,7 @@ public Builder clearTextToSpeechSettings() {
      */
     public com.google.cloud.dialogflow.v2.TextToSpeechSettings.Builder
         getTextToSpeechSettingsBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getTextToSpeechSettingsFieldBuilder().getBuilder();
     }
@@ -2075,7 +2094,7 @@ public Builder clearTextToSpeechSettings() {
      * @return Whether the fulfillment field is set.
      */
     public boolean hasFulfillment() {
-      return fulfillmentBuilder_ != null || fulfillment_ != null;
+      return ((bitField0_ & 0x00000040) != 0);
     }
     /**
      *
@@ -2116,11 +2135,11 @@ public Builder setFulfillment(com.google.cloud.dialogflow.v2.Fulfillment value)
           throw new NullPointerException();
         }
         fulfillment_ = value;
-        onChanged();
       } else {
         fulfillmentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2138,11 +2157,11 @@ public Builder setFulfillment(
         com.google.cloud.dialogflow.v2.Fulfillment.Builder builderForValue) {
       if (fulfillmentBuilder_ == null) {
         fulfillment_ = builderForValue.build();
-        onChanged();
       } else {
         fulfillmentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2158,19 +2177,18 @@ public Builder setFulfillment(
      */
     public Builder mergeFulfillment(com.google.cloud.dialogflow.v2.Fulfillment value) {
       if (fulfillmentBuilder_ == null) {
-        if (fulfillment_ != null) {
-          fulfillment_ =
-              com.google.cloud.dialogflow.v2.Fulfillment.newBuilder(fulfillment_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000040) != 0)
+            && fulfillment_ != null
+            && fulfillment_ != com.google.cloud.dialogflow.v2.Fulfillment.getDefaultInstance()) {
+          getFulfillmentBuilder().mergeFrom(value);
         } else {
           fulfillment_ = value;
         }
-        onChanged();
       } else {
         fulfillmentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2185,14 +2203,13 @@ public Builder mergeFulfillment(com.google.cloud.dialogflow.v2.Fulfillment value
      * </code>
      */
     public Builder clearFulfillment() {
-      if (fulfillmentBuilder_ == null) {
-        fulfillment_ = null;
-        onChanged();
-      } else {
-        fulfillment_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      fulfillment_ = null;
+      if (fulfillmentBuilder_ != null) {
+        fulfillmentBuilder_.dispose();
         fulfillmentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2207,7 +2224,7 @@ public Builder clearFulfillment() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.Fulfillment.Builder getFulfillmentBuilder() {
-
+      bitField0_ |= 0x00000040;
       onChanged();
       return getFulfillmentFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentHistory.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentHistory.java
index a01fc3e706c4..d37c8107a30a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentHistory.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentHistory.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The response message for [Environments.GetEnvironmentHistory][google.cloud.dialogflow.v2.Environments.GetEnvironmentHistory].
+ * The response message for
+ * [Environments.GetEnvironmentHistory][google.cloud.dialogflow.v2.Environments.GetEnvironmentHistory].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.EnvironmentHistory}
@@ -210,7 +211,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int AGENT_VERSION_FIELD_NUMBER = 1;
-    private volatile java.lang.Object agentVersion_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object agentVersion_ = "";
     /**
      *
      *
@@ -259,7 +262,9 @@ public com.google.protobuf.ByteString getAgentVersionBytes() {
     }
 
     public static final int DESCRIPTION_FIELD_NUMBER = 2;
-    private volatile java.lang.Object description_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object description_ = "";
     /**
      *
      *
@@ -350,7 +355,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-      return getCreateTime();
+      return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -576,14 +581,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         agentVersion_ = "";
-
         description_ = "";
-
-        if (createTimeBuilder_ == null) {
-          createTime_ = null;
-        } else {
-          createTime_ = null;
+        createTime_ = null;
+        if (createTimeBuilder_ != null) {
+          createTimeBuilder_.dispose();
           createTimeBuilder_ = null;
         }
         return this;
@@ -613,17 +616,27 @@ public com.google.cloud.dialogflow.v2.EnvironmentHistory.Entry build() {
       public com.google.cloud.dialogflow.v2.EnvironmentHistory.Entry buildPartial() {
         com.google.cloud.dialogflow.v2.EnvironmentHistory.Entry result =
             new com.google.cloud.dialogflow.v2.EnvironmentHistory.Entry(this);
-        result.agentVersion_ = agentVersion_;
-        result.description_ = description_;
-        if (createTimeBuilder_ == null) {
-          result.createTime_ = createTime_;
-        } else {
-          result.createTime_ = createTimeBuilder_.build();
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(com.google.cloud.dialogflow.v2.EnvironmentHistory.Entry result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.agentVersion_ = agentVersion_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.description_ = description_;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.createTime_ =
+              createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -674,10 +687,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.EnvironmentHistory.Entry
           return this;
         if (!other.getAgentVersion().isEmpty()) {
           agentVersion_ = other.agentVersion_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getDescription().isEmpty()) {
           description_ = other.description_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasCreateTime()) {
@@ -712,19 +727,19 @@ public Builder mergeFrom(
               case 10:
                 {
                   agentVersion_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
                 {
                   description_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 18
               case 26:
                 {
                   input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000004;
                   break;
                 } // case 26
               default:
@@ -744,6 +759,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object agentVersion_ = "";
       /**
        *
@@ -805,8 +822,8 @@ public Builder setAgentVersion(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         agentVersion_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -822,8 +839,8 @@ public Builder setAgentVersion(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearAgentVersion() {
-
         agentVersion_ = getDefaultInstance().getAgentVersion();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -844,8 +861,8 @@ public Builder setAgentVersionBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         agentVersion_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -911,8 +928,8 @@ public Builder setDescription(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         description_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -928,8 +945,8 @@ public Builder setDescription(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearDescription() {
-
         description_ = getDefaultInstance().getDescription();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -950,8 +967,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         description_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -974,7 +991,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
        * @return Whether the createTime field is set.
        */
       public boolean hasCreateTime() {
-        return createTimeBuilder_ != null || createTime_ != null;
+        return ((bitField0_ & 0x00000004) != 0);
       }
       /**
        *
@@ -1011,11 +1028,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           createTime_ = value;
-          onChanged();
         } else {
           createTimeBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -1030,11 +1047,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
       public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
         if (createTimeBuilder_ == null) {
           createTime_ = builderForValue.build();
-          onChanged();
         } else {
           createTimeBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -1048,19 +1065,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
        */
       public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
         if (createTimeBuilder_ == null) {
-          if (createTime_ != null) {
-            createTime_ =
-                com.google.protobuf.Timestamp.newBuilder(createTime_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000004) != 0)
+              && createTime_ != null
+              && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+            getCreateTimeBuilder().mergeFrom(value);
           } else {
             createTime_ = value;
           }
-          onChanged();
         } else {
           createTimeBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -1073,14 +1089,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
        * <code>.google.protobuf.Timestamp create_time = 3;</code>
        */
       public Builder clearCreateTime() {
-        if (createTimeBuilder_ == null) {
-          createTime_ = null;
-          onChanged();
-        } else {
-          createTime_ = null;
+        bitField0_ = (bitField0_ & ~0x00000004);
+        createTime_ = null;
+        if (createTimeBuilder_ != null) {
+          createTimeBuilder_.dispose();
           createTimeBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -1093,7 +1108,7 @@ public Builder clearCreateTime() {
        * <code>.google.protobuf.Timestamp create_time = 3;</code>
        */
       public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+        bitField0_ |= 0x00000004;
         onChanged();
         return getCreateTimeFieldBuilder().getBuilder();
       }
@@ -1206,7 +1221,9 @@ public com.google.cloud.dialogflow.v2.EnvironmentHistory.Entry getDefaultInstanc
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -1265,13 +1282,15 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int ENTRIES_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.EnvironmentHistory.Entry> entries_;
   /**
    *
    *
    * <pre>
-   * Output only. The list of agent environments. There will be a maximum number of items
-   * returned based on the page_size field in the request.
+   * Output only. The list of agent environments. There will be a maximum number
+   * of items returned based on the page_size field in the request.
    * </pre>
    *
    * <code>
@@ -1286,8 +1305,8 @@ public java.util.List<com.google.cloud.dialogflow.v2.EnvironmentHistory.Entry> g
    *
    *
    * <pre>
-   * Output only. The list of agent environments. There will be a maximum number of items
-   * returned based on the page_size field in the request.
+   * Output only. The list of agent environments. There will be a maximum number
+   * of items returned based on the page_size field in the request.
    * </pre>
    *
    * <code>
@@ -1303,8 +1322,8 @@ public java.util.List<com.google.cloud.dialogflow.v2.EnvironmentHistory.Entry> g
    *
    *
    * <pre>
-   * Output only. The list of agent environments. There will be a maximum number of items
-   * returned based on the page_size field in the request.
+   * Output only. The list of agent environments. There will be a maximum number
+   * of items returned based on the page_size field in the request.
    * </pre>
    *
    * <code>
@@ -1319,8 +1338,8 @@ public int getEntriesCount() {
    *
    *
    * <pre>
-   * Output only. The list of agent environments. There will be a maximum number of items
-   * returned based on the page_size field in the request.
+   * Output only. The list of agent environments. There will be a maximum number
+   * of items returned based on the page_size field in the request.
    * </pre>
    *
    * <code>
@@ -1335,8 +1354,8 @@ public com.google.cloud.dialogflow.v2.EnvironmentHistory.Entry getEntries(int in
    *
    *
    * <pre>
-   * Output only. The list of agent environments. There will be a maximum number of items
-   * returned based on the page_size field in the request.
+   * Output only. The list of agent environments. There will be a maximum number
+   * of items returned based on the page_size field in the request.
    * </pre>
    *
    * <code>
@@ -1350,13 +1369,15 @@ public com.google.cloud.dialogflow.v2.EnvironmentHistory.EntryOrBuilder getEntri
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
    * <pre>
-   * Output only. Token to retrieve the next page of results, or empty if there are no
-   * more results in the list.
+   * Output only. Token to retrieve the next page of results, or empty if there
+   * are no more results in the list.
    * </pre>
    *
    * <code>string next_page_token = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1379,8 +1400,8 @@ public java.lang.String getNextPageToken() {
    *
    *
    * <pre>
-   * Output only. Token to retrieve the next page of results, or empty if there are no
-   * more results in the list.
+   * Output only. Token to retrieve the next page of results, or empty if there
+   * are no more results in the list.
    * </pre>
    *
    * <code>string next_page_token = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1583,7 +1604,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The response message for [Environments.GetEnvironmentHistory][google.cloud.dialogflow.v2.Environments.GetEnvironmentHistory].
+   * The response message for
+   * [Environments.GetEnvironmentHistory][google.cloud.dialogflow.v2.Environments.GetEnvironmentHistory].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.EnvironmentHistory}
@@ -1617,17 +1639,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       if (entriesBuilder_ == null) {
         entries_ = java.util.Collections.emptyList();
       } else {
         entries_ = null;
         entriesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -1655,20 +1676,35 @@ public com.google.cloud.dialogflow.v2.EnvironmentHistory build() {
     public com.google.cloud.dialogflow.v2.EnvironmentHistory buildPartial() {
       com.google.cloud.dialogflow.v2.EnvironmentHistory result =
           new com.google.cloud.dialogflow.v2.EnvironmentHistory(this);
-      int from_bitField0_ = bitField0_;
-      result.parent_ = parent_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.EnvironmentHistory result) {
       if (entriesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           entries_ = java.util.Collections.unmodifiableList(entries_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.entries_ = entries_;
       } else {
         result.entries_ = entriesBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.EnvironmentHistory result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -1719,13 +1755,14 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.EnvironmentHistory other
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (entriesBuilder_ == null) {
         if (!other.entries_.isEmpty()) {
           if (entries_.isEmpty()) {
             entries_ = other.entries_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureEntriesIsMutable();
             entries_.addAll(other.entries_);
@@ -1738,7 +1775,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.EnvironmentHistory other
             entriesBuilder_.dispose();
             entriesBuilder_ = null;
             entries_ = other.entries_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             entriesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getEntriesFieldBuilder()
@@ -1750,6 +1787,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.EnvironmentHistory other
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -1781,7 +1819,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -1801,7 +1839,7 @@ public Builder mergeFrom(
             case 26:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -1899,8 +1937,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1921,8 +1959,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1948,8 +1986,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1958,11 +1996,11 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureEntriesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         entries_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.EnvironmentHistory.Entry>(
                 entries_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -1976,8 +2014,8 @@ private void ensureEntriesIsMutable() {
      *
      *
      * <pre>
-     * Output only. The list of agent environments. There will be a maximum number of items
-     * returned based on the page_size field in the request.
+     * Output only. The list of agent environments. There will be a maximum number
+     * of items returned based on the page_size field in the request.
      * </pre>
      *
      * <code>
@@ -1996,8 +2034,8 @@ private void ensureEntriesIsMutable() {
      *
      *
      * <pre>
-     * Output only. The list of agent environments. There will be a maximum number of items
-     * returned based on the page_size field in the request.
+     * Output only. The list of agent environments. There will be a maximum number
+     * of items returned based on the page_size field in the request.
      * </pre>
      *
      * <code>
@@ -2015,8 +2053,8 @@ public int getEntriesCount() {
      *
      *
      * <pre>
-     * Output only. The list of agent environments. There will be a maximum number of items
-     * returned based on the page_size field in the request.
+     * Output only. The list of agent environments. There will be a maximum number
+     * of items returned based on the page_size field in the request.
      * </pre>
      *
      * <code>
@@ -2034,8 +2072,8 @@ public com.google.cloud.dialogflow.v2.EnvironmentHistory.Entry getEntries(int in
      *
      *
      * <pre>
-     * Output only. The list of agent environments. There will be a maximum number of items
-     * returned based on the page_size field in the request.
+     * Output only. The list of agent environments. There will be a maximum number
+     * of items returned based on the page_size field in the request.
      * </pre>
      *
      * <code>
@@ -2060,8 +2098,8 @@ public Builder setEntries(
      *
      *
      * <pre>
-     * Output only. The list of agent environments. There will be a maximum number of items
-     * returned based on the page_size field in the request.
+     * Output only. The list of agent environments. There will be a maximum number
+     * of items returned based on the page_size field in the request.
      * </pre>
      *
      * <code>
@@ -2084,8 +2122,8 @@ public Builder setEntries(
      *
      *
      * <pre>
-     * Output only. The list of agent environments. There will be a maximum number of items
-     * returned based on the page_size field in the request.
+     * Output only. The list of agent environments. There will be a maximum number
+     * of items returned based on the page_size field in the request.
      * </pre>
      *
      * <code>
@@ -2109,8 +2147,8 @@ public Builder addEntries(com.google.cloud.dialogflow.v2.EnvironmentHistory.Entr
      *
      *
      * <pre>
-     * Output only. The list of agent environments. There will be a maximum number of items
-     * returned based on the page_size field in the request.
+     * Output only. The list of agent environments. There will be a maximum number
+     * of items returned based on the page_size field in the request.
      * </pre>
      *
      * <code>
@@ -2135,8 +2173,8 @@ public Builder addEntries(
      *
      *
      * <pre>
-     * Output only. The list of agent environments. There will be a maximum number of items
-     * returned based on the page_size field in the request.
+     * Output only. The list of agent environments. There will be a maximum number
+     * of items returned based on the page_size field in the request.
      * </pre>
      *
      * <code>
@@ -2158,8 +2196,8 @@ public Builder addEntries(
      *
      *
      * <pre>
-     * Output only. The list of agent environments. There will be a maximum number of items
-     * returned based on the page_size field in the request.
+     * Output only. The list of agent environments. There will be a maximum number
+     * of items returned based on the page_size field in the request.
      * </pre>
      *
      * <code>
@@ -2182,8 +2220,8 @@ public Builder addEntries(
      *
      *
      * <pre>
-     * Output only. The list of agent environments. There will be a maximum number of items
-     * returned based on the page_size field in the request.
+     * Output only. The list of agent environments. There will be a maximum number
+     * of items returned based on the page_size field in the request.
      * </pre>
      *
      * <code>
@@ -2206,8 +2244,8 @@ public Builder addAllEntries(
      *
      *
      * <pre>
-     * Output only. The list of agent environments. There will be a maximum number of items
-     * returned based on the page_size field in the request.
+     * Output only. The list of agent environments. There will be a maximum number
+     * of items returned based on the page_size field in the request.
      * </pre>
      *
      * <code>
@@ -2217,7 +2255,7 @@ public Builder addAllEntries(
     public Builder clearEntries() {
       if (entriesBuilder_ == null) {
         entries_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         entriesBuilder_.clear();
@@ -2228,8 +2266,8 @@ public Builder clearEntries() {
      *
      *
      * <pre>
-     * Output only. The list of agent environments. There will be a maximum number of items
-     * returned based on the page_size field in the request.
+     * Output only. The list of agent environments. There will be a maximum number
+     * of items returned based on the page_size field in the request.
      * </pre>
      *
      * <code>
@@ -2250,8 +2288,8 @@ public Builder removeEntries(int index) {
      *
      *
      * <pre>
-     * Output only. The list of agent environments. There will be a maximum number of items
-     * returned based on the page_size field in the request.
+     * Output only. The list of agent environments. There will be a maximum number
+     * of items returned based on the page_size field in the request.
      * </pre>
      *
      * <code>
@@ -2266,8 +2304,8 @@ public com.google.cloud.dialogflow.v2.EnvironmentHistory.Entry.Builder getEntrie
      *
      *
      * <pre>
-     * Output only. The list of agent environments. There will be a maximum number of items
-     * returned based on the page_size field in the request.
+     * Output only. The list of agent environments. There will be a maximum number
+     * of items returned based on the page_size field in the request.
      * </pre>
      *
      * <code>
@@ -2286,8 +2324,8 @@ public com.google.cloud.dialogflow.v2.EnvironmentHistory.EntryOrBuilder getEntri
      *
      *
      * <pre>
-     * Output only. The list of agent environments. There will be a maximum number of items
-     * returned based on the page_size field in the request.
+     * Output only. The list of agent environments. There will be a maximum number
+     * of items returned based on the page_size field in the request.
      * </pre>
      *
      * <code>
@@ -2307,8 +2345,8 @@ public com.google.cloud.dialogflow.v2.EnvironmentHistory.EntryOrBuilder getEntri
      *
      *
      * <pre>
-     * Output only. The list of agent environments. There will be a maximum number of items
-     * returned based on the page_size field in the request.
+     * Output only. The list of agent environments. There will be a maximum number
+     * of items returned based on the page_size field in the request.
      * </pre>
      *
      * <code>
@@ -2323,8 +2361,8 @@ public com.google.cloud.dialogflow.v2.EnvironmentHistory.Entry.Builder addEntrie
      *
      *
      * <pre>
-     * Output only. The list of agent environments. There will be a maximum number of items
-     * returned based on the page_size field in the request.
+     * Output only. The list of agent environments. There will be a maximum number
+     * of items returned based on the page_size field in the request.
      * </pre>
      *
      * <code>
@@ -2341,8 +2379,8 @@ public com.google.cloud.dialogflow.v2.EnvironmentHistory.Entry.Builder addEntrie
      *
      *
      * <pre>
-     * Output only. The list of agent environments. There will be a maximum number of items
-     * returned based on the page_size field in the request.
+     * Output only. The list of agent environments. There will be a maximum number
+     * of items returned based on the page_size field in the request.
      * </pre>
      *
      * <code>
@@ -2365,7 +2403,7 @@ public com.google.cloud.dialogflow.v2.EnvironmentHistory.Entry.Builder addEntrie
                 com.google.cloud.dialogflow.v2.EnvironmentHistory.Entry,
                 com.google.cloud.dialogflow.v2.EnvironmentHistory.Entry.Builder,
                 com.google.cloud.dialogflow.v2.EnvironmentHistory.EntryOrBuilder>(
-                entries_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                entries_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         entries_ = null;
       }
       return entriesBuilder_;
@@ -2376,8 +2414,8 @@ public com.google.cloud.dialogflow.v2.EnvironmentHistory.Entry.Builder addEntrie
      *
      *
      * <pre>
-     * Output only. Token to retrieve the next page of results, or empty if there are no
-     * more results in the list.
+     * Output only. Token to retrieve the next page of results, or empty if there
+     * are no more results in the list.
      * </pre>
      *
      * <code>string next_page_token = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -2399,8 +2437,8 @@ public java.lang.String getNextPageToken() {
      *
      *
      * <pre>
-     * Output only. Token to retrieve the next page of results, or empty if there are no
-     * more results in the list.
+     * Output only. Token to retrieve the next page of results, or empty if there
+     * are no more results in the list.
      * </pre>
      *
      * <code>string next_page_token = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -2422,8 +2460,8 @@ public com.google.protobuf.ByteString getNextPageTokenBytes() {
      *
      *
      * <pre>
-     * Output only. Token to retrieve the next page of results, or empty if there are no
-     * more results in the list.
+     * Output only. Token to retrieve the next page of results, or empty if there
+     * are no more results in the list.
      * </pre>
      *
      * <code>string next_page_token = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -2435,8 +2473,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2444,8 +2482,8 @@ public Builder setNextPageToken(java.lang.String value) {
      *
      *
      * <pre>
-     * Output only. Token to retrieve the next page of results, or empty if there are no
-     * more results in the list.
+     * Output only. Token to retrieve the next page of results, or empty if there
+     * are no more results in the list.
      * </pre>
      *
      * <code>string next_page_token = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -2453,8 +2491,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -2462,8 +2500,8 @@ public Builder clearNextPageToken() {
      *
      *
      * <pre>
-     * Output only. Token to retrieve the next page of results, or empty if there are no
-     * more results in the list.
+     * Output only. Token to retrieve the next page of results, or empty if there
+     * are no more results in the list.
      * </pre>
      *
      * <code>string next_page_token = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -2476,8 +2514,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentHistoryOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentHistoryOrBuilder.java
index e34b80e4afcc..cea41ac02209 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentHistoryOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentHistoryOrBuilder.java
@@ -62,8 +62,8 @@ public interface EnvironmentHistoryOrBuilder
    *
    *
    * <pre>
-   * Output only. The list of agent environments. There will be a maximum number of items
-   * returned based on the page_size field in the request.
+   * Output only. The list of agent environments. There will be a maximum number
+   * of items returned based on the page_size field in the request.
    * </pre>
    *
    * <code>
@@ -75,8 +75,8 @@ public interface EnvironmentHistoryOrBuilder
    *
    *
    * <pre>
-   * Output only. The list of agent environments. There will be a maximum number of items
-   * returned based on the page_size field in the request.
+   * Output only. The list of agent environments. There will be a maximum number
+   * of items returned based on the page_size field in the request.
    * </pre>
    *
    * <code>
@@ -88,8 +88,8 @@ public interface EnvironmentHistoryOrBuilder
    *
    *
    * <pre>
-   * Output only. The list of agent environments. There will be a maximum number of items
-   * returned based on the page_size field in the request.
+   * Output only. The list of agent environments. There will be a maximum number
+   * of items returned based on the page_size field in the request.
    * </pre>
    *
    * <code>
@@ -101,8 +101,8 @@ public interface EnvironmentHistoryOrBuilder
    *
    *
    * <pre>
-   * Output only. The list of agent environments. There will be a maximum number of items
-   * returned based on the page_size field in the request.
+   * Output only. The list of agent environments. There will be a maximum number
+   * of items returned based on the page_size field in the request.
    * </pre>
    *
    * <code>
@@ -115,8 +115,8 @@ public interface EnvironmentHistoryOrBuilder
    *
    *
    * <pre>
-   * Output only. The list of agent environments. There will be a maximum number of items
-   * returned based on the page_size field in the request.
+   * Output only. The list of agent environments. There will be a maximum number
+   * of items returned based on the page_size field in the request.
    * </pre>
    *
    * <code>
@@ -129,8 +129,8 @@ public interface EnvironmentHistoryOrBuilder
    *
    *
    * <pre>
-   * Output only. Token to retrieve the next page of results, or empty if there are no
-   * more results in the list.
+   * Output only. Token to retrieve the next page of results, or empty if there
+   * are no more results in the list.
    * </pre>
    *
    * <code>string next_page_token = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -142,8 +142,8 @@ public interface EnvironmentHistoryOrBuilder
    *
    *
    * <pre>
-   * Output only. Token to retrieve the next page of results, or empty if there are no
-   * more results in the list.
+   * Output only. Token to retrieve the next page of results, or empty if there
+   * are no more results in the list.
    * </pre>
    *
    * <code>string next_page_token = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentOrBuilder.java
index ac890ed6ebef..548aba536e81 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentOrBuilder.java
@@ -126,8 +126,8 @@ public interface EnvironmentOrBuilder
    *
    *
    * <pre>
-   * Output only. The state of this environment. This field is read-only, i.e., it cannot be
-   * set by create and update methods.
+   * Output only. The state of this environment. This field is read-only, i.e.,
+   * it cannot be set by create and update methods.
    * </pre>
    *
    * <code>
@@ -141,8 +141,8 @@ public interface EnvironmentOrBuilder
    *
    *
    * <pre>
-   * Output only. The state of this environment. This field is read-only, i.e., it cannot be
-   * set by create and update methods.
+   * Output only. The state of this environment. This field is read-only, i.e.,
+   * it cannot be set by create and update methods.
    * </pre>
    *
    * <code>
@@ -157,8 +157,8 @@ public interface EnvironmentOrBuilder
    *
    *
    * <pre>
-   * Output only. The last update time of this environment. This field is read-only, i.e., it
-   * cannot be set by create and update methods.
+   * Output only. The last update time of this environment. This field is
+   * read-only, i.e., it cannot be set by create and update methods.
    * </pre>
    *
    * <code>.google.protobuf.Timestamp update_time = 5 [(.google.api.field_behavior) = OUTPUT_ONLY];
@@ -171,8 +171,8 @@ public interface EnvironmentOrBuilder
    *
    *
    * <pre>
-   * Output only. The last update time of this environment. This field is read-only, i.e., it
-   * cannot be set by create and update methods.
+   * Output only. The last update time of this environment. This field is
+   * read-only, i.e., it cannot be set by create and update methods.
    * </pre>
    *
    * <code>.google.protobuf.Timestamp update_time = 5 [(.google.api.field_behavior) = OUTPUT_ONLY];
@@ -185,8 +185,8 @@ public interface EnvironmentOrBuilder
    *
    *
    * <pre>
-   * Output only. The last update time of this environment. This field is read-only, i.e., it
-   * cannot be set by create and update methods.
+   * Output only. The last update time of this environment. This field is
+   * read-only, i.e., it cannot be set by create and update methods.
    * </pre>
    *
    * <code>.google.protobuf.Timestamp update_time = 5 [(.google.api.field_behavior) = OUTPUT_ONLY];
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentProto.java
index c8581c0f8d85..7980d6a064e3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentProto.java
@@ -190,12 +190,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "/agent/environments/*}/history\032x\312A\031dialo"
           + "gflow.googleapis.com\322AYhttps://www.googl"
           + "eapis.com/auth/cloud-platform,https://ww"
-          + "w.googleapis.com/auth/dialogflowB\237\001\n\036com"
+          + "w.googleapis.com/auth/dialogflowB\231\001\n\036com"
           + ".google.cloud.dialogflow.v2B\020Environment"
-          + "ProtoP\001ZDgoogle.golang.org/genproto/goog"
-          + "leapis/cloud/dialogflow/v2;dialogflow\370\001\001"
-          + "\242\002\002DF\252\002\032Google.Cloud.Dialogflow.V2b\006prot"
-          + "o3"
+          + "ProtoP\001Z>cloud.google.com/go/dialogflow/"
+          + "apiv2/dialogflowpb;dialogflowpb\370\001\001\242\002\002DF\252"
+          + "\002\032Google.Cloud.Dialogflow.V2b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EvaluationConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EvaluationConfig.java
index 01fd309e4e99..35fa4509cec5 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EvaluationConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EvaluationConfig.java
@@ -105,10 +105,10 @@ public interface SmartReplyConfigOrBuilder
      *
      *
      * <pre>
-     * Required. The model to be evaluated can return multiple results with confidence
-     * score on each query. These results will be sorted by the descending order
-     * of the scores and we only keep the first max_result_count results as the
-     * final results to evaluate.
+     * Required. The model to be evaluated can return multiple results with
+     * confidence score on each query. These results will be sorted by the
+     * descending order of the scores and we only keep the first
+     * max_result_count results as the final results to evaluate.
      * </pre>
      *
      * <code>int32 max_result_count = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -167,7 +167,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int ALLOWLIST_DOCUMENT_FIELD_NUMBER = 1;
-    private volatile java.lang.Object allowlistDocument_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object allowlistDocument_ = "";
     /**
      *
      *
@@ -220,15 +222,15 @@ public com.google.protobuf.ByteString getAllowlistDocumentBytes() {
     }
 
     public static final int MAX_RESULT_COUNT_FIELD_NUMBER = 2;
-    private int maxResultCount_;
+    private int maxResultCount_ = 0;
     /**
      *
      *
      * <pre>
-     * Required. The model to be evaluated can return multiple results with confidence
-     * score on each query. These results will be sorted by the descending order
-     * of the scores and we only keep the first max_result_count results as the
-     * final results to evaluate.
+     * Required. The model to be evaluated can return multiple results with
+     * confidence score on each query. These results will be sorted by the
+     * descending order of the scores and we only keep the first
+     * max_result_count results as the final results to evaluate.
      * </pre>
      *
      * <code>int32 max_result_count = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -451,10 +453,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         allowlistDocument_ = "";
-
         maxResultCount_ = 0;
-
         return this;
       }
 
@@ -484,12 +485,24 @@ public com.google.cloud.dialogflow.v2.EvaluationConfig.SmartReplyConfig build()
       public com.google.cloud.dialogflow.v2.EvaluationConfig.SmartReplyConfig buildPartial() {
         com.google.cloud.dialogflow.v2.EvaluationConfig.SmartReplyConfig result =
             new com.google.cloud.dialogflow.v2.EvaluationConfig.SmartReplyConfig(this);
-        result.allowlistDocument_ = allowlistDocument_;
-        result.maxResultCount_ = maxResultCount_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2.EvaluationConfig.SmartReplyConfig result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.allowlistDocument_ = allowlistDocument_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.maxResultCount_ = maxResultCount_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -543,6 +556,7 @@ public Builder mergeFrom(
                 .getDefaultInstance()) return this;
         if (!other.getAllowlistDocument().isEmpty()) {
           allowlistDocument_ = other.allowlistDocument_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.getMaxResultCount() != 0) {
@@ -577,13 +591,13 @@ public Builder mergeFrom(
               case 10:
                 {
                   allowlistDocument_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 16:
                 {
                   maxResultCount_ = input.readInt32();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 16
               default:
@@ -603,6 +617,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object allowlistDocument_ = "";
       /**
        *
@@ -670,8 +686,8 @@ public Builder setAllowlistDocument(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         allowlistDocument_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -689,8 +705,8 @@ public Builder setAllowlistDocument(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearAllowlistDocument() {
-
         allowlistDocument_ = getDefaultInstance().getAllowlistDocument();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -713,8 +729,8 @@ public Builder setAllowlistDocumentBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         allowlistDocument_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -724,10 +740,10 @@ public Builder setAllowlistDocumentBytes(com.google.protobuf.ByteString value) {
        *
        *
        * <pre>
-       * Required. The model to be evaluated can return multiple results with confidence
-       * score on each query. These results will be sorted by the descending order
-       * of the scores and we only keep the first max_result_count results as the
-       * final results to evaluate.
+       * Required. The model to be evaluated can return multiple results with
+       * confidence score on each query. These results will be sorted by the
+       * descending order of the scores and we only keep the first
+       * max_result_count results as the final results to evaluate.
        * </pre>
        *
        * <code>int32 max_result_count = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -742,10 +758,10 @@ public int getMaxResultCount() {
        *
        *
        * <pre>
-       * Required. The model to be evaluated can return multiple results with confidence
-       * score on each query. These results will be sorted by the descending order
-       * of the scores and we only keep the first max_result_count results as the
-       * final results to evaluate.
+       * Required. The model to be evaluated can return multiple results with
+       * confidence score on each query. These results will be sorted by the
+       * descending order of the scores and we only keep the first
+       * max_result_count results as the final results to evaluate.
        * </pre>
        *
        * <code>int32 max_result_count = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -756,6 +772,7 @@ public int getMaxResultCount() {
       public Builder setMaxResultCount(int value) {
 
         maxResultCount_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -763,10 +780,10 @@ public Builder setMaxResultCount(int value) {
        *
        *
        * <pre>
-       * Required. The model to be evaluated can return multiple results with confidence
-       * score on each query. These results will be sorted by the descending order
-       * of the scores and we only keep the first max_result_count results as the
-       * final results to evaluate.
+       * Required. The model to be evaluated can return multiple results with
+       * confidence score on each query. These results will be sorted by the
+       * descending order of the scores and we only keep the first
+       * max_result_count results as the final results to evaluate.
        * </pre>
        *
        * <code>int32 max_result_count = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -774,7 +791,7 @@ public Builder setMaxResultCount(int value) {
        * @return This builder for chaining.
        */
       public Builder clearMaxResultCount() {
-
+        bitField0_ = (bitField0_ & ~0x00000002);
         maxResultCount_ = 0;
         onChanged();
         return this;
@@ -885,10 +902,10 @@ public interface SmartComposeConfigOrBuilder
      *
      *
      * <pre>
-     * Required. The model to be evaluated can return multiple results with confidence
-     * score on each query. These results will be sorted by the descending order
-     * of the scores and we only keep the first max_result_count results as the
-     * final results to evaluate.
+     * Required. The model to be evaluated can return multiple results with
+     * confidence score on each query. These results will be sorted by the
+     * descending order of the scores and we only keep the first
+     * max_result_count results as the final results to evaluate.
      * </pre>
      *
      * <code>int32 max_result_count = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -947,7 +964,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int ALLOWLIST_DOCUMENT_FIELD_NUMBER = 1;
-    private volatile java.lang.Object allowlistDocument_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object allowlistDocument_ = "";
     /**
      *
      *
@@ -1000,15 +1019,15 @@ public com.google.protobuf.ByteString getAllowlistDocumentBytes() {
     }
 
     public static final int MAX_RESULT_COUNT_FIELD_NUMBER = 2;
-    private int maxResultCount_;
+    private int maxResultCount_ = 0;
     /**
      *
      *
      * <pre>
-     * Required. The model to be evaluated can return multiple results with confidence
-     * score on each query. These results will be sorted by the descending order
-     * of the scores and we only keep the first max_result_count results as the
-     * final results to evaluate.
+     * Required. The model to be evaluated can return multiple results with
+     * confidence score on each query. These results will be sorted by the
+     * descending order of the scores and we only keep the first
+     * max_result_count results as the final results to evaluate.
      * </pre>
      *
      * <code>int32 max_result_count = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -1231,10 +1250,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         allowlistDocument_ = "";
-
         maxResultCount_ = 0;
-
         return this;
       }
 
@@ -1264,12 +1282,24 @@ public com.google.cloud.dialogflow.v2.EvaluationConfig.SmartComposeConfig build(
       public com.google.cloud.dialogflow.v2.EvaluationConfig.SmartComposeConfig buildPartial() {
         com.google.cloud.dialogflow.v2.EvaluationConfig.SmartComposeConfig result =
             new com.google.cloud.dialogflow.v2.EvaluationConfig.SmartComposeConfig(this);
-        result.allowlistDocument_ = allowlistDocument_;
-        result.maxResultCount_ = maxResultCount_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2.EvaluationConfig.SmartComposeConfig result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.allowlistDocument_ = allowlistDocument_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.maxResultCount_ = maxResultCount_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1323,6 +1353,7 @@ public Builder mergeFrom(
                 .getDefaultInstance()) return this;
         if (!other.getAllowlistDocument().isEmpty()) {
           allowlistDocument_ = other.allowlistDocument_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.getMaxResultCount() != 0) {
@@ -1357,13 +1388,13 @@ public Builder mergeFrom(
               case 10:
                 {
                   allowlistDocument_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 16:
                 {
                   maxResultCount_ = input.readInt32();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 16
               default:
@@ -1383,6 +1414,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object allowlistDocument_ = "";
       /**
        *
@@ -1450,8 +1483,8 @@ public Builder setAllowlistDocument(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         allowlistDocument_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1469,8 +1502,8 @@ public Builder setAllowlistDocument(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearAllowlistDocument() {
-
         allowlistDocument_ = getDefaultInstance().getAllowlistDocument();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1493,8 +1526,8 @@ public Builder setAllowlistDocumentBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         allowlistDocument_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1504,10 +1537,10 @@ public Builder setAllowlistDocumentBytes(com.google.protobuf.ByteString value) {
        *
        *
        * <pre>
-       * Required. The model to be evaluated can return multiple results with confidence
-       * score on each query. These results will be sorted by the descending order
-       * of the scores and we only keep the first max_result_count results as the
-       * final results to evaluate.
+       * Required. The model to be evaluated can return multiple results with
+       * confidence score on each query. These results will be sorted by the
+       * descending order of the scores and we only keep the first
+       * max_result_count results as the final results to evaluate.
        * </pre>
        *
        * <code>int32 max_result_count = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -1522,10 +1555,10 @@ public int getMaxResultCount() {
        *
        *
        * <pre>
-       * Required. The model to be evaluated can return multiple results with confidence
-       * score on each query. These results will be sorted by the descending order
-       * of the scores and we only keep the first max_result_count results as the
-       * final results to evaluate.
+       * Required. The model to be evaluated can return multiple results with
+       * confidence score on each query. These results will be sorted by the
+       * descending order of the scores and we only keep the first
+       * max_result_count results as the final results to evaluate.
        * </pre>
        *
        * <code>int32 max_result_count = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -1536,6 +1569,7 @@ public int getMaxResultCount() {
       public Builder setMaxResultCount(int value) {
 
         maxResultCount_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1543,10 +1577,10 @@ public Builder setMaxResultCount(int value) {
        *
        *
        * <pre>
-       * Required. The model to be evaluated can return multiple results with confidence
-       * score on each query. These results will be sorted by the descending order
-       * of the scores and we only keep the first max_result_count results as the
-       * final results to evaluate.
+       * Required. The model to be evaluated can return multiple results with
+       * confidence score on each query. These results will be sorted by the
+       * descending order of the scores and we only keep the first
+       * max_result_count results as the final results to evaluate.
        * </pre>
        *
        * <code>int32 max_result_count = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -1554,7 +1588,7 @@ public Builder setMaxResultCount(int value) {
        * @return This builder for chaining.
        */
       public Builder clearMaxResultCount() {
-
+        bitField0_ = (bitField0_ & ~0x00000002);
         maxResultCount_ = 0;
         onChanged();
         return this;
@@ -1675,6 +1709,8 @@ public ModelSpecificConfigCase getModelSpecificConfigCase() {
   }
 
   public static final int DATASETS_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.InputDataset> datasets_;
   /**
    *
@@ -2115,6 +2151,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (datasetsBuilder_ == null) {
         datasets_ = java.util.Collections.emptyList();
       } else {
@@ -2157,7 +2194,17 @@ public com.google.cloud.dialogflow.v2.EvaluationConfig build() {
     public com.google.cloud.dialogflow.v2.EvaluationConfig buildPartial() {
       com.google.cloud.dialogflow.v2.EvaluationConfig result =
           new com.google.cloud.dialogflow.v2.EvaluationConfig(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.EvaluationConfig result) {
       if (datasetsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           datasets_ = java.util.Collections.unmodifiableList(datasets_);
@@ -2167,23 +2214,21 @@ public com.google.cloud.dialogflow.v2.EvaluationConfig buildPartial() {
       } else {
         result.datasets_ = datasetsBuilder_.build();
       }
-      if (modelSpecificConfigCase_ == 2) {
-        if (smartReplyConfigBuilder_ == null) {
-          result.modelSpecificConfig_ = modelSpecificConfig_;
-        } else {
-          result.modelSpecificConfig_ = smartReplyConfigBuilder_.build();
-        }
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.EvaluationConfig result) {
+      int from_bitField0_ = bitField0_;
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2.EvaluationConfig result) {
+      result.modelSpecificConfigCase_ = modelSpecificConfigCase_;
+      result.modelSpecificConfig_ = this.modelSpecificConfig_;
+      if (modelSpecificConfigCase_ == 2 && smartReplyConfigBuilder_ != null) {
+        result.modelSpecificConfig_ = smartReplyConfigBuilder_.build();
       }
-      if (modelSpecificConfigCase_ == 4) {
-        if (smartComposeConfigBuilder_ == null) {
-          result.modelSpecificConfig_ = modelSpecificConfig_;
-        } else {
-          result.modelSpecificConfig_ = smartComposeConfigBuilder_.build();
-        }
+      if (modelSpecificConfigCase_ == 4 && smartComposeConfigBuilder_ != null) {
+        result.modelSpecificConfig_ = smartComposeConfigBuilder_.build();
       }
-      result.modelSpecificConfigCase_ = modelSpecificConfigCase_;
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -2976,7 +3021,6 @@ public Builder clearSmartReplyConfig() {
       }
       modelSpecificConfigCase_ = 2;
       onChanged();
-      ;
       return smartReplyConfigBuilder_;
     }
 
@@ -3221,7 +3265,6 @@ public Builder clearSmartComposeConfig() {
       }
       modelSpecificConfigCase_ = 4;
       onChanged();
-      ;
       return smartComposeConfigBuilder_;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EventInput.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EventInput.java
index e716425332d8..69567bc97517 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EventInput.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EventInput.java
@@ -73,7 +73,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -203,11 +205,13 @@ public com.google.protobuf.Struct getParameters() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getParametersOrBuilder() {
-    return getParameters();
+    return parameters_ == null ? com.google.protobuf.Struct.getDefaultInstance() : parameters_;
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -217,8 +221,8 @@ public com.google.protobuf.StructOrBuilder getParametersOrBuilder() {
    * for a list of the currently supported language codes. Note that queries in
    * the same session do not necessarily need to specify the same language.
    * This field is ignored when used in the context of a
-   * [WebhookResponse.followup_event_input][google.cloud.dialogflow.v2.WebhookResponse.followup_event_input] field,
-   * because the language was already defined in the originating detect
+   * [WebhookResponse.followup_event_input][google.cloud.dialogflow.v2.WebhookResponse.followup_event_input]
+   * field, because the language was already defined in the originating detect
    * intent request.
    * </pre>
    *
@@ -247,8 +251,8 @@ public java.lang.String getLanguageCode() {
    * for a list of the currently supported language codes. Note that queries in
    * the same session do not necessarily need to specify the same language.
    * This field is ignored when used in the context of a
-   * [WebhookResponse.followup_event_input][google.cloud.dialogflow.v2.WebhookResponse.followup_event_input] field,
-   * because the language was already defined in the originating detect
+   * [WebhookResponse.followup_event_input][google.cloud.dialogflow.v2.WebhookResponse.followup_event_input]
+   * field, because the language was already defined in the originating detect
    * intent request.
    * </pre>
    *
@@ -493,16 +497,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
-      if (parametersBuilder_ == null) {
-        parameters_ = null;
-      } else {
-        parameters_ = null;
+      parameters_ = null;
+      if (parametersBuilder_ != null) {
+        parametersBuilder_.dispose();
         parametersBuilder_ = null;
       }
       languageCode_ = "";
-
       return this;
     }
 
@@ -530,17 +532,26 @@ public com.google.cloud.dialogflow.v2.EventInput build() {
     public com.google.cloud.dialogflow.v2.EventInput buildPartial() {
       com.google.cloud.dialogflow.v2.EventInput result =
           new com.google.cloud.dialogflow.v2.EventInput(this);
-      result.name_ = name_;
-      if (parametersBuilder_ == null) {
-        result.parameters_ = parameters_;
-      } else {
-        result.parameters_ = parametersBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.languageCode_ = languageCode_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.EventInput result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.parameters_ = parametersBuilder_ == null ? parameters_ : parametersBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -588,6 +599,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.EventInput other) {
       if (other == com.google.cloud.dialogflow.v2.EventInput.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasParameters()) {
@@ -595,6 +607,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.EventInput other) {
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -626,19 +639,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getParametersFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -658,6 +671,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -719,8 +734,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -736,8 +751,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -758,8 +773,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -795,7 +810,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      * @return Whether the parameters field is set.
      */
     public boolean hasParameters() {
-      return parametersBuilder_ != null || parameters_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -856,11 +871,11 @@ public Builder setParameters(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         parameters_ = value;
-        onChanged();
       } else {
         parametersBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -888,11 +903,11 @@ public Builder setParameters(com.google.protobuf.Struct value) {
     public Builder setParameters(com.google.protobuf.Struct.Builder builderForValue) {
       if (parametersBuilder_ == null) {
         parameters_ = builderForValue.build();
-        onChanged();
       } else {
         parametersBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -919,17 +934,18 @@ public Builder setParameters(com.google.protobuf.Struct.Builder builderForValue)
      */
     public Builder mergeParameters(com.google.protobuf.Struct value) {
       if (parametersBuilder_ == null) {
-        if (parameters_ != null) {
-          parameters_ =
-              com.google.protobuf.Struct.newBuilder(parameters_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && parameters_ != null
+            && parameters_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getParametersBuilder().mergeFrom(value);
         } else {
           parameters_ = value;
         }
-        onChanged();
       } else {
         parametersBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -955,14 +971,13 @@ public Builder mergeParameters(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct parameters = 2;</code>
      */
     public Builder clearParameters() {
-      if (parametersBuilder_ == null) {
-        parameters_ = null;
-        onChanged();
-      } else {
-        parameters_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      parameters_ = null;
+      if (parametersBuilder_ != null) {
+        parametersBuilder_.dispose();
         parametersBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -988,7 +1003,7 @@ public Builder clearParameters() {
      * <code>.google.protobuf.Struct parameters = 2;</code>
      */
     public com.google.protobuf.Struct.Builder getParametersBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getParametersFieldBuilder().getBuilder();
     }
@@ -1070,8 +1085,8 @@ public com.google.protobuf.StructOrBuilder getParametersOrBuilder() {
      * for a list of the currently supported language codes. Note that queries in
      * the same session do not necessarily need to specify the same language.
      * This field is ignored when used in the context of a
-     * [WebhookResponse.followup_event_input][google.cloud.dialogflow.v2.WebhookResponse.followup_event_input] field,
-     * because the language was already defined in the originating detect
+     * [WebhookResponse.followup_event_input][google.cloud.dialogflow.v2.WebhookResponse.followup_event_input]
+     * field, because the language was already defined in the originating detect
      * intent request.
      * </pre>
      *
@@ -1099,8 +1114,8 @@ public java.lang.String getLanguageCode() {
      * for a list of the currently supported language codes. Note that queries in
      * the same session do not necessarily need to specify the same language.
      * This field is ignored when used in the context of a
-     * [WebhookResponse.followup_event_input][google.cloud.dialogflow.v2.WebhookResponse.followup_event_input] field,
-     * because the language was already defined in the originating detect
+     * [WebhookResponse.followup_event_input][google.cloud.dialogflow.v2.WebhookResponse.followup_event_input]
+     * field, because the language was already defined in the originating detect
      * intent request.
      * </pre>
      *
@@ -1128,8 +1143,8 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
      * for a list of the currently supported language codes. Note that queries in
      * the same session do not necessarily need to specify the same language.
      * This field is ignored when used in the context of a
-     * [WebhookResponse.followup_event_input][google.cloud.dialogflow.v2.WebhookResponse.followup_event_input] field,
-     * because the language was already defined in the originating detect
+     * [WebhookResponse.followup_event_input][google.cloud.dialogflow.v2.WebhookResponse.followup_event_input]
+     * field, because the language was already defined in the originating detect
      * intent request.
      * </pre>
      *
@@ -1142,8 +1157,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1156,8 +1171,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * for a list of the currently supported language codes. Note that queries in
      * the same session do not necessarily need to specify the same language.
      * This field is ignored when used in the context of a
-     * [WebhookResponse.followup_event_input][google.cloud.dialogflow.v2.WebhookResponse.followup_event_input] field,
-     * because the language was already defined in the originating detect
+     * [WebhookResponse.followup_event_input][google.cloud.dialogflow.v2.WebhookResponse.followup_event_input]
+     * field, because the language was already defined in the originating detect
      * intent request.
      * </pre>
      *
@@ -1166,8 +1181,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1180,8 +1195,8 @@ public Builder clearLanguageCode() {
      * for a list of the currently supported language codes. Note that queries in
      * the same session do not necessarily need to specify the same language.
      * This field is ignored when used in the context of a
-     * [WebhookResponse.followup_event_input][google.cloud.dialogflow.v2.WebhookResponse.followup_event_input] field,
-     * because the language was already defined in the originating detect
+     * [WebhookResponse.followup_event_input][google.cloud.dialogflow.v2.WebhookResponse.followup_event_input]
+     * field, because the language was already defined in the originating detect
      * intent request.
      * </pre>
      *
@@ -1195,8 +1210,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EventInputOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EventInputOrBuilder.java
index 2ce22beb7b27..4db97ecbc68c 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EventInputOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EventInputOrBuilder.java
@@ -131,8 +131,8 @@ public interface EventInputOrBuilder
    * for a list of the currently supported language codes. Note that queries in
    * the same session do not necessarily need to specify the same language.
    * This field is ignored when used in the context of a
-   * [WebhookResponse.followup_event_input][google.cloud.dialogflow.v2.WebhookResponse.followup_event_input] field,
-   * because the language was already defined in the originating detect
+   * [WebhookResponse.followup_event_input][google.cloud.dialogflow.v2.WebhookResponse.followup_event_input]
+   * field, because the language was already defined in the originating detect
    * intent request.
    * </pre>
    *
@@ -150,8 +150,8 @@ public interface EventInputOrBuilder
    * for a list of the currently supported language codes. Note that queries in
    * the same session do not necessarily need to specify the same language.
    * This field is ignored when used in the context of a
-   * [WebhookResponse.followup_event_input][google.cloud.dialogflow.v2.WebhookResponse.followup_event_input] field,
-   * because the language was already defined in the originating detect
+   * [WebhookResponse.followup_event_input][google.cloud.dialogflow.v2.WebhookResponse.followup_event_input]
+   * field, because the language was already defined in the originating detect
    * intent request.
    * </pre>
    *
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentRequest.java
index 20853674a7f3..b4d9390c32b0 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Agents.ExportAgent][google.cloud.dialogflow.v2.Agents.ExportAgent].
+ * The request message for
+ * [Agents.ExportAgent][google.cloud.dialogflow.v2.Agents.ExportAgent].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ExportAgentRequest}
@@ -69,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -124,15 +127,17 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int AGENT_URI_FIELD_NUMBER = 2;
-  private volatile java.lang.Object agentUri_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object agentUri_ = "";
   /**
    *
    *
    * <pre>
-   * Required. The [Google Cloud Storage](https://cloud.google.com/storage/docs/)
-   * URI to export the agent to.
-   * The format of this URI must be `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`.
-   * If left unspecified, the serialized agent is returned inline.
+   * Required. The [Google Cloud
+   * Storage](https://cloud.google.com/storage/docs/) URI to export the agent
+   * to. The format of this URI must be `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`. If
+   * left unspecified, the serialized agent is returned inline.
    * Dialogflow performs a write operation for the Cloud Storage object
    * on the caller's behalf, so your request authentication must
    * have write permissions for the object. For more information, see
@@ -160,10 +165,10 @@ public java.lang.String getAgentUri() {
    *
    *
    * <pre>
-   * Required. The [Google Cloud Storage](https://cloud.google.com/storage/docs/)
-   * URI to export the agent to.
-   * The format of this URI must be `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`.
-   * If left unspecified, the serialized agent is returned inline.
+   * Required. The [Google Cloud
+   * Storage](https://cloud.google.com/storage/docs/) URI to export the agent
+   * to. The format of this URI must be `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`. If
+   * left unspecified, the serialized agent is returned inline.
    * Dialogflow performs a write operation for the Cloud Storage object
    * on the caller's behalf, so your request authentication must
    * have write permissions for the object. For more information, see
@@ -360,7 +365,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Agents.ExportAgent][google.cloud.dialogflow.v2.Agents.ExportAgent].
+   * The request message for
+   * [Agents.ExportAgent][google.cloud.dialogflow.v2.Agents.ExportAgent].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ExportAgentRequest}
@@ -394,10 +400,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       agentUri_ = "";
-
       return this;
     }
 
@@ -425,12 +430,23 @@ public com.google.cloud.dialogflow.v2.ExportAgentRequest build() {
     public com.google.cloud.dialogflow.v2.ExportAgentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ExportAgentRequest result =
           new com.google.cloud.dialogflow.v2.ExportAgentRequest(this);
-      result.parent_ = parent_;
-      result.agentUri_ = agentUri_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ExportAgentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.agentUri_ = agentUri_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -479,10 +495,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ExportAgentRequest other
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getAgentUri().isEmpty()) {
         agentUri_ = other.agentUri_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -514,13 +532,13 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 agentUri_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -540,6 +558,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -610,8 +630,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -630,8 +650,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -655,8 +675,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -666,10 +686,10 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      *
      *
      * <pre>
-     * Required. The [Google Cloud Storage](https://cloud.google.com/storage/docs/)
-     * URI to export the agent to.
-     * The format of this URI must be `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`.
-     * If left unspecified, the serialized agent is returned inline.
+     * Required. The [Google Cloud
+     * Storage](https://cloud.google.com/storage/docs/) URI to export the agent
+     * to. The format of this URI must be `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`. If
+     * left unspecified, the serialized agent is returned inline.
      * Dialogflow performs a write operation for the Cloud Storage object
      * on the caller's behalf, so your request authentication must
      * have write permissions for the object. For more information, see
@@ -696,10 +716,10 @@ public java.lang.String getAgentUri() {
      *
      *
      * <pre>
-     * Required. The [Google Cloud Storage](https://cloud.google.com/storage/docs/)
-     * URI to export the agent to.
-     * The format of this URI must be `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`.
-     * If left unspecified, the serialized agent is returned inline.
+     * Required. The [Google Cloud
+     * Storage](https://cloud.google.com/storage/docs/) URI to export the agent
+     * to. The format of this URI must be `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`. If
+     * left unspecified, the serialized agent is returned inline.
      * Dialogflow performs a write operation for the Cloud Storage object
      * on the caller's behalf, so your request authentication must
      * have write permissions for the object. For more information, see
@@ -726,10 +746,10 @@ public com.google.protobuf.ByteString getAgentUriBytes() {
      *
      *
      * <pre>
-     * Required. The [Google Cloud Storage](https://cloud.google.com/storage/docs/)
-     * URI to export the agent to.
-     * The format of this URI must be `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`.
-     * If left unspecified, the serialized agent is returned inline.
+     * Required. The [Google Cloud
+     * Storage](https://cloud.google.com/storage/docs/) URI to export the agent
+     * to. The format of this URI must be `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`. If
+     * left unspecified, the serialized agent is returned inline.
      * Dialogflow performs a write operation for the Cloud Storage object
      * on the caller's behalf, so your request authentication must
      * have write permissions for the object. For more information, see
@@ -746,8 +766,8 @@ public Builder setAgentUri(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       agentUri_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -755,10 +775,10 @@ public Builder setAgentUri(java.lang.String value) {
      *
      *
      * <pre>
-     * Required. The [Google Cloud Storage](https://cloud.google.com/storage/docs/)
-     * URI to export the agent to.
-     * The format of this URI must be `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`.
-     * If left unspecified, the serialized agent is returned inline.
+     * Required. The [Google Cloud
+     * Storage](https://cloud.google.com/storage/docs/) URI to export the agent
+     * to. The format of this URI must be `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`. If
+     * left unspecified, the serialized agent is returned inline.
      * Dialogflow performs a write operation for the Cloud Storage object
      * on the caller's behalf, so your request authentication must
      * have write permissions for the object. For more information, see
@@ -771,8 +791,8 @@ public Builder setAgentUri(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAgentUri() {
-
       agentUri_ = getDefaultInstance().getAgentUri();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -780,10 +800,10 @@ public Builder clearAgentUri() {
      *
      *
      * <pre>
-     * Required. The [Google Cloud Storage](https://cloud.google.com/storage/docs/)
-     * URI to export the agent to.
-     * The format of this URI must be `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`.
-     * If left unspecified, the serialized agent is returned inline.
+     * Required. The [Google Cloud
+     * Storage](https://cloud.google.com/storage/docs/) URI to export the agent
+     * to. The format of this URI must be `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`. If
+     * left unspecified, the serialized agent is returned inline.
      * Dialogflow performs a write operation for the Cloud Storage object
      * on the caller's behalf, so your request authentication must
      * have write permissions for the object. For more information, see
@@ -801,8 +821,8 @@ public Builder setAgentUriBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       agentUri_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentRequestOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentRequestOrBuilder.java
index e62507f2dfd3..a82109b19e00 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentRequestOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentRequestOrBuilder.java
@@ -58,10 +58,10 @@ public interface ExportAgentRequestOrBuilder
    *
    *
    * <pre>
-   * Required. The [Google Cloud Storage](https://cloud.google.com/storage/docs/)
-   * URI to export the agent to.
-   * The format of this URI must be `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`.
-   * If left unspecified, the serialized agent is returned inline.
+   * Required. The [Google Cloud
+   * Storage](https://cloud.google.com/storage/docs/) URI to export the agent
+   * to. The format of this URI must be `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`. If
+   * left unspecified, the serialized agent is returned inline.
    * Dialogflow performs a write operation for the Cloud Storage object
    * on the caller's behalf, so your request authentication must
    * have write permissions for the object. For more information, see
@@ -78,10 +78,10 @@ public interface ExportAgentRequestOrBuilder
    *
    *
    * <pre>
-   * Required. The [Google Cloud Storage](https://cloud.google.com/storage/docs/)
-   * URI to export the agent to.
-   * The format of this URI must be `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`.
-   * If left unspecified, the serialized agent is returned inline.
+   * Required. The [Google Cloud
+   * Storage](https://cloud.google.com/storage/docs/) URI to export the agent
+   * to. The format of this URI must be `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`. If
+   * left unspecified, the serialized agent is returned inline.
    * Dialogflow performs a write operation for the Cloud Storage object
    * on the caller's behalf, so your request authentication must
    * have write permissions for the object. For more information, see
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentResponse.java
index de9d7dab2728..bcd5040be8af 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The response message for [Agents.ExportAgent][google.cloud.dialogflow.v2.Agents.ExportAgent].
+ * The response message for
+ * [Agents.ExportAgent][google.cloud.dialogflow.v2.Agents.ExportAgent].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ExportAgentResponse}
@@ -411,7 +412,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The response message for [Agents.ExportAgent][google.cloud.dialogflow.v2.Agents.ExportAgent].
+   * The response message for
+   * [Agents.ExportAgent][google.cloud.dialogflow.v2.Agents.ExportAgent].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ExportAgentResponse}
@@ -445,6 +447,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       agentCase_ = 0;
       agent_ = null;
       return this;
@@ -474,17 +477,23 @@ public com.google.cloud.dialogflow.v2.ExportAgentResponse build() {
     public com.google.cloud.dialogflow.v2.ExportAgentResponse buildPartial() {
       com.google.cloud.dialogflow.v2.ExportAgentResponse result =
           new com.google.cloud.dialogflow.v2.ExportAgentResponse(this);
-      if (agentCase_ == 1) {
-        result.agent_ = agent_;
-      }
-      if (agentCase_ == 2) {
-        result.agent_ = agent_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.agentCase_ = agentCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ExportAgentResponse result) {
+      int from_bitField0_ = bitField0_;
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2.ExportAgentResponse result) {
+      result.agentCase_ = agentCase_;
+      result.agent_ = this.agent_;
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -619,6 +628,8 @@ public Builder clearAgent() {
       return this;
     }
 
+    private int bitField0_;
+
     /**
      *
      *
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportDocumentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportDocumentRequest.java
index 614bee5caef0..e5b06ea1520a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportDocumentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportDocumentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * Request message for [Documents.ExportDocument][google.cloud.dialogflow.v2.Documents.ExportDocument].
+ * Request message for
+ * [Documents.ExportDocument][google.cloud.dialogflow.v2.Documents.ExportDocument].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ExportDocumentRequest}
@@ -112,7 +113,9 @@ public DestinationCase getDestinationCase() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -220,7 +223,7 @@ public com.google.cloud.dialogflow.v2.GcsDestinationOrBuilder getGcsDestinationO
   }
 
   public static final int EXPORT_FULL_CONTENT_FIELD_NUMBER = 3;
-  private boolean exportFullContent_;
+  private boolean exportFullContent_ = false;
   /**
    *
    *
@@ -239,7 +242,7 @@ public boolean getExportFullContent() {
   }
 
   public static final int SMART_MESSAGING_PARTIAL_UPDATE_FIELD_NUMBER = 5;
-  private boolean smartMessagingPartialUpdate_;
+  private boolean smartMessagingPartialUpdate_ = false;
   /**
    *
    *
@@ -463,7 +466,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Request message for [Documents.ExportDocument][google.cloud.dialogflow.v2.Documents.ExportDocument].
+   * Request message for
+   * [Documents.ExportDocument][google.cloud.dialogflow.v2.Documents.ExportDocument].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ExportDocumentRequest}
@@ -497,15 +501,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       if (gcsDestinationBuilder_ != null) {
         gcsDestinationBuilder_.clear();
       }
       exportFullContent_ = false;
-
       smartMessagingPartialUpdate_ = false;
-
       destinationCase_ = 0;
       destination_ = null;
       return this;
@@ -535,21 +537,35 @@ public com.google.cloud.dialogflow.v2.ExportDocumentRequest build() {
     public com.google.cloud.dialogflow.v2.ExportDocumentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ExportDocumentRequest result =
           new com.google.cloud.dialogflow.v2.ExportDocumentRequest(this);
-      result.name_ = name_;
-      if (destinationCase_ == 2) {
-        if (gcsDestinationBuilder_ == null) {
-          result.destination_ = destination_;
-        } else {
-          result.destination_ = gcsDestinationBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.exportFullContent_ = exportFullContent_;
-      result.smartMessagingPartialUpdate_ = smartMessagingPartialUpdate_;
-      result.destinationCase_ = destinationCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ExportDocumentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.exportFullContent_ = exportFullContent_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.smartMessagingPartialUpdate_ = smartMessagingPartialUpdate_;
+      }
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2.ExportDocumentRequest result) {
+      result.destinationCase_ = destinationCase_;
+      result.destination_ = this.destination_;
+      if (destinationCase_ == 2 && gcsDestinationBuilder_ != null) {
+        result.destination_ = gcsDestinationBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -598,6 +614,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ExportDocumentRequest ot
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getExportFullContent() != false) {
@@ -646,7 +663,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -658,13 +675,13 @@ public Builder mergeFrom(
             case 24:
               {
                 exportFullContent_ = input.readBool();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 40:
               {
                 smartMessagingPartialUpdate_ = input.readBool();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 40
             default:
@@ -698,6 +715,8 @@ public Builder clearDestination() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -771,8 +790,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -792,8 +811,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -818,8 +837,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1030,7 +1049,6 @@ public com.google.cloud.dialogflow.v2.GcsDestinationOrBuilder getGcsDestinationO
       }
       destinationCase_ = 2;
       onChanged();
-      ;
       return gcsDestinationBuilder_;
     }
 
@@ -1067,6 +1085,7 @@ public boolean getExportFullContent() {
     public Builder setExportFullContent(boolean value) {
 
       exportFullContent_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1083,7 +1102,7 @@ public Builder setExportFullContent(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearExportFullContent() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       exportFullContent_ = false;
       onChanged();
       return this;
@@ -1122,6 +1141,7 @@ public boolean getSmartMessagingPartialUpdate() {
     public Builder setSmartMessagingPartialUpdate(boolean value) {
 
       smartMessagingPartialUpdate_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1138,7 +1158,7 @@ public Builder setSmartMessagingPartialUpdate(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearSmartMessagingPartialUpdate() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       smartMessagingPartialUpdate_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportOperationMetadata.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportOperationMetadata.java
index 95c6b096994b..7fde07bf6a92 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportOperationMetadata.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportOperationMetadata.java
@@ -111,7 +111,9 @@ public com.google.cloud.dialogflow.v2.GcsDestination getExportedGcsDestination()
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.GcsDestinationOrBuilder
       getExportedGcsDestinationOrBuilder() {
-    return getExportedGcsDestination();
+    return exportedGcsDestination_ == null
+        ? com.google.cloud.dialogflow.v2.GcsDestination.getDefaultInstance()
+        : exportedGcsDestination_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -318,10 +320,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (exportedGcsDestinationBuilder_ == null) {
-        exportedGcsDestination_ = null;
-      } else {
-        exportedGcsDestination_ = null;
+      bitField0_ = 0;
+      exportedGcsDestination_ = null;
+      if (exportedGcsDestinationBuilder_ != null) {
+        exportedGcsDestinationBuilder_.dispose();
         exportedGcsDestinationBuilder_ = null;
       }
       return this;
@@ -351,15 +353,23 @@ public com.google.cloud.dialogflow.v2.ExportOperationMetadata build() {
     public com.google.cloud.dialogflow.v2.ExportOperationMetadata buildPartial() {
       com.google.cloud.dialogflow.v2.ExportOperationMetadata result =
           new com.google.cloud.dialogflow.v2.ExportOperationMetadata(this);
-      if (exportedGcsDestinationBuilder_ == null) {
-        result.exportedGcsDestination_ = exportedGcsDestination_;
-      } else {
-        result.exportedGcsDestination_ = exportedGcsDestinationBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ExportOperationMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.exportedGcsDestination_ =
+            exportedGcsDestinationBuilder_ == null
+                ? exportedGcsDestination_
+                : exportedGcsDestinationBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -439,7 +449,7 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getExportedGcsDestinationFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -459,6 +469,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2.GcsDestination exportedGcsDestination_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.GcsDestination,
@@ -477,7 +489,7 @@ public Builder mergeFrom(
      * @return Whether the exportedGcsDestination field is set.
      */
     public boolean hasExportedGcsDestination() {
-      return exportedGcsDestinationBuilder_ != null || exportedGcsDestination_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -514,11 +526,11 @@ public Builder setExportedGcsDestination(com.google.cloud.dialogflow.v2.GcsDesti
           throw new NullPointerException();
         }
         exportedGcsDestination_ = value;
-        onChanged();
       } else {
         exportedGcsDestinationBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -534,11 +546,11 @@ public Builder setExportedGcsDestination(
         com.google.cloud.dialogflow.v2.GcsDestination.Builder builderForValue) {
       if (exportedGcsDestinationBuilder_ == null) {
         exportedGcsDestination_ = builderForValue.build();
-        onChanged();
       } else {
         exportedGcsDestinationBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -553,19 +565,19 @@ public Builder setExportedGcsDestination(
     public Builder mergeExportedGcsDestination(
         com.google.cloud.dialogflow.v2.GcsDestination value) {
       if (exportedGcsDestinationBuilder_ == null) {
-        if (exportedGcsDestination_ != null) {
-          exportedGcsDestination_ =
-              com.google.cloud.dialogflow.v2.GcsDestination.newBuilder(exportedGcsDestination_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && exportedGcsDestination_ != null
+            && exportedGcsDestination_
+                != com.google.cloud.dialogflow.v2.GcsDestination.getDefaultInstance()) {
+          getExportedGcsDestinationBuilder().mergeFrom(value);
         } else {
           exportedGcsDestination_ = value;
         }
-        onChanged();
       } else {
         exportedGcsDestinationBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -578,14 +590,13 @@ public Builder mergeExportedGcsDestination(
      * <code>.google.cloud.dialogflow.v2.GcsDestination exported_gcs_destination = 1;</code>
      */
     public Builder clearExportedGcsDestination() {
-      if (exportedGcsDestinationBuilder_ == null) {
-        exportedGcsDestination_ = null;
-        onChanged();
-      } else {
-        exportedGcsDestination_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      exportedGcsDestination_ = null;
+      if (exportedGcsDestinationBuilder_ != null) {
+        exportedGcsDestinationBuilder_.dispose();
         exportedGcsDestinationBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -599,7 +610,7 @@ public Builder clearExportedGcsDestination() {
      */
     public com.google.cloud.dialogflow.v2.GcsDestination.Builder
         getExportedGcsDestinationBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getExportedGcsDestinationFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/FaqAnswer.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/FaqAnswer.java
index ba96635009d2..23527ed92c2e 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/FaqAnswer.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/FaqAnswer.java
@@ -82,7 +82,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   }
 
   public static final int ANSWER_FIELD_NUMBER = 1;
-  private volatile java.lang.Object answer_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object answer_ = "";
   /**
    *
    *
@@ -131,7 +133,7 @@ public com.google.protobuf.ByteString getAnswerBytes() {
   }
 
   public static final int CONFIDENCE_FIELD_NUMBER = 2;
-  private float confidence_;
+  private float confidence_ = 0F;
   /**
    *
    *
@@ -151,7 +153,9 @@ public float getConfidence() {
   }
 
   public static final int QUESTION_FIELD_NUMBER = 3;
-  private volatile java.lang.Object question_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object question_ = "";
   /**
    *
    *
@@ -200,7 +204,9 @@ public com.google.protobuf.ByteString getQuestionBytes() {
   }
 
   public static final int SOURCE_FIELD_NUMBER = 4;
-  private volatile java.lang.Object source_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object source_ = "";
   /**
    *
    *
@@ -267,6 +273,7 @@ private static final class MetadataDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> metadata_;
 
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> internalGetMetadata() {
@@ -327,8 +334,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
    * <code>map&lt;string, string&gt; metadata = 5;</code>
    */
   @java.lang.Override
-  public java.lang.String getMetadataOrDefault(
-      java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getMetadataOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -358,7 +367,9 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
   }
 
   public static final int ANSWER_RECORD_FIELD_NUMBER = 6;
-  private volatile java.lang.Object answerRecord_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object answerRecord_ = "";
   /**
    *
    *
@@ -680,17 +691,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       answer_ = "";
-
       confidence_ = 0F;
-
       question_ = "";
-
       source_ = "";
-
       internalGetMutableMetadata().clear();
       answerRecord_ = "";
-
       return this;
     }
 
@@ -718,18 +725,36 @@ public com.google.cloud.dialogflow.v2.FaqAnswer build() {
     public com.google.cloud.dialogflow.v2.FaqAnswer buildPartial() {
       com.google.cloud.dialogflow.v2.FaqAnswer result =
           new com.google.cloud.dialogflow.v2.FaqAnswer(this);
-      int from_bitField0_ = bitField0_;
-      result.answer_ = answer_;
-      result.confidence_ = confidence_;
-      result.question_ = question_;
-      result.source_ = source_;
-      result.metadata_ = internalGetMetadata();
-      result.metadata_.makeImmutable();
-      result.answerRecord_ = answerRecord_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.FaqAnswer result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.answer_ = answer_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.confidence_ = confidence_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.question_ = question_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.source_ = source_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.metadata_ = internalGetMetadata();
+        result.metadata_.makeImmutable();
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.answerRecord_ = answerRecord_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -777,6 +802,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.FaqAnswer other) {
       if (other == com.google.cloud.dialogflow.v2.FaqAnswer.getDefaultInstance()) return this;
       if (!other.getAnswer().isEmpty()) {
         answer_ = other.answer_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getConfidence() != 0F) {
@@ -784,15 +810,19 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.FaqAnswer other) {
       }
       if (!other.getQuestion().isEmpty()) {
         question_ = other.question_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getSource().isEmpty()) {
         source_ = other.source_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       internalGetMutableMetadata().mergeFrom(other.internalGetMetadata());
+      bitField0_ |= 0x00000010;
       if (!other.getAnswerRecord().isEmpty()) {
         answerRecord_ = other.answerRecord_;
+        bitField0_ |= 0x00000020;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -824,25 +854,25 @@ public Builder mergeFrom(
             case 10:
               {
                 answer_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 21:
               {
                 confidence_ = input.readFloat();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 21
             case 26:
               {
                 question_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 source_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 42:
@@ -854,12 +884,13 @@ public Builder mergeFrom(
                 internalGetMutableMetadata()
                     .getMutableMap()
                     .put(metadata__.getKey(), metadata__.getValue());
+                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             case 50:
               {
                 answerRecord_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 50
             default:
@@ -942,8 +973,8 @@ public Builder setAnswer(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       answer_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -959,8 +990,8 @@ public Builder setAnswer(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAnswer() {
-
       answer_ = getDefaultInstance().getAnswer();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -981,8 +1012,8 @@ public Builder setAnswerBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       answer_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1022,6 +1053,7 @@ public float getConfidence() {
     public Builder setConfidence(float value) {
 
       confidence_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1039,7 +1071,7 @@ public Builder setConfidence(float value) {
      * @return This builder for chaining.
      */
     public Builder clearConfidence() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       confidence_ = 0F;
       onChanged();
       return this;
@@ -1106,8 +1138,8 @@ public Builder setQuestion(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       question_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1123,8 +1155,8 @@ public Builder setQuestion(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearQuestion() {
-
       question_ = getDefaultInstance().getQuestion();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1145,8 +1177,8 @@ public Builder setQuestionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       question_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1221,8 +1253,8 @@ public Builder setSource(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       source_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1241,8 +1273,8 @@ public Builder setSource(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSource() {
-
       source_ = getDefaultInstance().getSource();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1266,8 +1298,8 @@ public Builder setSourceBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       source_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1283,8 +1315,6 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
         internalGetMutableMetadata() {
-      onChanged();
-      ;
       if (metadata_ == null) {
         metadata_ =
             com.google.protobuf.MapField.newMapField(MetadataDefaultEntryHolder.defaultEntry);
@@ -1292,6 +1322,8 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
       if (!metadata_.isMutable()) {
         metadata_ = metadata_.copy();
       }
+      bitField0_ |= 0x00000010;
+      onChanged();
       return metadata_;
     }
 
@@ -1346,8 +1378,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
      * <code>map&lt;string, string&gt; metadata = 5;</code>
      */
     @java.lang.Override
-    public java.lang.String getMetadataOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getMetadataOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1377,6 +1411,7 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
     }
 
     public Builder clearMetadata() {
+      bitField0_ = (bitField0_ & ~0x00000010);
       internalGetMutableMetadata().getMutableMap().clear();
       return this;
     }
@@ -1400,6 +1435,7 @@ public Builder removeMetadata(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMutableMetadata() {
+      bitField0_ |= 0x00000010;
       return internalGetMutableMetadata().getMutableMap();
     }
     /**
@@ -1419,8 +1455,8 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableMetadata().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000010;
       return this;
     }
     /**
@@ -1435,6 +1471,7 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllMetadata(java.util.Map<java.lang.String, java.lang.String> values) {
       internalGetMutableMetadata().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000010;
       return this;
     }
 
@@ -1505,8 +1542,8 @@ public Builder setAnswerRecord(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       answerRecord_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1524,8 +1561,8 @@ public Builder setAnswerRecord(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAnswerRecord() {
-
       answerRecord_ = getDefaultInstance().getAnswerRecord();
+      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -1548,8 +1585,8 @@ public Builder setAnswerRecordBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       answerRecord_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/FaqAnswerOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/FaqAnswerOrBuilder.java
index 19bf9ad4ff2e..29935ad7337d 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/FaqAnswerOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/FaqAnswerOrBuilder.java
@@ -165,7 +165,6 @@ public interface FaqAnswerOrBuilder
    *
    * <code>map&lt;string, string&gt; metadata = 5;</code>
    */
-
   /* nullable */
   java.lang.String getMetadataOrDefault(
       java.lang.String key,
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Fulfillment.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Fulfillment.java
index 578afc928099..0071e9e21ae7 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Fulfillment.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Fulfillment.java
@@ -163,7 +163,8 @@ public interface GenericWebServiceOrBuilder
      *
      *
      * <pre>
-     * Optional. The HTTP request headers to send together with fulfillment requests.
+     * Optional. The HTTP request headers to send together with fulfillment
+     * requests.
      * </pre>
      *
      * <code>
@@ -175,7 +176,8 @@ public interface GenericWebServiceOrBuilder
      *
      *
      * <pre>
-     * Optional. The HTTP request headers to send together with fulfillment requests.
+     * Optional. The HTTP request headers to send together with fulfillment
+     * requests.
      * </pre>
      *
      * <code>
@@ -190,7 +192,8 @@ public interface GenericWebServiceOrBuilder
      *
      *
      * <pre>
-     * Optional. The HTTP request headers to send together with fulfillment requests.
+     * Optional. The HTTP request headers to send together with fulfillment
+     * requests.
      * </pre>
      *
      * <code>
@@ -202,14 +205,14 @@ public interface GenericWebServiceOrBuilder
      *
      *
      * <pre>
-     * Optional. The HTTP request headers to send together with fulfillment requests.
+     * Optional. The HTTP request headers to send together with fulfillment
+     * requests.
      * </pre>
      *
      * <code>
      * map&lt;string, string&gt; request_headers = 4 [(.google.api.field_behavior) = OPTIONAL];
      * </code>
      */
-
     /* nullable */
     java.lang.String getRequestHeadersOrDefault(
         java.lang.String key,
@@ -219,7 +222,8 @@ java.lang.String getRequestHeadersOrDefault(
      *
      *
      * <pre>
-     * Optional. The HTTP request headers to send together with fulfillment requests.
+     * Optional. The HTTP request headers to send together with fulfillment
+     * requests.
      * </pre>
      *
      * <code>
@@ -232,8 +236,8 @@ java.lang.String getRequestHeadersOrDefault(
      *
      *
      * <pre>
-     * Optional. Indicates if generic web service is created through Cloud Functions
-     * integration. Defaults to false.
+     * Optional. Indicates if generic web service is created through Cloud
+     * Functions integration. Defaults to false.
      * is_cloud_function is deprecated. Cloud functions can be configured by
      * its uri as a regular web service now.
      * </pre>
@@ -243,7 +247,7 @@ java.lang.String getRequestHeadersOrDefault(
      * </code>
      *
      * @deprecated google.cloud.dialogflow.v2.Fulfillment.GenericWebService.is_cloud_function is
-     *     deprecated. See google/cloud/dialogflow/v2/fulfillment.proto;l=108
+     *     deprecated. See google/cloud/dialogflow/v2/fulfillment.proto;l=110
      * @return The isCloudFunction.
      */
     @java.lang.Deprecated
@@ -317,7 +321,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
     }
 
     public static final int URI_FIELD_NUMBER = 1;
-    private volatile java.lang.Object uri_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object uri_ = "";
     /**
      *
      *
@@ -368,7 +374,9 @@ public com.google.protobuf.ByteString getUriBytes() {
     }
 
     public static final int USERNAME_FIELD_NUMBER = 2;
-    private volatile java.lang.Object username_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object username_ = "";
     /**
      *
      *
@@ -417,7 +425,9 @@ public com.google.protobuf.ByteString getUsernameBytes() {
     }
 
     public static final int PASSWORD_FIELD_NUMBER = 3;
-    private volatile java.lang.Object password_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object password_ = "";
     /**
      *
      *
@@ -478,6 +488,7 @@ private static final class RequestHeadersDefaultEntryHolder {
               "");
     }
 
+    @SuppressWarnings("serial")
     private com.google.protobuf.MapField<java.lang.String, java.lang.String> requestHeaders_;
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
@@ -496,7 +507,8 @@ public int getRequestHeadersCount() {
      *
      *
      * <pre>
-     * Optional. The HTTP request headers to send together with fulfillment requests.
+     * Optional. The HTTP request headers to send together with fulfillment
+     * requests.
      * </pre>
      *
      * <code>
@@ -520,7 +532,8 @@ public java.util.Map<java.lang.String, java.lang.String> getRequestHeaders() {
      *
      *
      * <pre>
-     * Optional. The HTTP request headers to send together with fulfillment requests.
+     * Optional. The HTTP request headers to send together with fulfillment
+     * requests.
      * </pre>
      *
      * <code>
@@ -535,7 +548,8 @@ public java.util.Map<java.lang.String, java.lang.String> getRequestHeadersMap()
      *
      *
      * <pre>
-     * Optional. The HTTP request headers to send together with fulfillment requests.
+     * Optional. The HTTP request headers to send together with fulfillment
+     * requests.
      * </pre>
      *
      * <code>
@@ -543,8 +557,10 @@ public java.util.Map<java.lang.String, java.lang.String> getRequestHeadersMap()
      * </code>
      */
     @java.lang.Override
-    public java.lang.String getRequestHeadersOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getRequestHeadersOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -555,7 +571,8 @@ public java.lang.String getRequestHeadersOrDefault(
      *
      *
      * <pre>
-     * Optional. The HTTP request headers to send together with fulfillment requests.
+     * Optional. The HTTP request headers to send together with fulfillment
+     * requests.
      * </pre>
      *
      * <code>
@@ -575,13 +592,13 @@ public java.lang.String getRequestHeadersOrThrow(java.lang.String key) {
     }
 
     public static final int IS_CLOUD_FUNCTION_FIELD_NUMBER = 5;
-    private boolean isCloudFunction_;
+    private boolean isCloudFunction_ = false;
     /**
      *
      *
      * <pre>
-     * Optional. Indicates if generic web service is created through Cloud Functions
-     * integration. Defaults to false.
+     * Optional. Indicates if generic web service is created through Cloud
+     * Functions integration. Defaults to false.
      * is_cloud_function is deprecated. Cloud functions can be configured by
      * its uri as a regular web service now.
      * </pre>
@@ -591,7 +608,7 @@ public java.lang.String getRequestHeadersOrThrow(java.lang.String key) {
      * </code>
      *
      * @deprecated google.cloud.dialogflow.v2.Fulfillment.GenericWebService.is_cloud_function is
-     *     deprecated. See google/cloud/dialogflow/v2/fulfillment.proto;l=108
+     *     deprecated. See google/cloud/dialogflow/v2/fulfillment.proto;l=110
      * @return The isCloudFunction.
      */
     @java.lang.Override
@@ -869,15 +886,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         uri_ = "";
-
         username_ = "";
-
         password_ = "";
-
         internalGetMutableRequestHeaders().clear();
         isCloudFunction_ = false;
-
         return this;
       }
 
@@ -906,17 +920,34 @@ public com.google.cloud.dialogflow.v2.Fulfillment.GenericWebService build() {
       public com.google.cloud.dialogflow.v2.Fulfillment.GenericWebService buildPartial() {
         com.google.cloud.dialogflow.v2.Fulfillment.GenericWebService result =
             new com.google.cloud.dialogflow.v2.Fulfillment.GenericWebService(this);
-        int from_bitField0_ = bitField0_;
-        result.uri_ = uri_;
-        result.username_ = username_;
-        result.password_ = password_;
-        result.requestHeaders_ = internalGetRequestHeaders();
-        result.requestHeaders_.makeImmutable();
-        result.isCloudFunction_ = isCloudFunction_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2.Fulfillment.GenericWebService result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.uri_ = uri_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.username_ = username_;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.password_ = password_;
+        }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.requestHeaders_ = internalGetRequestHeaders();
+          result.requestHeaders_.makeImmutable();
+        }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.isCloudFunction_ = isCloudFunction_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -968,17 +999,21 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Fulfillment.GenericWebSe
           return this;
         if (!other.getUri().isEmpty()) {
           uri_ = other.uri_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getUsername().isEmpty()) {
           username_ = other.username_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (!other.getPassword().isEmpty()) {
           password_ = other.password_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
         internalGetMutableRequestHeaders().mergeFrom(other.internalGetRequestHeaders());
+        bitField0_ |= 0x00000008;
         if (other.getIsCloudFunction() != false) {
           setIsCloudFunction(other.getIsCloudFunction());
         }
@@ -1011,19 +1046,19 @@ public Builder mergeFrom(
               case 10:
                 {
                   uri_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
                 {
                   username_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 18
               case 26:
                 {
                   password_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000004;
                   break;
                 } // case 26
               case 34:
@@ -1036,12 +1071,13 @@ public Builder mergeFrom(
                   internalGetMutableRequestHeaders()
                       .getMutableMap()
                       .put(requestHeaders__.getKey(), requestHeaders__.getValue());
+                  bitField0_ |= 0x00000008;
                   break;
                 } // case 34
               case 40:
                 {
                   isCloudFunction_ = input.readBool();
-
+                  bitField0_ |= 0x00000010;
                   break;
                 } // case 40
               default:
@@ -1127,8 +1163,8 @@ public Builder setUri(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         uri_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1145,8 +1181,8 @@ public Builder setUri(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearUri() {
-
         uri_ = getDefaultInstance().getUri();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1168,8 +1204,8 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         uri_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1235,8 +1271,8 @@ public Builder setUsername(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         username_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1252,8 +1288,8 @@ public Builder setUsername(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearUsername() {
-
         username_ = getDefaultInstance().getUsername();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1274,8 +1310,8 @@ public Builder setUsernameBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         username_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1341,8 +1377,8 @@ public Builder setPassword(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         password_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1358,8 +1394,8 @@ public Builder setPassword(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearPassword() {
-
         password_ = getDefaultInstance().getPassword();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -1380,8 +1416,8 @@ public Builder setPasswordBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         password_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1399,8 +1435,6 @@ public Builder setPasswordBytes(com.google.protobuf.ByteString value) {
 
       private com.google.protobuf.MapField<java.lang.String, java.lang.String>
           internalGetMutableRequestHeaders() {
-        onChanged();
-        ;
         if (requestHeaders_ == null) {
           requestHeaders_ =
               com.google.protobuf.MapField.newMapField(
@@ -1409,6 +1443,8 @@ public Builder setPasswordBytes(com.google.protobuf.ByteString value) {
         if (!requestHeaders_.isMutable()) {
           requestHeaders_ = requestHeaders_.copy();
         }
+        bitField0_ |= 0x00000008;
+        onChanged();
         return requestHeaders_;
       }
 
@@ -1419,7 +1455,8 @@ public int getRequestHeadersCount() {
        *
        *
        * <pre>
-       * Optional. The HTTP request headers to send together with fulfillment requests.
+       * Optional. The HTTP request headers to send together with fulfillment
+       * requests.
        * </pre>
        *
        * <code>
@@ -1443,7 +1480,8 @@ public java.util.Map<java.lang.String, java.lang.String> getRequestHeaders() {
        *
        *
        * <pre>
-       * Optional. The HTTP request headers to send together with fulfillment requests.
+       * Optional. The HTTP request headers to send together with fulfillment
+       * requests.
        * </pre>
        *
        * <code>
@@ -1458,7 +1496,8 @@ public java.util.Map<java.lang.String, java.lang.String> getRequestHeadersMap()
        *
        *
        * <pre>
-       * Optional. The HTTP request headers to send together with fulfillment requests.
+       * Optional. The HTTP request headers to send together with fulfillment
+       * requests.
        * </pre>
        *
        * <code>
@@ -1466,8 +1505,10 @@ public java.util.Map<java.lang.String, java.lang.String> getRequestHeadersMap()
        * </code>
        */
       @java.lang.Override
-      public java.lang.String getRequestHeadersOrDefault(
-          java.lang.String key, java.lang.String defaultValue) {
+      public /* nullable */ java.lang.String getRequestHeadersOrDefault(
+          java.lang.String key,
+          /* nullable */
+          java.lang.String defaultValue) {
         if (key == null) {
           throw new NullPointerException("map key");
         }
@@ -1479,7 +1520,8 @@ public java.lang.String getRequestHeadersOrDefault(
        *
        *
        * <pre>
-       * Optional. The HTTP request headers to send together with fulfillment requests.
+       * Optional. The HTTP request headers to send together with fulfillment
+       * requests.
        * </pre>
        *
        * <code>
@@ -1500,6 +1542,7 @@ public java.lang.String getRequestHeadersOrThrow(java.lang.String key) {
       }
 
       public Builder clearRequestHeaders() {
+        bitField0_ = (bitField0_ & ~0x00000008);
         internalGetMutableRequestHeaders().getMutableMap().clear();
         return this;
       }
@@ -1507,7 +1550,8 @@ public Builder clearRequestHeaders() {
        *
        *
        * <pre>
-       * Optional. The HTTP request headers to send together with fulfillment requests.
+       * Optional. The HTTP request headers to send together with fulfillment
+       * requests.
        * </pre>
        *
        * <code>
@@ -1524,13 +1568,15 @@ public Builder removeRequestHeaders(java.lang.String key) {
       /** Use alternate mutation accessors instead. */
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, java.lang.String> getMutableRequestHeaders() {
+        bitField0_ |= 0x00000008;
         return internalGetMutableRequestHeaders().getMutableMap();
       }
       /**
        *
        *
        * <pre>
-       * Optional. The HTTP request headers to send together with fulfillment requests.
+       * Optional. The HTTP request headers to send together with fulfillment
+       * requests.
        * </pre>
        *
        * <code>
@@ -1544,15 +1590,16 @@ public Builder putRequestHeaders(java.lang.String key, java.lang.String value) {
         if (value == null) {
           throw new NullPointerException("map value");
         }
-
         internalGetMutableRequestHeaders().getMutableMap().put(key, value);
+        bitField0_ |= 0x00000008;
         return this;
       }
       /**
        *
        *
        * <pre>
-       * Optional. The HTTP request headers to send together with fulfillment requests.
+       * Optional. The HTTP request headers to send together with fulfillment
+       * requests.
        * </pre>
        *
        * <code>
@@ -1562,6 +1609,7 @@ public Builder putRequestHeaders(java.lang.String key, java.lang.String value) {
       public Builder putAllRequestHeaders(
           java.util.Map<java.lang.String, java.lang.String> values) {
         internalGetMutableRequestHeaders().getMutableMap().putAll(values);
+        bitField0_ |= 0x00000008;
         return this;
       }
 
@@ -1570,8 +1618,8 @@ public Builder putAllRequestHeaders(
        *
        *
        * <pre>
-       * Optional. Indicates if generic web service is created through Cloud Functions
-       * integration. Defaults to false.
+       * Optional. Indicates if generic web service is created through Cloud
+       * Functions integration. Defaults to false.
        * is_cloud_function is deprecated. Cloud functions can be configured by
        * its uri as a regular web service now.
        * </pre>
@@ -1581,7 +1629,7 @@ public Builder putAllRequestHeaders(
        * </code>
        *
        * @deprecated google.cloud.dialogflow.v2.Fulfillment.GenericWebService.is_cloud_function is
-       *     deprecated. See google/cloud/dialogflow/v2/fulfillment.proto;l=108
+       *     deprecated. See google/cloud/dialogflow/v2/fulfillment.proto;l=110
        * @return The isCloudFunction.
        */
       @java.lang.Override
@@ -1593,8 +1641,8 @@ public boolean getIsCloudFunction() {
        *
        *
        * <pre>
-       * Optional. Indicates if generic web service is created through Cloud Functions
-       * integration. Defaults to false.
+       * Optional. Indicates if generic web service is created through Cloud
+       * Functions integration. Defaults to false.
        * is_cloud_function is deprecated. Cloud functions can be configured by
        * its uri as a regular web service now.
        * </pre>
@@ -1604,7 +1652,7 @@ public boolean getIsCloudFunction() {
        * </code>
        *
        * @deprecated google.cloud.dialogflow.v2.Fulfillment.GenericWebService.is_cloud_function is
-       *     deprecated. See google/cloud/dialogflow/v2/fulfillment.proto;l=108
+       *     deprecated. See google/cloud/dialogflow/v2/fulfillment.proto;l=110
        * @param value The isCloudFunction to set.
        * @return This builder for chaining.
        */
@@ -1612,6 +1660,7 @@ public boolean getIsCloudFunction() {
       public Builder setIsCloudFunction(boolean value) {
 
         isCloudFunction_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1619,8 +1668,8 @@ public Builder setIsCloudFunction(boolean value) {
        *
        *
        * <pre>
-       * Optional. Indicates if generic web service is created through Cloud Functions
-       * integration. Defaults to false.
+       * Optional. Indicates if generic web service is created through Cloud
+       * Functions integration. Defaults to false.
        * is_cloud_function is deprecated. Cloud functions can be configured by
        * its uri as a regular web service now.
        * </pre>
@@ -1630,12 +1679,12 @@ public Builder setIsCloudFunction(boolean value) {
        * </code>
        *
        * @deprecated google.cloud.dialogflow.v2.Fulfillment.GenericWebService.is_cloud_function is
-       *     deprecated. See google/cloud/dialogflow/v2/fulfillment.proto;l=108
+       *     deprecated. See google/cloud/dialogflow/v2/fulfillment.proto;l=110
        * @return This builder for chaining.
        */
       @java.lang.Deprecated
       public Builder clearIsCloudFunction() {
-
+        bitField0_ = (bitField0_ & ~0x00000010);
         isCloudFunction_ = false;
         onChanged();
         return this;
@@ -1925,7 +1974,7 @@ private Type(int value) {
     }
 
     public static final int TYPE_FIELD_NUMBER = 1;
-    private int type_;
+    private int type_ = 0;
     /**
      *
      *
@@ -1954,9 +2003,8 @@ public int getTypeValue() {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.Fulfillment.Feature.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.Fulfillment.Feature.Type result =
-          com.google.cloud.dialogflow.v2.Fulfillment.Feature.Type.valueOf(type_);
+          com.google.cloud.dialogflow.v2.Fulfillment.Feature.Type.forNumber(type_);
       return result == null
           ? com.google.cloud.dialogflow.v2.Fulfillment.Feature.Type.UNRECOGNIZED
           : result;
@@ -2163,8 +2211,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         type_ = 0;
-
         return this;
       }
 
@@ -2192,11 +2240,20 @@ public com.google.cloud.dialogflow.v2.Fulfillment.Feature build() {
       public com.google.cloud.dialogflow.v2.Fulfillment.Feature buildPartial() {
         com.google.cloud.dialogflow.v2.Fulfillment.Feature result =
             new com.google.cloud.dialogflow.v2.Fulfillment.Feature(this);
-        result.type_ = type_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(com.google.cloud.dialogflow.v2.Fulfillment.Feature result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.type_ = type_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -2277,7 +2334,7 @@ public Builder mergeFrom(
               case 8:
                 {
                   type_ = input.readEnum();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 8
               default:
@@ -2297,6 +2354,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private int type_ = 0;
       /**
        *
@@ -2326,8 +2385,8 @@ public int getTypeValue() {
        * @return This builder for chaining.
        */
       public Builder setTypeValue(int value) {
-
         type_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2344,9 +2403,8 @@ public Builder setTypeValue(int value) {
        */
       @java.lang.Override
       public com.google.cloud.dialogflow.v2.Fulfillment.Feature.Type getType() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.dialogflow.v2.Fulfillment.Feature.Type result =
-            com.google.cloud.dialogflow.v2.Fulfillment.Feature.Type.valueOf(type_);
+            com.google.cloud.dialogflow.v2.Fulfillment.Feature.Type.forNumber(type_);
         return result == null
             ? com.google.cloud.dialogflow.v2.Fulfillment.Feature.Type.UNRECOGNIZED
             : result;
@@ -2367,7 +2425,7 @@ public Builder setType(com.google.cloud.dialogflow.v2.Fulfillment.Feature.Type v
         if (value == null) {
           throw new NullPointerException();
         }
-
+        bitField0_ |= 0x00000001;
         type_ = value.getNumber();
         onChanged();
         return this;
@@ -2384,7 +2442,7 @@ public Builder setType(com.google.cloud.dialogflow.v2.Fulfillment.Feature.Type v
        * @return This builder for chaining.
        */
       public Builder clearType() {
-
+        bitField0_ = (bitField0_ & ~0x00000001);
         type_ = 0;
         onChanged();
         return this;
@@ -2499,7 +2557,9 @@ public FulfillmentCase getFulfillmentCase() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -2556,12 +2616,15 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
    * <pre>
-   * Optional. The human-readable name of the fulfillment, unique within the agent.
+   * Optional. The human-readable name of the fulfillment, unique within the
+   * agent.
    * This field is not used for Fulfillment in an Environment.
    * </pre>
    *
@@ -2585,7 +2648,8 @@ public java.lang.String getDisplayName() {
    *
    *
    * <pre>
-   * Optional. The human-readable name of the fulfillment, unique within the agent.
+   * Optional. The human-readable name of the fulfillment, unique within the
+   * agent.
    * This field is not used for Fulfillment in an Environment.
    * </pre>
    *
@@ -2659,7 +2723,7 @@ public com.google.cloud.dialogflow.v2.Fulfillment.GenericWebService getGenericWe
   }
 
   public static final int ENABLED_FIELD_NUMBER = 4;
-  private boolean enabled_;
+  private boolean enabled_ = false;
   /**
    *
    *
@@ -2677,12 +2741,15 @@ public boolean getEnabled() {
   }
 
   public static final int FEATURES_FIELD_NUMBER = 5;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Fulfillment.Feature> features_;
   /**
    *
    *
    * <pre>
-   * Optional. The field defines whether the fulfillment is enabled for certain features.
+   * Optional. The field defines whether the fulfillment is enabled for certain
+   * features.
    * </pre>
    *
    * <code>
@@ -2697,7 +2764,8 @@ public java.util.List<com.google.cloud.dialogflow.v2.Fulfillment.Feature> getFea
    *
    *
    * <pre>
-   * Optional. The field defines whether the fulfillment is enabled for certain features.
+   * Optional. The field defines whether the fulfillment is enabled for certain
+   * features.
    * </pre>
    *
    * <code>
@@ -2713,7 +2781,8 @@ public java.util.List<com.google.cloud.dialogflow.v2.Fulfillment.Feature> getFea
    *
    *
    * <pre>
-   * Optional. The field defines whether the fulfillment is enabled for certain features.
+   * Optional. The field defines whether the fulfillment is enabled for certain
+   * features.
    * </pre>
    *
    * <code>
@@ -2728,7 +2797,8 @@ public int getFeaturesCount() {
    *
    *
    * <pre>
-   * Optional. The field defines whether the fulfillment is enabled for certain features.
+   * Optional. The field defines whether the fulfillment is enabled for certain
+   * features.
    * </pre>
    *
    * <code>
@@ -2743,7 +2813,8 @@ public com.google.cloud.dialogflow.v2.Fulfillment.Feature getFeatures(int index)
    *
    *
    * <pre>
-   * Optional. The field defines whether the fulfillment is enabled for certain features.
+   * Optional. The field defines whether the fulfillment is enabled for certain
+   * features.
    * </pre>
    *
    * <code>
@@ -3015,22 +3086,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       displayName_ = "";
-
       if (genericWebServiceBuilder_ != null) {
         genericWebServiceBuilder_.clear();
       }
       enabled_ = false;
-
       if (featuresBuilder_ == null) {
         features_ = java.util.Collections.emptyList();
       } else {
         features_ = null;
         featuresBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000010);
       fulfillmentCase_ = 0;
       fulfillment_ = null;
       return this;
@@ -3060,29 +3129,46 @@ public com.google.cloud.dialogflow.v2.Fulfillment build() {
     public com.google.cloud.dialogflow.v2.Fulfillment buildPartial() {
       com.google.cloud.dialogflow.v2.Fulfillment result =
           new com.google.cloud.dialogflow.v2.Fulfillment(this);
-      int from_bitField0_ = bitField0_;
-      result.name_ = name_;
-      result.displayName_ = displayName_;
-      if (fulfillmentCase_ == 3) {
-        if (genericWebServiceBuilder_ == null) {
-          result.fulfillment_ = fulfillment_;
-        } else {
-          result.fulfillment_ = genericWebServiceBuilder_.build();
-        }
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.enabled_ = enabled_;
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.cloud.dialogflow.v2.Fulfillment result) {
       if (featuresBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000010) != 0)) {
           features_ = java.util.Collections.unmodifiableList(features_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000010);
         }
         result.features_ = features_;
       } else {
         result.features_ = featuresBuilder_.build();
       }
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.Fulfillment result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.displayName_ = displayName_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.enabled_ = enabled_;
+      }
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2.Fulfillment result) {
       result.fulfillmentCase_ = fulfillmentCase_;
-      onBuilt();
-      return result;
+      result.fulfillment_ = this.fulfillment_;
+      if (fulfillmentCase_ == 3 && genericWebServiceBuilder_ != null) {
+        result.fulfillment_ = genericWebServiceBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -3132,10 +3218,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Fulfillment other) {
       if (other == com.google.cloud.dialogflow.v2.Fulfillment.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getEnabled() != false) {
@@ -3145,7 +3233,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Fulfillment other) {
         if (!other.features_.isEmpty()) {
           if (features_.isEmpty()) {
             features_ = other.features_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
             ensureFeaturesIsMutable();
             features_.addAll(other.features_);
@@ -3158,7 +3246,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Fulfillment other) {
             featuresBuilder_.dispose();
             featuresBuilder_ = null;
             features_ = other.features_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
             featuresBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getFeaturesFieldBuilder()
@@ -3208,13 +3296,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 displayName_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
@@ -3227,7 +3315,7 @@ public Builder mergeFrom(
             case 32:
               {
                 enabled_ = input.readBool();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 32
             case 42:
@@ -3350,8 +3438,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -3371,8 +3459,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -3397,8 +3485,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -3408,7 +3496,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      *
      *
      * <pre>
-     * Optional. The human-readable name of the fulfillment, unique within the agent.
+     * Optional. The human-readable name of the fulfillment, unique within the
+     * agent.
      * This field is not used for Fulfillment in an Environment.
      * </pre>
      *
@@ -3431,7 +3520,8 @@ public java.lang.String getDisplayName() {
      *
      *
      * <pre>
-     * Optional. The human-readable name of the fulfillment, unique within the agent.
+     * Optional. The human-readable name of the fulfillment, unique within the
+     * agent.
      * This field is not used for Fulfillment in an Environment.
      * </pre>
      *
@@ -3454,7 +3544,8 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
      *
      *
      * <pre>
-     * Optional. The human-readable name of the fulfillment, unique within the agent.
+     * Optional. The human-readable name of the fulfillment, unique within the
+     * agent.
      * This field is not used for Fulfillment in an Environment.
      * </pre>
      *
@@ -3467,8 +3558,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -3476,7 +3567,8 @@ public Builder setDisplayName(java.lang.String value) {
      *
      *
      * <pre>
-     * Optional. The human-readable name of the fulfillment, unique within the agent.
+     * Optional. The human-readable name of the fulfillment, unique within the
+     * agent.
      * This field is not used for Fulfillment in an Environment.
      * </pre>
      *
@@ -3485,8 +3577,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
-
       displayName_ = getDefaultInstance().getDisplayName();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -3494,7 +3586,8 @@ public Builder clearDisplayName() {
      *
      *
      * <pre>
-     * Optional. The human-readable name of the fulfillment, unique within the agent.
+     * Optional. The human-readable name of the fulfillment, unique within the
+     * agent.
      * This field is not used for Fulfillment in an Environment.
      * </pre>
      *
@@ -3508,8 +3601,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -3736,7 +3829,6 @@ public Builder clearGenericWebService() {
       }
       fulfillmentCase_ = 3;
       onChanged();
-      ;
       return genericWebServiceBuilder_;
     }
 
@@ -3771,6 +3863,7 @@ public boolean getEnabled() {
     public Builder setEnabled(boolean value) {
 
       enabled_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -3786,7 +3879,7 @@ public Builder setEnabled(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearEnabled() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       enabled_ = false;
       onChanged();
       return this;
@@ -3796,10 +3889,10 @@ public Builder clearEnabled() {
         java.util.Collections.emptyList();
 
     private void ensureFeaturesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         features_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.Fulfillment.Feature>(features_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000010;
       }
     }
 
@@ -3813,7 +3906,8 @@ private void ensureFeaturesIsMutable() {
      *
      *
      * <pre>
-     * Optional. The field defines whether the fulfillment is enabled for certain features.
+     * Optional. The field defines whether the fulfillment is enabled for certain
+     * features.
      * </pre>
      *
      * <code>
@@ -3831,7 +3925,8 @@ public java.util.List<com.google.cloud.dialogflow.v2.Fulfillment.Feature> getFea
      *
      *
      * <pre>
-     * Optional. The field defines whether the fulfillment is enabled for certain features.
+     * Optional. The field defines whether the fulfillment is enabled for certain
+     * features.
      * </pre>
      *
      * <code>
@@ -3849,7 +3944,8 @@ public int getFeaturesCount() {
      *
      *
      * <pre>
-     * Optional. The field defines whether the fulfillment is enabled for certain features.
+     * Optional. The field defines whether the fulfillment is enabled for certain
+     * features.
      * </pre>
      *
      * <code>
@@ -3867,7 +3963,8 @@ public com.google.cloud.dialogflow.v2.Fulfillment.Feature getFeatures(int index)
      *
      *
      * <pre>
-     * Optional. The field defines whether the fulfillment is enabled for certain features.
+     * Optional. The field defines whether the fulfillment is enabled for certain
+     * features.
      * </pre>
      *
      * <code>
@@ -3892,7 +3989,8 @@ public Builder setFeatures(
      *
      *
      * <pre>
-     * Optional. The field defines whether the fulfillment is enabled for certain features.
+     * Optional. The field defines whether the fulfillment is enabled for certain
+     * features.
      * </pre>
      *
      * <code>
@@ -3914,7 +4012,8 @@ public Builder setFeatures(
      *
      *
      * <pre>
-     * Optional. The field defines whether the fulfillment is enabled for certain features.
+     * Optional. The field defines whether the fulfillment is enabled for certain
+     * features.
      * </pre>
      *
      * <code>
@@ -3938,7 +4037,8 @@ public Builder addFeatures(com.google.cloud.dialogflow.v2.Fulfillment.Feature va
      *
      *
      * <pre>
-     * Optional. The field defines whether the fulfillment is enabled for certain features.
+     * Optional. The field defines whether the fulfillment is enabled for certain
+     * features.
      * </pre>
      *
      * <code>
@@ -3963,7 +4063,8 @@ public Builder addFeatures(
      *
      *
      * <pre>
-     * Optional. The field defines whether the fulfillment is enabled for certain features.
+     * Optional. The field defines whether the fulfillment is enabled for certain
+     * features.
      * </pre>
      *
      * <code>
@@ -3985,7 +4086,8 @@ public Builder addFeatures(
      *
      *
      * <pre>
-     * Optional. The field defines whether the fulfillment is enabled for certain features.
+     * Optional. The field defines whether the fulfillment is enabled for certain
+     * features.
      * </pre>
      *
      * <code>
@@ -4007,7 +4109,8 @@ public Builder addFeatures(
      *
      *
      * <pre>
-     * Optional. The field defines whether the fulfillment is enabled for certain features.
+     * Optional. The field defines whether the fulfillment is enabled for certain
+     * features.
      * </pre>
      *
      * <code>
@@ -4029,7 +4132,8 @@ public Builder addAllFeatures(
      *
      *
      * <pre>
-     * Optional. The field defines whether the fulfillment is enabled for certain features.
+     * Optional. The field defines whether the fulfillment is enabled for certain
+     * features.
      * </pre>
      *
      * <code>
@@ -4039,7 +4143,7 @@ public Builder addAllFeatures(
     public Builder clearFeatures() {
       if (featuresBuilder_ == null) {
         features_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
       } else {
         featuresBuilder_.clear();
@@ -4050,7 +4154,8 @@ public Builder clearFeatures() {
      *
      *
      * <pre>
-     * Optional. The field defines whether the fulfillment is enabled for certain features.
+     * Optional. The field defines whether the fulfillment is enabled for certain
+     * features.
      * </pre>
      *
      * <code>
@@ -4071,7 +4176,8 @@ public Builder removeFeatures(int index) {
      *
      *
      * <pre>
-     * Optional. The field defines whether the fulfillment is enabled for certain features.
+     * Optional. The field defines whether the fulfillment is enabled for certain
+     * features.
      * </pre>
      *
      * <code>
@@ -4086,7 +4192,8 @@ public com.google.cloud.dialogflow.v2.Fulfillment.Feature.Builder getFeaturesBui
      *
      *
      * <pre>
-     * Optional. The field defines whether the fulfillment is enabled for certain features.
+     * Optional. The field defines whether the fulfillment is enabled for certain
+     * features.
      * </pre>
      *
      * <code>
@@ -4105,7 +4212,8 @@ public com.google.cloud.dialogflow.v2.Fulfillment.FeatureOrBuilder getFeaturesOr
      *
      *
      * <pre>
-     * Optional. The field defines whether the fulfillment is enabled for certain features.
+     * Optional. The field defines whether the fulfillment is enabled for certain
+     * features.
      * </pre>
      *
      * <code>
@@ -4124,7 +4232,8 @@ public com.google.cloud.dialogflow.v2.Fulfillment.FeatureOrBuilder getFeaturesOr
      *
      *
      * <pre>
-     * Optional. The field defines whether the fulfillment is enabled for certain features.
+     * Optional. The field defines whether the fulfillment is enabled for certain
+     * features.
      * </pre>
      *
      * <code>
@@ -4139,7 +4248,8 @@ public com.google.cloud.dialogflow.v2.Fulfillment.Feature.Builder addFeaturesBui
      *
      *
      * <pre>
-     * Optional. The field defines whether the fulfillment is enabled for certain features.
+     * Optional. The field defines whether the fulfillment is enabled for certain
+     * features.
      * </pre>
      *
      * <code>
@@ -4156,7 +4266,8 @@ public com.google.cloud.dialogflow.v2.Fulfillment.Feature.Builder addFeaturesBui
      *
      *
      * <pre>
-     * Optional. The field defines whether the fulfillment is enabled for certain features.
+     * Optional. The field defines whether the fulfillment is enabled for certain
+     * features.
      * </pre>
      *
      * <code>
@@ -4179,7 +4290,7 @@ public com.google.cloud.dialogflow.v2.Fulfillment.Feature.Builder addFeaturesBui
                 com.google.cloud.dialogflow.v2.Fulfillment.Feature,
                 com.google.cloud.dialogflow.v2.Fulfillment.Feature.Builder,
                 com.google.cloud.dialogflow.v2.Fulfillment.FeatureOrBuilder>(
-                features_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                features_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
         features_ = null;
       }
       return featuresBuilder_;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/FulfillmentOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/FulfillmentOrBuilder.java
index 58c6395e4f54..bdb8893a1dac 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/FulfillmentOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/FulfillmentOrBuilder.java
@@ -60,7 +60,8 @@ public interface FulfillmentOrBuilder
    *
    *
    * <pre>
-   * Optional. The human-readable name of the fulfillment, unique within the agent.
+   * Optional. The human-readable name of the fulfillment, unique within the
+   * agent.
    * This field is not used for Fulfillment in an Environment.
    * </pre>
    *
@@ -73,7 +74,8 @@ public interface FulfillmentOrBuilder
    *
    *
    * <pre>
-   * Optional. The human-readable name of the fulfillment, unique within the agent.
+   * Optional. The human-readable name of the fulfillment, unique within the
+   * agent.
    * This field is not used for Fulfillment in an Environment.
    * </pre>
    *
@@ -136,7 +138,8 @@ public interface FulfillmentOrBuilder
    *
    *
    * <pre>
-   * Optional. The field defines whether the fulfillment is enabled for certain features.
+   * Optional. The field defines whether the fulfillment is enabled for certain
+   * features.
    * </pre>
    *
    * <code>
@@ -148,7 +151,8 @@ public interface FulfillmentOrBuilder
    *
    *
    * <pre>
-   * Optional. The field defines whether the fulfillment is enabled for certain features.
+   * Optional. The field defines whether the fulfillment is enabled for certain
+   * features.
    * </pre>
    *
    * <code>
@@ -160,7 +164,8 @@ public interface FulfillmentOrBuilder
    *
    *
    * <pre>
-   * Optional. The field defines whether the fulfillment is enabled for certain features.
+   * Optional. The field defines whether the fulfillment is enabled for certain
+   * features.
    * </pre>
    *
    * <code>
@@ -172,7 +177,8 @@ public interface FulfillmentOrBuilder
    *
    *
    * <pre>
-   * Optional. The field defines whether the fulfillment is enabled for certain features.
+   * Optional. The field defines whether the fulfillment is enabled for certain
+   * features.
    * </pre>
    *
    * <code>
@@ -185,7 +191,8 @@ public interface FulfillmentOrBuilder
    *
    *
    * <pre>
-   * Optional. The field defines whether the fulfillment is enabled for certain features.
+   * Optional. The field defines whether the fulfillment is enabled for certain
+   * features.
    * </pre>
    *
    * <code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/FulfillmentProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/FulfillmentProto.java
index 80b33e095372..8c930ec23b5d 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/FulfillmentProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/FulfillmentProto.java
@@ -108,11 +108,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "date_mask\032x\312A\031dialogflow.googleapis.com\322"
           + "AYhttps://www.googleapis.com/auth/cloud-"
           + "platform,https://www.googleapis.com/auth"
-          + "/dialogflowB\237\001\n\036com.google.cloud.dialogf"
-          + "low.v2B\020FulfillmentProtoP\001ZDgoogle.golan"
-          + "g.org/genproto/googleapis/cloud/dialogfl"
-          + "ow/v2;dialogflow\370\001\001\242\002\002DF\252\002\032Google.Cloud."
-          + "Dialogflow.V2b\006proto3"
+          + "/dialogflowB\231\001\n\036com.google.cloud.dialogf"
+          + "low.v2B\020FulfillmentProtoP\001Z>cloud.google"
+          + ".com/go/dialogflow/apiv2/dialogflowpb;di"
+          + "alogflowpb\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dialog"
+          + "flow.V2b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GcsDestination.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GcsDestination.java
index 1e401b6e10a2..79ff7e2ee9e7 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GcsDestination.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GcsDestination.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int URI_FIELD_NUMBER = 1;
-  private volatile java.lang.Object uri_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object uri_ = "";
   /**
    *
    *
@@ -321,8 +323,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       uri_ = "";
-
       return this;
     }
 
@@ -350,11 +352,20 @@ public com.google.cloud.dialogflow.v2.GcsDestination build() {
     public com.google.cloud.dialogflow.v2.GcsDestination buildPartial() {
       com.google.cloud.dialogflow.v2.GcsDestination result =
           new com.google.cloud.dialogflow.v2.GcsDestination(this);
-      result.uri_ = uri_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.GcsDestination result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.uri_ = uri_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -402,6 +413,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GcsDestination other) {
       if (other == com.google.cloud.dialogflow.v2.GcsDestination.getDefaultInstance()) return this;
       if (!other.getUri().isEmpty()) {
         uri_ = other.uri_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -433,7 +445,7 @@ public Builder mergeFrom(
             case 10:
               {
                 uri_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -453,6 +465,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object uri_ = "";
     /**
      *
@@ -526,8 +540,8 @@ public Builder setUri(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       uri_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -547,8 +561,8 @@ public Builder setUri(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearUri() {
-
       uri_ = getDefaultInstance().getUri();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -573,8 +587,8 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       uri_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GcsProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GcsProto.java
index a1e75e8ebda9..071b8ee94736 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GcsProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GcsProto.java
@@ -48,11 +48,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "google.cloud.dialogflow.v2\032\037google/api/f"
           + "ield_behavior.proto\"\037\n\nGcsSources\022\021\n\004uri"
           + "s\030\002 \003(\tB\003\340A\002\"\035\n\016GcsDestination\022\013\n\003uri\030\001 "
-          + "\001(\tB\227\001\n\036com.google.cloud.dialogflow.v2B\010"
-          + "GcsProtoP\001ZDgoogle.golang.org/genproto/g"
-          + "oogleapis/cloud/dialogflow/v2;dialogflow"
-          + "\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dialogflow.V2b\006p"
-          + "roto3"
+          + "\001(\tB\221\001\n\036com.google.cloud.dialogflow.v2B\010"
+          + "GcsProtoP\001Z>cloud.google.com/go/dialogfl"
+          + "ow/apiv2/dialogflowpb;dialogflowpb\370\001\001\242\002\002"
+          + "DF\252\002\032Google.Cloud.Dialogflow.V2b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GcsSources.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GcsSources.java
index 3b8a68d93b32..24f9a4f37975 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GcsSources.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GcsSources.java
@@ -68,6 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int URIS_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList uris_;
   /**
    *
@@ -340,6 +342,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       uris_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000001);
       return this;
@@ -369,14 +372,24 @@ public com.google.cloud.dialogflow.v2.GcsSources build() {
     public com.google.cloud.dialogflow.v2.GcsSources buildPartial() {
       com.google.cloud.dialogflow.v2.GcsSources result =
           new com.google.cloud.dialogflow.v2.GcsSources(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.cloud.dialogflow.v2.GcsSources result) {
       if (((bitField0_ & 0x00000001) != 0)) {
         uris_ = uris_.getUnmodifiableView();
         bitField0_ = (bitField0_ & ~0x00000001);
       }
       result.uris_ = uris_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.GcsSources result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetAgentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetAgentRequest.java
index 2ebd4e49bbeb..916cf601782d 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetAgentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetAgentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Agents.GetAgent][google.cloud.dialogflow.v2.Agents.GetAgent].
+ * The request message for
+ * [Agents.GetAgent][google.cloud.dialogflow.v2.Agents.GetAgent].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.GetAgentRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -285,7 +288,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Agents.GetAgent][google.cloud.dialogflow.v2.Agents.GetAgent].
+   * The request message for
+   * [Agents.GetAgent][google.cloud.dialogflow.v2.Agents.GetAgent].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.GetAgentRequest}
@@ -319,8 +323,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       return this;
     }
 
@@ -348,11 +352,20 @@ public com.google.cloud.dialogflow.v2.GetAgentRequest build() {
     public com.google.cloud.dialogflow.v2.GetAgentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetAgentRequest result =
           new com.google.cloud.dialogflow.v2.GetAgentRequest(this);
-      result.parent_ = parent_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.GetAgentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -400,6 +413,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetAgentRequest other) {
       if (other == com.google.cloud.dialogflow.v2.GetAgentRequest.getDefaultInstance()) return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -431,7 +445,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -451,6 +465,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -521,8 +537,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -541,8 +557,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -566,8 +582,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetContextRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetContextRequest.java
index adfc1a24c2b7..3552cde3c57a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetContextRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetContextRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Contexts.GetContext][google.cloud.dialogflow.v2.Contexts.GetContext].
+ * The request message for
+ * [Contexts.GetContext][google.cloud.dialogflow.v2.Contexts.GetContext].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.GetContextRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -293,7 +296,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Contexts.GetContext][google.cloud.dialogflow.v2.Contexts.GetContext].
+   * The request message for
+   * [Contexts.GetContext][google.cloud.dialogflow.v2.Contexts.GetContext].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.GetContextRequest}
@@ -327,8 +331,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -356,11 +360,20 @@ public com.google.cloud.dialogflow.v2.GetContextRequest build() {
     public com.google.cloud.dialogflow.v2.GetContextRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetContextRequest result =
           new com.google.cloud.dialogflow.v2.GetContextRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.GetContextRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -409,6 +422,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetContextRequest other)
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -440,7 +454,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -460,6 +474,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -542,8 +558,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -566,8 +582,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -595,8 +611,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetConversationDatasetRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetConversationDatasetRequest.java
index 2fa6af89d1df..e138ada4d548 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetConversationDatasetRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetConversationDatasetRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -324,8 +326,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -354,11 +356,21 @@ public com.google.cloud.dialogflow.v2.GetConversationDatasetRequest build() {
     public com.google.cloud.dialogflow.v2.GetConversationDatasetRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetConversationDatasetRequest result =
           new com.google.cloud.dialogflow.v2.GetConversationDatasetRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.GetConversationDatasetRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -408,6 +420,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetConversationDatasetRe
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -439,7 +452,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -459,6 +472,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -532,8 +547,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -553,8 +568,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -579,8 +594,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetConversationModelEvaluationRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetConversationModelEvaluationRequest.java
index 767182c03f54..cd77051bb1cd 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetConversationModelEvaluationRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetConversationModelEvaluationRequest.java
@@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -324,8 +326,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -355,11 +357,21 @@ public com.google.cloud.dialogflow.v2.GetConversationModelEvaluationRequest buil
     public com.google.cloud.dialogflow.v2.GetConversationModelEvaluationRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetConversationModelEvaluationRequest result =
           new com.google.cloud.dialogflow.v2.GetConversationModelEvaluationRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.GetConversationModelEvaluationRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -411,6 +423,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -442,7 +455,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -462,6 +475,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -529,8 +544,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -548,8 +563,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -572,8 +587,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetConversationModelRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetConversationModelRequest.java
index 7bec2cf031ee..6289ad8df9ac 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetConversationModelRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetConversationModelRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -318,8 +320,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -347,11 +349,20 @@ public com.google.cloud.dialogflow.v2.GetConversationModelRequest build() {
     public com.google.cloud.dialogflow.v2.GetConversationModelRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetConversationModelRequest result =
           new com.google.cloud.dialogflow.v2.GetConversationModelRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.GetConversationModelRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -400,6 +411,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetConversationModelRequ
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -431,7 +443,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -451,6 +463,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -515,8 +529,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -533,8 +547,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -556,8 +570,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetConversationProfileRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetConversationProfileRequest.java
index c6152f217c32..c1d73efb8990 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetConversationProfileRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetConversationProfileRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [ConversationProfiles.GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile].
+ * The request message for
+ * [ConversationProfiles.GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.GetConversationProfileRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -288,7 +291,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [ConversationProfiles.GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile].
+   * The request message for
+   * [ConversationProfiles.GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.GetConversationProfileRequest}
@@ -322,8 +326,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -352,11 +356,21 @@ public com.google.cloud.dialogflow.v2.GetConversationProfileRequest build() {
     public com.google.cloud.dialogflow.v2.GetConversationProfileRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetConversationProfileRequest result =
           new com.google.cloud.dialogflow.v2.GetConversationProfileRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.GetConversationProfileRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -406,6 +420,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetConversationProfileRe
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -437,7 +452,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -457,6 +472,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -530,8 +547,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -551,8 +568,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -577,8 +594,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetConversationRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetConversationRequest.java
index 01cb3a7a976c..6bf3ba701592 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetConversationRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetConversationRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Conversations.GetConversation][google.cloud.dialogflow.v2.Conversations.GetConversation].
+ * The request message for
+ * [Conversations.GetConversation][google.cloud.dialogflow.v2.Conversations.GetConversation].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.GetConversationRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -288,7 +291,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Conversations.GetConversation][google.cloud.dialogflow.v2.Conversations.GetConversation].
+   * The request message for
+   * [Conversations.GetConversation][google.cloud.dialogflow.v2.Conversations.GetConversation].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.GetConversationRequest}
@@ -322,8 +326,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -351,11 +355,20 @@ public com.google.cloud.dialogflow.v2.GetConversationRequest build() {
     public com.google.cloud.dialogflow.v2.GetConversationRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetConversationRequest result =
           new com.google.cloud.dialogflow.v2.GetConversationRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.GetConversationRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -404,6 +417,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetConversationRequest o
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -435,7 +449,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -455,6 +469,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -528,8 +544,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -549,8 +565,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -575,8 +591,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetDocumentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetDocumentRequest.java
index f17d57b65926..fd21a45e2ece 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetDocumentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetDocumentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * Request message for [Documents.GetDocument][google.cloud.dialogflow.v2.Documents.GetDocument].
+ * Request message for
+ * [Documents.GetDocument][google.cloud.dialogflow.v2.Documents.GetDocument].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.GetDocumentRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -287,7 +290,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Request message for [Documents.GetDocument][google.cloud.dialogflow.v2.Documents.GetDocument].
+   * Request message for
+   * [Documents.GetDocument][google.cloud.dialogflow.v2.Documents.GetDocument].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.GetDocumentRequest}
@@ -321,8 +325,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -350,11 +354,20 @@ public com.google.cloud.dialogflow.v2.GetDocumentRequest build() {
     public com.google.cloud.dialogflow.v2.GetDocumentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetDocumentRequest result =
           new com.google.cloud.dialogflow.v2.GetDocumentRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.GetDocumentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -403,6 +416,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetDocumentRequest other
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -434,7 +448,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -454,6 +468,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -527,8 +543,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -548,8 +564,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -574,8 +590,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEntityTypeRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEntityTypeRequest.java
index 82d00e146a17..77cbd4126fca 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEntityTypeRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEntityTypeRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [EntityTypes.GetEntityType][google.cloud.dialogflow.v2.EntityTypes.GetEntityType].
+ * The request message for
+ * [EntityTypes.GetEntityType][google.cloud.dialogflow.v2.EntityTypes.GetEntityType].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.GetEntityTypeRequest}
@@ -69,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -124,7 +127,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -352,7 +357,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [EntityTypes.GetEntityType][google.cloud.dialogflow.v2.EntityTypes.GetEntityType].
+   * The request message for
+   * [EntityTypes.GetEntityType][google.cloud.dialogflow.v2.EntityTypes.GetEntityType].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.GetEntityTypeRequest}
@@ -386,10 +392,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       languageCode_ = "";
-
       return this;
     }
 
@@ -417,12 +422,23 @@ public com.google.cloud.dialogflow.v2.GetEntityTypeRequest build() {
     public com.google.cloud.dialogflow.v2.GetEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetEntityTypeRequest result =
           new com.google.cloud.dialogflow.v2.GetEntityTypeRequest(this);
-      result.name_ = name_;
-      result.languageCode_ = languageCode_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.GetEntityTypeRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -471,10 +487,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetEntityTypeRequest oth
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -506,13 +524,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -532,6 +550,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -602,8 +622,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -622,8 +642,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -647,8 +667,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -726,8 +746,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -747,8 +767,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -773,8 +793,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEnvironmentHistoryRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEnvironmentHistoryRequest.java
index 22c40e1a8024..e42f1c2cef15 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEnvironmentHistoryRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEnvironmentHistoryRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Environments.GetEnvironmentHistory][google.cloud.dialogflow.v2.Environments.GetEnvironmentHistory].
+ * The request message for
+ * [Environments.GetEnvironmentHistory][google.cloud.dialogflow.v2.Environments.GetEnvironmentHistory].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.GetEnvironmentHistoryRequest}
@@ -69,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -132,13 +135,13 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
    * <pre>
-   * Optional. The maximum number of items to return in a single page. By default 100 and
-   * at most 1000.
+   * Optional. The maximum number of items to return in a single page. By
+   * default 100 and at most 1000.
    * </pre>
    *
    * <code>int32 page_size = 2 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -151,7 +154,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -381,7 +386,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Environments.GetEnvironmentHistory][google.cloud.dialogflow.v2.Environments.GetEnvironmentHistory].
+   * The request message for
+   * [Environments.GetEnvironmentHistory][google.cloud.dialogflow.v2.Environments.GetEnvironmentHistory].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.GetEnvironmentHistoryRequest}
@@ -415,12 +421,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -448,13 +452,26 @@ public com.google.cloud.dialogflow.v2.GetEnvironmentHistoryRequest build() {
     public com.google.cloud.dialogflow.v2.GetEnvironmentHistoryRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetEnvironmentHistoryRequest result =
           new com.google.cloud.dialogflow.v2.GetEnvironmentHistoryRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.GetEnvironmentHistoryRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -503,6 +520,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetEnvironmentHistoryReq
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -510,6 +528,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetEnvironmentHistoryReq
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -541,19 +560,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -573,6 +592,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -655,8 +676,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -679,8 +700,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -708,8 +729,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -719,8 +740,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      *
      *
      * <pre>
-     * Optional. The maximum number of items to return in a single page. By default 100 and
-     * at most 1000.
+     * Optional. The maximum number of items to return in a single page. By
+     * default 100 and at most 1000.
      * </pre>
      *
      * <code>int32 page_size = 2 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -735,8 +756,8 @@ public int getPageSize() {
      *
      *
      * <pre>
-     * Optional. The maximum number of items to return in a single page. By default 100 and
-     * at most 1000.
+     * Optional. The maximum number of items to return in a single page. By
+     * default 100 and at most 1000.
      * </pre>
      *
      * <code>int32 page_size = 2 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -747,6 +768,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -754,8 +776,8 @@ public Builder setPageSize(int value) {
      *
      *
      * <pre>
-     * Optional. The maximum number of items to return in a single page. By default 100 and
-     * at most 1000.
+     * Optional. The maximum number of items to return in a single page. By
+     * default 100 and at most 1000.
      * </pre>
      *
      * <code>int32 page_size = 2 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -763,7 +785,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -830,8 +852,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -847,8 +869,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -869,8 +891,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEnvironmentHistoryRequestOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEnvironmentHistoryRequestOrBuilder.java
index 30224f3a0339..7ecc85d3918c 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEnvironmentHistoryRequestOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEnvironmentHistoryRequestOrBuilder.java
@@ -66,8 +66,8 @@ public interface GetEnvironmentHistoryRequestOrBuilder
    *
    *
    * <pre>
-   * Optional. The maximum number of items to return in a single page. By default 100 and
-   * at most 1000.
+   * Optional. The maximum number of items to return in a single page. By
+   * default 100 and at most 1000.
    * </pre>
    *
    * <code>int32 page_size = 2 [(.google.api.field_behavior) = OPTIONAL];</code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEnvironmentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEnvironmentRequest.java
index 17432c02de21..ed2daf603732 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEnvironmentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEnvironmentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Environments.GetEnvironment][google.cloud.dialogflow.v2.Environments.GetEnvironment].
+ * The request message for
+ * [Environments.GetEnvironment][google.cloud.dialogflow.v2.Environments.GetEnvironment].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.GetEnvironmentRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -293,7 +296,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Environments.GetEnvironment][google.cloud.dialogflow.v2.Environments.GetEnvironment].
+   * The request message for
+   * [Environments.GetEnvironment][google.cloud.dialogflow.v2.Environments.GetEnvironment].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.GetEnvironmentRequest}
@@ -327,8 +331,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -356,11 +360,20 @@ public com.google.cloud.dialogflow.v2.GetEnvironmentRequest build() {
     public com.google.cloud.dialogflow.v2.GetEnvironmentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetEnvironmentRequest result =
           new com.google.cloud.dialogflow.v2.GetEnvironmentRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.GetEnvironmentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -409,6 +422,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetEnvironmentRequest ot
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -440,7 +454,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -460,6 +474,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -542,8 +558,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -566,8 +582,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -595,8 +611,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetFulfillmentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetFulfillmentRequest.java
index 5a135aad42c7..9c434394002e 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetFulfillmentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetFulfillmentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Fulfillments.GetFulfillment][google.cloud.dialogflow.v2.Fulfillments.GetFulfillment].
+ * The request message for
+ * [Fulfillments.GetFulfillment][google.cloud.dialogflow.v2.Fulfillments.GetFulfillment].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.GetFulfillmentRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -285,7 +288,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Fulfillments.GetFulfillment][google.cloud.dialogflow.v2.Fulfillments.GetFulfillment].
+   * The request message for
+   * [Fulfillments.GetFulfillment][google.cloud.dialogflow.v2.Fulfillments.GetFulfillment].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.GetFulfillmentRequest}
@@ -319,8 +323,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -348,11 +352,20 @@ public com.google.cloud.dialogflow.v2.GetFulfillmentRequest build() {
     public com.google.cloud.dialogflow.v2.GetFulfillmentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetFulfillmentRequest result =
           new com.google.cloud.dialogflow.v2.GetFulfillmentRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.GetFulfillmentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -401,6 +414,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetFulfillmentRequest ot
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -432,7 +446,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -452,6 +466,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -522,8 +538,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -542,8 +558,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -567,8 +583,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetIntentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetIntentRequest.java
index 32ae3c0010c9..256d70418ed2 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetIntentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetIntentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Intents.GetIntent][google.cloud.dialogflow.v2.Intents.GetIntent].
+ * The request message for
+ * [Intents.GetIntent][google.cloud.dialogflow.v2.Intents.GetIntent].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.GetIntentRequest}
@@ -70,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -125,7 +128,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -182,7 +187,7 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
   }
 
   public static final int INTENT_VIEW_FIELD_NUMBER = 3;
-  private int intentView_;
+  private int intentView_ = 0;
   /**
    *
    *
@@ -215,9 +220,8 @@ public int getIntentViewValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.IntentView getIntentView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.IntentView result =
-        com.google.cloud.dialogflow.v2.IntentView.valueOf(intentView_);
+        com.google.cloud.dialogflow.v2.IntentView.forNumber(intentView_);
     return result == null ? com.google.cloud.dialogflow.v2.IntentView.UNRECOGNIZED : result;
   }
 
@@ -404,7 +408,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Intents.GetIntent][google.cloud.dialogflow.v2.Intents.GetIntent].
+   * The request message for
+   * [Intents.GetIntent][google.cloud.dialogflow.v2.Intents.GetIntent].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.GetIntentRequest}
@@ -438,12 +443,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       languageCode_ = "";
-
       intentView_ = 0;
-
       return this;
     }
 
@@ -471,13 +474,26 @@ public com.google.cloud.dialogflow.v2.GetIntentRequest build() {
     public com.google.cloud.dialogflow.v2.GetIntentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetIntentRequest result =
           new com.google.cloud.dialogflow.v2.GetIntentRequest(this);
-      result.name_ = name_;
-      result.languageCode_ = languageCode_;
-      result.intentView_ = intentView_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.GetIntentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.intentView_ = intentView_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -526,10 +542,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetIntentRequest other)
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.intentView_ != 0) {
@@ -564,19 +582,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 intentView_ = input.readEnum();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             default:
@@ -596,6 +614,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -666,8 +686,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -686,8 +706,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -711,8 +731,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -790,8 +810,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -811,8 +831,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -837,8 +857,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -876,8 +896,8 @@ public int getIntentViewValue() {
      * @return This builder for chaining.
      */
     public Builder setIntentViewValue(int value) {
-
       intentView_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -896,9 +916,8 @@ public Builder setIntentViewValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.IntentView getIntentView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.IntentView result =
-          com.google.cloud.dialogflow.v2.IntentView.valueOf(intentView_);
+          com.google.cloud.dialogflow.v2.IntentView.forNumber(intentView_);
       return result == null ? com.google.cloud.dialogflow.v2.IntentView.UNRECOGNIZED : result;
     }
     /**
@@ -919,7 +938,7 @@ public Builder setIntentView(com.google.cloud.dialogflow.v2.IntentView value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000004;
       intentView_ = value.getNumber();
       onChanged();
       return this;
@@ -938,7 +957,7 @@ public Builder setIntentView(com.google.cloud.dialogflow.v2.IntentView value) {
      * @return This builder for chaining.
      */
     public Builder clearIntentView() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       intentView_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetKnowledgeBaseRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetKnowledgeBaseRequest.java
index 84d1a8967824..209525673602 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetKnowledgeBaseRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetKnowledgeBaseRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * Request message for [KnowledgeBases.GetKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.GetKnowledgeBase].
+ * Request message for
+ * [KnowledgeBases.GetKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.GetKnowledgeBase].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.GetKnowledgeBaseRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -288,7 +291,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Request message for [KnowledgeBases.GetKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.GetKnowledgeBase].
+   * Request message for
+   * [KnowledgeBases.GetKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.GetKnowledgeBase].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.GetKnowledgeBaseRequest}
@@ -322,8 +326,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -351,11 +355,20 @@ public com.google.cloud.dialogflow.v2.GetKnowledgeBaseRequest build() {
     public com.google.cloud.dialogflow.v2.GetKnowledgeBaseRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetKnowledgeBaseRequest result =
           new com.google.cloud.dialogflow.v2.GetKnowledgeBaseRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.GetKnowledgeBaseRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -404,6 +417,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetKnowledgeBaseRequest
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -435,7 +449,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -455,6 +469,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -528,8 +544,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -549,8 +565,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -575,8 +591,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetParticipantRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetParticipantRequest.java
index 3aab44a88cc6..cab22661bb77 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetParticipantRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetParticipantRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Participants.GetParticipant][google.cloud.dialogflow.v2.Participants.GetParticipant].
+ * The request message for
+ * [Participants.GetParticipant][google.cloud.dialogflow.v2.Participants.GetParticipant].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.GetParticipantRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -287,7 +290,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Participants.GetParticipant][google.cloud.dialogflow.v2.Participants.GetParticipant].
+   * The request message for
+   * [Participants.GetParticipant][google.cloud.dialogflow.v2.Participants.GetParticipant].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.GetParticipantRequest}
@@ -321,8 +325,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -350,11 +354,20 @@ public com.google.cloud.dialogflow.v2.GetParticipantRequest build() {
     public com.google.cloud.dialogflow.v2.GetParticipantRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetParticipantRequest result =
           new com.google.cloud.dialogflow.v2.GetParticipantRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.GetParticipantRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -403,6 +416,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetParticipantRequest ot
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -434,7 +448,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -454,6 +468,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -527,8 +543,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -548,8 +564,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -574,8 +590,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetSessionEntityTypeRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetSessionEntityTypeRequest.java
index ae81eac9fb02..2b0384ab0825 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetSessionEntityTypeRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetSessionEntityTypeRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [SessionEntityTypes.GetSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.GetSessionEntityType].
+ * The request message for
+ * [SessionEntityTypes.GetSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.GetSessionEntityType].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.GetSessionEntityTypeRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -296,7 +299,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [SessionEntityTypes.GetSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.GetSessionEntityType].
+   * The request message for
+   * [SessionEntityTypes.GetSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.GetSessionEntityType].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.GetSessionEntityTypeRequest}
@@ -330,8 +334,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -359,11 +363,20 @@ public com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest build() {
     public com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest result =
           new com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -412,6 +425,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequ
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -443,7 +457,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -463,6 +477,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -548,8 +564,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -573,8 +589,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -603,8 +619,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetValidationResultRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetValidationResultRequest.java
index a2b2d3ea4eef..885f690186c3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetValidationResultRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetValidationResultRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Agents.GetValidationResult][google.cloud.dialogflow.v2.Agents.GetValidationResult].
+ * The request message for
+ * [Agents.GetValidationResult][google.cloud.dialogflow.v2.Agents.GetValidationResult].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.GetValidationResultRequest}
@@ -69,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -124,7 +127,9 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -353,7 +358,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Agents.GetValidationResult][google.cloud.dialogflow.v2.Agents.GetValidationResult].
+   * The request message for
+   * [Agents.GetValidationResult][google.cloud.dialogflow.v2.Agents.GetValidationResult].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.GetValidationResultRequest}
@@ -387,10 +393,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       languageCode_ = "";
-
       return this;
     }
 
@@ -418,12 +423,23 @@ public com.google.cloud.dialogflow.v2.GetValidationResultRequest build() {
     public com.google.cloud.dialogflow.v2.GetValidationResultRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetValidationResultRequest result =
           new com.google.cloud.dialogflow.v2.GetValidationResultRequest(this);
-      result.parent_ = parent_;
-      result.languageCode_ = languageCode_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.GetValidationResultRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -472,10 +488,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetValidationResultReque
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -507,13 +525,13 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 26:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 26
             default:
@@ -533,6 +551,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -603,8 +623,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -623,8 +643,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -648,8 +668,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -727,8 +747,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -748,8 +768,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -774,8 +794,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetVersionRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetVersionRequest.java
index 851a89f65fe3..cd3e5a1893cb 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetVersionRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetVersionRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Versions.GetVersion][google.cloud.dialogflow.v2.Versions.GetVersion].
+ * The request message for
+ * [Versions.GetVersion][google.cloud.dialogflow.v2.Versions.GetVersion].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.GetVersionRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -291,7 +294,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Versions.GetVersion][google.cloud.dialogflow.v2.Versions.GetVersion].
+   * The request message for
+   * [Versions.GetVersion][google.cloud.dialogflow.v2.Versions.GetVersion].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.GetVersionRequest}
@@ -325,8 +329,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -354,11 +358,20 @@ public com.google.cloud.dialogflow.v2.GetVersionRequest build() {
     public com.google.cloud.dialogflow.v2.GetVersionRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetVersionRequest result =
           new com.google.cloud.dialogflow.v2.GetVersionRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.GetVersionRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -407,6 +420,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetVersionRequest other)
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -438,7 +452,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -458,6 +472,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -537,8 +553,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -560,8 +576,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -588,8 +604,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/HumanAgentAssistantConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/HumanAgentAssistantConfig.java
index a4c0e66ca11d..f1202ffa0e33 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/HumanAgentAssistantConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/HumanAgentAssistantConfig.java
@@ -148,7 +148,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int NO_SMALLTALK_FIELD_NUMBER = 1;
-    private boolean noSmalltalk_;
+    private boolean noSmalltalk_ = false;
     /**
      *
      *
@@ -166,7 +166,7 @@ public boolean getNoSmalltalk() {
     }
 
     public static final int ONLY_END_USER_FIELD_NUMBER = 2;
-    private boolean onlyEndUser_;
+    private boolean onlyEndUser_ = false;
     /**
      *
      *
@@ -407,10 +407,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         noSmalltalk_ = false;
-
         onlyEndUser_ = false;
-
         return this;
       }
 
@@ -444,12 +443,25 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
         com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionTriggerSettings result =
             new com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionTriggerSettings(
                 this);
-        result.noSmalltalk_ = noSmalltalk_;
-        result.onlyEndUser_ = onlyEndUser_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionTriggerSettings
+              result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.noSmalltalk_ = noSmalltalk_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.onlyEndUser_ = onlyEndUser_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -540,13 +552,13 @@ public Builder mergeFrom(
               case 8:
                 {
                   noSmalltalk_ = input.readBool();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 8
               case 16:
                 {
                   onlyEndUser_ = input.readBool();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 16
               default:
@@ -566,6 +578,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private boolean noSmalltalk_;
       /**
        *
@@ -597,6 +611,7 @@ public boolean getNoSmalltalk() {
       public Builder setNoSmalltalk(boolean value) {
 
         noSmalltalk_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -612,7 +627,7 @@ public Builder setNoSmalltalk(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearNoSmalltalk() {
-
+        bitField0_ = (bitField0_ & ~0x00000001);
         noSmalltalk_ = false;
         onChanged();
         return this;
@@ -651,6 +666,7 @@ public boolean getOnlyEndUser() {
       public Builder setOnlyEndUser(boolean value) {
 
         onlyEndUser_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -667,7 +683,7 @@ public Builder setOnlyEndUser(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearOnlyEndUser() {
-
+        bitField0_ = (bitField0_ & ~0x00000002);
         onlyEndUser_ = false;
         onChanged();
         return this;
@@ -1067,11 +1083,13 @@ public com.google.cloud.dialogflow.v2.SuggestionFeature getSuggestionFeature() {
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.SuggestionFeatureOrBuilder
         getSuggestionFeatureOrBuilder() {
-      return getSuggestionFeature();
+      return suggestionFeature_ == null
+          ? com.google.cloud.dialogflow.v2.SuggestionFeature.getDefaultInstance()
+          : suggestionFeature_;
     }
 
     public static final int ENABLE_EVENT_BASED_SUGGESTION_FIELD_NUMBER = 3;
-    private boolean enableEventBasedSuggestion_;
+    private boolean enableEventBasedSuggestion_ = false;
     /**
      *
      *
@@ -1149,7 +1167,10 @@ public boolean hasSuggestionTriggerSettings() {
     public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig
             .SuggestionTriggerSettingsOrBuilder
         getSuggestionTriggerSettingsOrBuilder() {
-      return getSuggestionTriggerSettings();
+      return suggestionTriggerSettings_ == null
+          ? com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionTriggerSettings
+              .getDefaultInstance()
+          : suggestionTriggerSettings_;
     }
 
     public static final int QUERY_CONFIG_FIELD_NUMBER = 6;
@@ -1207,7 +1228,10 @@ public boolean hasQueryConfig() {
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfigOrBuilder
         getQueryConfigOrBuilder() {
-      return getQueryConfig();
+      return queryConfig_ == null
+          ? com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig
+              .getDefaultInstance()
+          : queryConfig_;
     }
 
     public static final int CONVERSATION_MODEL_CONFIG_FIELD_NUMBER = 7;
@@ -1265,7 +1289,10 @@ public boolean hasConversationModelConfig() {
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.ConversationModelConfigOrBuilder
         getConversationModelConfigOrBuilder() {
-      return getConversationModelConfig();
+      return conversationModelConfig_ == null
+          ? com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.ConversationModelConfig
+              .getDefaultInstance()
+          : conversationModelConfig_;
     }
 
     public static final int CONVERSATION_PROCESS_CONFIG_FIELD_NUMBER = 8;
@@ -1324,7 +1351,10 @@ public boolean hasConversationProcessConfig() {
     public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig
             .ConversationProcessConfigOrBuilder
         getConversationProcessConfigOrBuilder() {
-      return getConversationProcessConfig();
+      return conversationProcessConfig_ == null
+          ? com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.ConversationProcessConfig
+              .getDefaultInstance()
+          : conversationProcessConfig_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -1620,36 +1650,31 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (suggestionFeatureBuilder_ == null) {
-          suggestionFeature_ = null;
-        } else {
-          suggestionFeature_ = null;
+        bitField0_ = 0;
+        suggestionFeature_ = null;
+        if (suggestionFeatureBuilder_ != null) {
+          suggestionFeatureBuilder_.dispose();
           suggestionFeatureBuilder_ = null;
         }
         enableEventBasedSuggestion_ = false;
-
-        if (suggestionTriggerSettingsBuilder_ == null) {
-          suggestionTriggerSettings_ = null;
-        } else {
-          suggestionTriggerSettings_ = null;
+        suggestionTriggerSettings_ = null;
+        if (suggestionTriggerSettingsBuilder_ != null) {
+          suggestionTriggerSettingsBuilder_.dispose();
           suggestionTriggerSettingsBuilder_ = null;
         }
-        if (queryConfigBuilder_ == null) {
-          queryConfig_ = null;
-        } else {
-          queryConfig_ = null;
+        queryConfig_ = null;
+        if (queryConfigBuilder_ != null) {
+          queryConfigBuilder_.dispose();
           queryConfigBuilder_ = null;
         }
-        if (conversationModelConfigBuilder_ == null) {
-          conversationModelConfig_ = null;
-        } else {
-          conversationModelConfig_ = null;
+        conversationModelConfig_ = null;
+        if (conversationModelConfigBuilder_ != null) {
+          conversationModelConfigBuilder_.dispose();
           conversationModelConfigBuilder_ = null;
         }
-        if (conversationProcessConfigBuilder_ == null) {
-          conversationProcessConfig_ = null;
-        } else {
-          conversationProcessConfig_ = null;
+        conversationProcessConfig_ = null;
+        if (conversationProcessConfigBuilder_ != null) {
+          conversationProcessConfigBuilder_.dispose();
           conversationProcessConfigBuilder_ = null;
         }
         return this;
@@ -1685,34 +1710,47 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
         com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionFeatureConfig result =
             new com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionFeatureConfig(
                 this);
-        if (suggestionFeatureBuilder_ == null) {
-          result.suggestionFeature_ = suggestionFeature_;
-        } else {
-          result.suggestionFeature_ = suggestionFeatureBuilder_.build();
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
-        result.enableEventBasedSuggestion_ = enableEventBasedSuggestion_;
-        if (suggestionTriggerSettingsBuilder_ == null) {
-          result.suggestionTriggerSettings_ = suggestionTriggerSettings_;
-        } else {
-          result.suggestionTriggerSettings_ = suggestionTriggerSettingsBuilder_.build();
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionFeatureConfig result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.suggestionFeature_ =
+              suggestionFeatureBuilder_ == null
+                  ? suggestionFeature_
+                  : suggestionFeatureBuilder_.build();
         }
-        if (queryConfigBuilder_ == null) {
-          result.queryConfig_ = queryConfig_;
-        } else {
-          result.queryConfig_ = queryConfigBuilder_.build();
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.enableEventBasedSuggestion_ = enableEventBasedSuggestion_;
         }
-        if (conversationModelConfigBuilder_ == null) {
-          result.conversationModelConfig_ = conversationModelConfig_;
-        } else {
-          result.conversationModelConfig_ = conversationModelConfigBuilder_.build();
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.suggestionTriggerSettings_ =
+              suggestionTriggerSettingsBuilder_ == null
+                  ? suggestionTriggerSettings_
+                  : suggestionTriggerSettingsBuilder_.build();
         }
-        if (conversationProcessConfigBuilder_ == null) {
-          result.conversationProcessConfig_ = conversationProcessConfig_;
-        } else {
-          result.conversationProcessConfig_ = conversationProcessConfigBuilder_.build();
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.queryConfig_ =
+              queryConfigBuilder_ == null ? queryConfig_ : queryConfigBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.conversationModelConfig_ =
+              conversationModelConfigBuilder_ == null
+                  ? conversationModelConfig_
+                  : conversationModelConfigBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000020) != 0)) {
+          result.conversationProcessConfig_ =
+              conversationProcessConfigBuilder_ == null
+                  ? conversationProcessConfig_
+                  : conversationProcessConfigBuilder_.build();
         }
-        onBuilt();
-        return result;
       }
 
       @java.lang.Override
@@ -1816,41 +1854,41 @@ public Builder mergeFrom(
               case 24:
                 {
                   enableEventBasedSuggestion_ = input.readBool();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 24
               case 42:
                 {
                   input.readMessage(
                       getSuggestionFeatureFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 42
               case 50:
                 {
                   input.readMessage(getQueryConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000008;
                   break;
                 } // case 50
               case 58:
                 {
                   input.readMessage(
                       getConversationModelConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000010;
                   break;
                 } // case 58
               case 66:
                 {
                   input.readMessage(
                       getConversationProcessConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000020;
                   break;
                 } // case 66
               case 82:
                 {
                   input.readMessage(
                       getSuggestionTriggerSettingsFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000004;
                   break;
                 } // case 82
               default:
@@ -1870,6 +1908,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private com.google.cloud.dialogflow.v2.SuggestionFeature suggestionFeature_;
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.cloud.dialogflow.v2.SuggestionFeature,
@@ -1888,7 +1928,7 @@ public Builder mergeFrom(
        * @return Whether the suggestionFeature field is set.
        */
       public boolean hasSuggestionFeature() {
-        return suggestionFeatureBuilder_ != null || suggestionFeature_ != null;
+        return ((bitField0_ & 0x00000001) != 0);
       }
       /**
        *
@@ -1925,11 +1965,11 @@ public Builder setSuggestionFeature(com.google.cloud.dialogflow.v2.SuggestionFea
             throw new NullPointerException();
           }
           suggestionFeature_ = value;
-          onChanged();
         } else {
           suggestionFeatureBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1945,11 +1985,11 @@ public Builder setSuggestionFeature(
           com.google.cloud.dialogflow.v2.SuggestionFeature.Builder builderForValue) {
         if (suggestionFeatureBuilder_ == null) {
           suggestionFeature_ = builderForValue.build();
-          onChanged();
         } else {
           suggestionFeatureBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1964,19 +2004,19 @@ public Builder setSuggestionFeature(
       public Builder mergeSuggestionFeature(
           com.google.cloud.dialogflow.v2.SuggestionFeature value) {
         if (suggestionFeatureBuilder_ == null) {
-          if (suggestionFeature_ != null) {
-            suggestionFeature_ =
-                com.google.cloud.dialogflow.v2.SuggestionFeature.newBuilder(suggestionFeature_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000001) != 0)
+              && suggestionFeature_ != null
+              && suggestionFeature_
+                  != com.google.cloud.dialogflow.v2.SuggestionFeature.getDefaultInstance()) {
+            getSuggestionFeatureBuilder().mergeFrom(value);
           } else {
             suggestionFeature_ = value;
           }
-          onChanged();
         } else {
           suggestionFeatureBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1989,14 +2029,13 @@ public Builder mergeSuggestionFeature(
        * <code>.google.cloud.dialogflow.v2.SuggestionFeature suggestion_feature = 5;</code>
        */
       public Builder clearSuggestionFeature() {
-        if (suggestionFeatureBuilder_ == null) {
-          suggestionFeature_ = null;
-          onChanged();
-        } else {
-          suggestionFeature_ = null;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        suggestionFeature_ = null;
+        if (suggestionFeatureBuilder_ != null) {
+          suggestionFeatureBuilder_.dispose();
           suggestionFeatureBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -2010,7 +2049,7 @@ public Builder clearSuggestionFeature() {
        */
       public com.google.cloud.dialogflow.v2.SuggestionFeature.Builder
           getSuggestionFeatureBuilder() {
-
+        bitField0_ |= 0x00000001;
         onChanged();
         return getSuggestionFeatureFieldBuilder().getBuilder();
       }
@@ -2094,6 +2133,7 @@ public boolean getEnableEventBasedSuggestion() {
       public Builder setEnableEventBasedSuggestion(boolean value) {
 
         enableEventBasedSuggestion_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2111,7 +2151,7 @@ public Builder setEnableEventBasedSuggestion(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearEnableEventBasedSuggestion() {
-
+        bitField0_ = (bitField0_ & ~0x00000002);
         enableEventBasedSuggestion_ = false;
         onChanged();
         return this;
@@ -2141,7 +2181,7 @@ public Builder clearEnableEventBasedSuggestion() {
        * @return Whether the suggestionTriggerSettings field is set.
        */
       public boolean hasSuggestionTriggerSettings() {
-        return suggestionTriggerSettingsBuilder_ != null || suggestionTriggerSettings_ != null;
+        return ((bitField0_ & 0x00000004) != 0);
       }
       /**
        *
@@ -2188,11 +2228,11 @@ public Builder setSuggestionTriggerSettings(
             throw new NullPointerException();
           }
           suggestionTriggerSettings_ = value;
-          onChanged();
         } else {
           suggestionTriggerSettingsBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -2212,11 +2252,11 @@ public Builder setSuggestionTriggerSettings(
               builderForValue) {
         if (suggestionTriggerSettingsBuilder_ == null) {
           suggestionTriggerSettings_ = builderForValue.build();
-          onChanged();
         } else {
           suggestionTriggerSettingsBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -2235,20 +2275,20 @@ public Builder mergeSuggestionTriggerSettings(
           com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionTriggerSettings
               value) {
         if (suggestionTriggerSettingsBuilder_ == null) {
-          if (suggestionTriggerSettings_ != null) {
-            suggestionTriggerSettings_ =
-                com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionTriggerSettings
-                    .newBuilder(suggestionTriggerSettings_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000004) != 0)
+              && suggestionTriggerSettings_ != null
+              && suggestionTriggerSettings_
+                  != com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig
+                      .SuggestionTriggerSettings.getDefaultInstance()) {
+            getSuggestionTriggerSettingsBuilder().mergeFrom(value);
           } else {
             suggestionTriggerSettings_ = value;
           }
-          onChanged();
         } else {
           suggestionTriggerSettingsBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -2264,14 +2304,13 @@ public Builder mergeSuggestionTriggerSettings(
        * </code>
        */
       public Builder clearSuggestionTriggerSettings() {
-        if (suggestionTriggerSettingsBuilder_ == null) {
-          suggestionTriggerSettings_ = null;
-          onChanged();
-        } else {
-          suggestionTriggerSettings_ = null;
+        bitField0_ = (bitField0_ & ~0x00000004);
+        suggestionTriggerSettings_ = null;
+        if (suggestionTriggerSettingsBuilder_ != null) {
+          suggestionTriggerSettingsBuilder_.dispose();
           suggestionTriggerSettingsBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -2289,7 +2328,7 @@ public Builder clearSuggestionTriggerSettings() {
       public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionTriggerSettings
               .Builder
           getSuggestionTriggerSettingsBuilder() {
-
+        bitField0_ |= 0x00000004;
         onChanged();
         return getSuggestionTriggerSettingsFieldBuilder().getBuilder();
       }
@@ -2374,7 +2413,7 @@ public Builder clearSuggestionTriggerSettings() {
        * @return Whether the queryConfig field is set.
        */
       public boolean hasQueryConfig() {
-        return queryConfigBuilder_ != null || queryConfig_ != null;
+        return ((bitField0_ & 0x00000008) != 0);
       }
       /**
        *
@@ -2418,11 +2457,11 @@ public Builder setQueryConfig(
             throw new NullPointerException();
           }
           queryConfig_ = value;
-          onChanged();
         } else {
           queryConfigBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000008;
+        onChanged();
         return this;
       }
       /**
@@ -2441,11 +2480,11 @@ public Builder setQueryConfig(
               builderForValue) {
         if (queryConfigBuilder_ == null) {
           queryConfig_ = builderForValue.build();
-          onChanged();
         } else {
           queryConfigBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000008;
+        onChanged();
         return this;
       }
       /**
@@ -2462,20 +2501,20 @@ public Builder setQueryConfig(
       public Builder mergeQueryConfig(
           com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig value) {
         if (queryConfigBuilder_ == null) {
-          if (queryConfig_ != null) {
-            queryConfig_ =
-                com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig
-                    .newBuilder(queryConfig_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000008) != 0)
+              && queryConfig_ != null
+              && queryConfig_
+                  != com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig
+                      .getDefaultInstance()) {
+            getQueryConfigBuilder().mergeFrom(value);
           } else {
             queryConfig_ = value;
           }
-          onChanged();
         } else {
           queryConfigBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000008;
+        onChanged();
         return this;
       }
       /**
@@ -2490,14 +2529,13 @@ public Builder mergeQueryConfig(
        * </code>
        */
       public Builder clearQueryConfig() {
-        if (queryConfigBuilder_ == null) {
-          queryConfig_ = null;
-          onChanged();
-        } else {
-          queryConfig_ = null;
+        bitField0_ = (bitField0_ & ~0x00000008);
+        queryConfig_ = null;
+        if (queryConfigBuilder_ != null) {
+          queryConfigBuilder_.dispose();
           queryConfigBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -2513,7 +2551,7 @@ public Builder clearQueryConfig() {
        */
       public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig.Builder
           getQueryConfigBuilder() {
-
+        bitField0_ |= 0x00000008;
         onChanged();
         return getQueryConfigFieldBuilder().getBuilder();
       }
@@ -2594,7 +2632,7 @@ public Builder clearQueryConfig() {
        * @return Whether the conversationModelConfig field is set.
        */
       public boolean hasConversationModelConfig() {
-        return conversationModelConfigBuilder_ != null || conversationModelConfig_ != null;
+        return ((bitField0_ & 0x00000010) != 0);
       }
       /**
        *
@@ -2638,11 +2676,11 @@ public Builder setConversationModelConfig(
             throw new NullPointerException();
           }
           conversationModelConfig_ = value;
-          onChanged();
         } else {
           conversationModelConfigBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /**
@@ -2661,11 +2699,11 @@ public Builder setConversationModelConfig(
               builderForValue) {
         if (conversationModelConfigBuilder_ == null) {
           conversationModelConfig_ = builderForValue.build();
-          onChanged();
         } else {
           conversationModelConfigBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /**
@@ -2682,20 +2720,20 @@ public Builder setConversationModelConfig(
       public Builder mergeConversationModelConfig(
           com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.ConversationModelConfig value) {
         if (conversationModelConfigBuilder_ == null) {
-          if (conversationModelConfig_ != null) {
-            conversationModelConfig_ =
-                com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.ConversationModelConfig
-                    .newBuilder(conversationModelConfig_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000010) != 0)
+              && conversationModelConfig_ != null
+              && conversationModelConfig_
+                  != com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig
+                      .ConversationModelConfig.getDefaultInstance()) {
+            getConversationModelConfigBuilder().mergeFrom(value);
           } else {
             conversationModelConfig_ = value;
           }
-          onChanged();
         } else {
           conversationModelConfigBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /**
@@ -2710,14 +2748,13 @@ public Builder mergeConversationModelConfig(
        * </code>
        */
       public Builder clearConversationModelConfig() {
-        if (conversationModelConfigBuilder_ == null) {
-          conversationModelConfig_ = null;
-          onChanged();
-        } else {
-          conversationModelConfig_ = null;
+        bitField0_ = (bitField0_ & ~0x00000010);
+        conversationModelConfig_ = null;
+        if (conversationModelConfigBuilder_ != null) {
+          conversationModelConfigBuilder_.dispose();
           conversationModelConfigBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -2734,7 +2771,7 @@ public Builder clearConversationModelConfig() {
       public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.ConversationModelConfig
               .Builder
           getConversationModelConfigBuilder() {
-
+        bitField0_ |= 0x00000010;
         onChanged();
         return getConversationModelConfigFieldBuilder().getBuilder();
       }
@@ -2816,7 +2853,7 @@ public Builder clearConversationModelConfig() {
        * @return Whether the conversationProcessConfig field is set.
        */
       public boolean hasConversationProcessConfig() {
-        return conversationProcessConfigBuilder_ != null || conversationProcessConfig_ != null;
+        return ((bitField0_ & 0x00000020) != 0);
       }
       /**
        *
@@ -2861,11 +2898,11 @@ public Builder setConversationProcessConfig(
             throw new NullPointerException();
           }
           conversationProcessConfig_ = value;
-          onChanged();
         } else {
           conversationProcessConfigBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000020;
+        onChanged();
         return this;
       }
       /**
@@ -2884,11 +2921,11 @@ public Builder setConversationProcessConfig(
               builderForValue) {
         if (conversationProcessConfigBuilder_ == null) {
           conversationProcessConfig_ = builderForValue.build();
-          onChanged();
         } else {
           conversationProcessConfigBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000020;
+        onChanged();
         return this;
       }
       /**
@@ -2906,20 +2943,20 @@ public Builder mergeConversationProcessConfig(
           com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.ConversationProcessConfig
               value) {
         if (conversationProcessConfigBuilder_ == null) {
-          if (conversationProcessConfig_ != null) {
-            conversationProcessConfig_ =
-                com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.ConversationProcessConfig
-                    .newBuilder(conversationProcessConfig_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000020) != 0)
+              && conversationProcessConfig_ != null
+              && conversationProcessConfig_
+                  != com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig
+                      .ConversationProcessConfig.getDefaultInstance()) {
+            getConversationProcessConfigBuilder().mergeFrom(value);
           } else {
             conversationProcessConfig_ = value;
           }
-          onChanged();
         } else {
           conversationProcessConfigBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000020;
+        onChanged();
         return this;
       }
       /**
@@ -2934,14 +2971,13 @@ public Builder mergeConversationProcessConfig(
        * </code>
        */
       public Builder clearConversationProcessConfig() {
-        if (conversationProcessConfigBuilder_ == null) {
-          conversationProcessConfig_ = null;
-          onChanged();
-        } else {
-          conversationProcessConfig_ = null;
+        bitField0_ = (bitField0_ & ~0x00000020);
+        conversationProcessConfig_ = null;
+        if (conversationProcessConfigBuilder_ != null) {
+          conversationProcessConfigBuilder_.dispose();
           conversationProcessConfigBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -2958,7 +2994,7 @@ public Builder clearConversationProcessConfig() {
       public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.ConversationProcessConfig
               .Builder
           getConversationProcessConfigBuilder() {
-
+        bitField0_ |= 0x00000020;
         onChanged();
         return getConversationProcessConfigFieldBuilder().getBuilder();
       }
@@ -3237,6 +3273,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int FEATURE_CONFIGS_FIELD_NUMBER = 2;
+
+    @SuppressWarnings("serial")
     private java.util.List<
             com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionFeatureConfig>
         featureConfigs_;
@@ -3330,7 +3368,7 @@ public int getFeatureConfigsCount() {
     }
 
     public static final int GROUP_SUGGESTION_RESPONSES_FIELD_NUMBER = 3;
-    private boolean groupSuggestionResponses_;
+    private boolean groupSuggestionResponses_ = false;
     /**
      *
      *
@@ -3575,6 +3613,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (featureConfigsBuilder_ == null) {
           featureConfigs_ = java.util.Collections.emptyList();
         } else {
@@ -3583,7 +3622,6 @@ public Builder clear() {
         }
         bitField0_ = (bitField0_ & ~0x00000001);
         groupSuggestionResponses_ = false;
-
         return this;
       }
 
@@ -3615,7 +3653,16 @@ public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig
           buildPartial() {
         com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig result =
             new com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig(this);
-        int from_bitField0_ = bitField0_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(
+          com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig result) {
         if (featureConfigsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             featureConfigs_ = java.util.Collections.unmodifiableList(featureConfigs_);
@@ -3625,9 +3672,14 @@ public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig
         } else {
           result.featureConfigs_ = featureConfigsBuilder_.build();
         }
-        result.groupSuggestionResponses_ = groupSuggestionResponses_;
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.groupSuggestionResponses_ = groupSuggestionResponses_;
+        }
       }
 
       @java.lang.Override
@@ -3757,7 +3809,7 @@ public Builder mergeFrom(
               case 24:
                 {
                   groupSuggestionResponses_ = input.readBool();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 24
               default:
@@ -4278,6 +4330,7 @@ public boolean getGroupSuggestionResponses() {
       public Builder setGroupSuggestionResponses(boolean value) {
 
         groupSuggestionResponses_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4301,7 +4354,7 @@ public Builder setGroupSuggestionResponses(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearGroupSuggestionResponses() {
-
+        bitField0_ = (bitField0_ & ~0x00000002);
         groupSuggestionResponses_ = false;
         onChanged();
         return this;
@@ -4793,6 +4846,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int KNOWLEDGE_BASES_FIELD_NUMBER = 1;
+
+      @SuppressWarnings("serial")
       private com.google.protobuf.LazyStringList knowledgeBases_;
       /**
        *
@@ -5115,6 +5170,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           knowledgeBases_ = com.google.protobuf.LazyStringArrayList.EMPTY;
           bitField0_ = (bitField0_ & ~0x00000001);
           return this;
@@ -5156,14 +5212,30 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
               result =
                   new com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig
                       .KnowledgeBaseQuerySource(this);
-          int from_bitField0_ = bitField0_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig
+                    .KnowledgeBaseQuerySource
+                result) {
           if (((bitField0_ & 0x00000001) != 0)) {
             knowledgeBases_ = knowledgeBases_.getUnmodifiableView();
             bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.knowledgeBases_ = knowledgeBases_;
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig
+                    .KnowledgeBaseQuerySource
+                result) {
+          int from_bitField0_ = bitField0_;
         }
 
         @java.lang.Override
@@ -5701,6 +5773,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int DOCUMENTS_FIELD_NUMBER = 1;
+
+      @SuppressWarnings("serial")
       private com.google.protobuf.LazyStringList documents_;
       /**
        *
@@ -6023,6 +6097,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           documents_ = com.google.protobuf.LazyStringArrayList.EMPTY;
           bitField0_ = (bitField0_ & ~0x00000001);
           return this;
@@ -6064,14 +6139,30 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
               result =
                   new com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig
                       .DocumentQuerySource(this);
-          int from_bitField0_ = bitField0_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig
+                    .DocumentQuerySource
+                result) {
           if (((bitField0_ & 0x00000001) != 0)) {
             documents_ = documents_.getUnmodifiableView();
             bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.documents_ = documents_;
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig
+                    .DocumentQuerySource
+                result) {
+          int from_bitField0_ = bitField0_;
         }
 
         @java.lang.Override
@@ -6488,8 +6579,8 @@ public interface DialogflowQuerySourceOrBuilder
        *
        *
        * <pre>
-       * Required. The name of a Dialogflow virtual agent used for end user side intent
-       * detection and suggestion. Format: `projects/&lt;Project Number/
+       * Required. The name of a Dialogflow virtual agent used for end user side
+       * intent detection and suggestion. Format: `projects/&lt;Project Number/
        * ID&gt;/locations/&lt;Location ID&gt;/agent`. When multiple agents are allowed in
        * the same Dialogflow project.
        * </pre>
@@ -6505,8 +6596,8 @@ public interface DialogflowQuerySourceOrBuilder
        *
        *
        * <pre>
-       * Required. The name of a Dialogflow virtual agent used for end user side intent
-       * detection and suggestion. Format: `projects/&lt;Project Number/
+       * Required. The name of a Dialogflow virtual agent used for end user side
+       * intent detection and suggestion. Format: `projects/&lt;Project Number/
        * ID&gt;/locations/&lt;Location ID&gt;/agent`. When multiple agents are allowed in
        * the same Dialogflow project.
        * </pre>
@@ -6573,13 +6664,15 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int AGENT_FIELD_NUMBER = 1;
-      private volatile java.lang.Object agent_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object agent_ = "";
       /**
        *
        *
        * <pre>
-       * Required. The name of a Dialogflow virtual agent used for end user side intent
-       * detection and suggestion. Format: `projects/&lt;Project Number/
+       * Required. The name of a Dialogflow virtual agent used for end user side
+       * intent detection and suggestion. Format: `projects/&lt;Project Number/
        * ID&gt;/locations/&lt;Location ID&gt;/agent`. When multiple agents are allowed in
        * the same Dialogflow project.
        * </pre>
@@ -6606,8 +6699,8 @@ public java.lang.String getAgent() {
        *
        *
        * <pre>
-       * Required. The name of a Dialogflow virtual agent used for end user side intent
-       * detection and suggestion. Format: `projects/&lt;Project Number/
+       * Required. The name of a Dialogflow virtual agent used for end user side
+       * intent detection and suggestion. Format: `projects/&lt;Project Number/
        * ID&gt;/locations/&lt;Location ID&gt;/agent`. When multiple agents are allowed in
        * the same Dialogflow project.
        * </pre>
@@ -6866,8 +6959,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           agent_ = "";
-
           return this;
         }
 
@@ -6907,11 +7000,23 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
               result =
                   new com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig
                       .DialogflowQuerySource(this);
-          result.agent_ = agent_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig
+                    .DialogflowQuerySource
+                result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.agent_ = agent_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -6972,6 +7077,7 @@ public Builder mergeFrom(
                   .DialogflowQuerySource.getDefaultInstance()) return this;
           if (!other.getAgent().isEmpty()) {
             agent_ = other.agent_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           this.mergeUnknownFields(other.getUnknownFields());
@@ -7003,7 +7109,7 @@ public Builder mergeFrom(
                 case 10:
                   {
                     agent_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 default:
@@ -7023,13 +7129,15 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object agent_ = "";
         /**
          *
          *
          * <pre>
-         * Required. The name of a Dialogflow virtual agent used for end user side intent
-         * detection and suggestion. Format: `projects/&lt;Project Number/
+         * Required. The name of a Dialogflow virtual agent used for end user side
+         * intent detection and suggestion. Format: `projects/&lt;Project Number/
          * ID&gt;/locations/&lt;Location ID&gt;/agent`. When multiple agents are allowed in
          * the same Dialogflow project.
          * </pre>
@@ -7055,8 +7163,8 @@ public java.lang.String getAgent() {
          *
          *
          * <pre>
-         * Required. The name of a Dialogflow virtual agent used for end user side intent
-         * detection and suggestion. Format: `projects/&lt;Project Number/
+         * Required. The name of a Dialogflow virtual agent used for end user side
+         * intent detection and suggestion. Format: `projects/&lt;Project Number/
          * ID&gt;/locations/&lt;Location ID&gt;/agent`. When multiple agents are allowed in
          * the same Dialogflow project.
          * </pre>
@@ -7082,8 +7190,8 @@ public com.google.protobuf.ByteString getAgentBytes() {
          *
          *
          * <pre>
-         * Required. The name of a Dialogflow virtual agent used for end user side intent
-         * detection and suggestion. Format: `projects/&lt;Project Number/
+         * Required. The name of a Dialogflow virtual agent used for end user side
+         * intent detection and suggestion. Format: `projects/&lt;Project Number/
          * ID&gt;/locations/&lt;Location ID&gt;/agent`. When multiple agents are allowed in
          * the same Dialogflow project.
          * </pre>
@@ -7099,8 +7207,8 @@ public Builder setAgent(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           agent_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -7108,8 +7216,8 @@ public Builder setAgent(java.lang.String value) {
          *
          *
          * <pre>
-         * Required. The name of a Dialogflow virtual agent used for end user side intent
-         * detection and suggestion. Format: `projects/&lt;Project Number/
+         * Required. The name of a Dialogflow virtual agent used for end user side
+         * intent detection and suggestion. Format: `projects/&lt;Project Number/
          * ID&gt;/locations/&lt;Location ID&gt;/agent`. When multiple agents are allowed in
          * the same Dialogflow project.
          * </pre>
@@ -7121,8 +7229,8 @@ public Builder setAgent(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearAgent() {
-
           agent_ = getDefaultInstance().getAgent();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -7130,8 +7238,8 @@ public Builder clearAgent() {
          *
          *
          * <pre>
-         * Required. The name of a Dialogflow virtual agent used for end user side intent
-         * detection and suggestion. Format: `projects/&lt;Project Number/
+         * Required. The name of a Dialogflow virtual agent used for end user side
+         * intent detection and suggestion. Format: `projects/&lt;Project Number/
          * ID&gt;/locations/&lt;Location ID&gt;/agent`. When multiple agents are allowed in
          * the same Dialogflow project.
          * </pre>
@@ -7148,8 +7256,8 @@ public Builder setAgentBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           agent_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -7323,7 +7431,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int DROP_HANDOFF_MESSAGES_FIELD_NUMBER = 1;
-      private boolean dropHandoffMessages_;
+      private boolean dropHandoffMessages_ = false;
       /**
        *
        *
@@ -7342,7 +7450,7 @@ public boolean getDropHandoffMessages() {
       }
 
       public static final int DROP_VIRTUAL_AGENT_MESSAGES_FIELD_NUMBER = 2;
-      private boolean dropVirtualAgentMessages_;
+      private boolean dropVirtualAgentMessages_ = false;
       /**
        *
        *
@@ -7360,7 +7468,7 @@ public boolean getDropVirtualAgentMessages() {
       }
 
       public static final int DROP_IVR_MESSAGES_FIELD_NUMBER = 3;
-      private boolean dropIvrMessages_;
+      private boolean dropIvrMessages_ = false;
       /**
        *
        *
@@ -7632,12 +7740,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           dropHandoffMessages_ = false;
-
           dropVirtualAgentMessages_ = false;
-
           dropIvrMessages_ = false;
-
           return this;
         }
 
@@ -7677,13 +7783,29 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
               result =
                   new com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig
                       .ContextFilterSettings(this);
-          result.dropHandoffMessages_ = dropHandoffMessages_;
-          result.dropVirtualAgentMessages_ = dropVirtualAgentMessages_;
-          result.dropIvrMessages_ = dropIvrMessages_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig
+                    .ContextFilterSettings
+                result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.dropHandoffMessages_ = dropHandoffMessages_;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.dropVirtualAgentMessages_ = dropVirtualAgentMessages_;
+          }
+          if (((from_bitField0_ & 0x00000004) != 0)) {
+            result.dropIvrMessages_ = dropIvrMessages_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -7780,19 +7902,19 @@ public Builder mergeFrom(
                 case 8:
                   {
                     dropHandoffMessages_ = input.readBool();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 8
                 case 16:
                   {
                     dropVirtualAgentMessages_ = input.readBool();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 16
                 case 24:
                   {
                     dropIvrMessages_ = input.readBool();
-
+                    bitField0_ |= 0x00000004;
                     break;
                   } // case 24
                 default:
@@ -7812,6 +7934,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private boolean dropHandoffMessages_;
         /**
          *
@@ -7845,6 +7969,7 @@ public boolean getDropHandoffMessages() {
         public Builder setDropHandoffMessages(boolean value) {
 
           dropHandoffMessages_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -7861,7 +7986,7 @@ public Builder setDropHandoffMessages(boolean value) {
          * @return This builder for chaining.
          */
         public Builder clearDropHandoffMessages() {
-
+          bitField0_ = (bitField0_ & ~0x00000001);
           dropHandoffMessages_ = false;
           onChanged();
           return this;
@@ -7898,6 +8023,7 @@ public boolean getDropVirtualAgentMessages() {
         public Builder setDropVirtualAgentMessages(boolean value) {
 
           dropVirtualAgentMessages_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -7913,7 +8039,7 @@ public Builder setDropVirtualAgentMessages(boolean value) {
          * @return This builder for chaining.
          */
         public Builder clearDropVirtualAgentMessages() {
-
+          bitField0_ = (bitField0_ & ~0x00000002);
           dropVirtualAgentMessages_ = false;
           onChanged();
           return this;
@@ -7950,6 +8076,7 @@ public boolean getDropIvrMessages() {
         public Builder setDropIvrMessages(boolean value) {
 
           dropIvrMessages_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -7965,7 +8092,7 @@ public Builder setDropIvrMessages(boolean value) {
          * @return This builder for chaining.
          */
         public Builder clearDropIvrMessages() {
-
+          bitField0_ = (bitField0_ & ~0x00000004);
           dropIvrMessages_ = false;
           onChanged();
           return this;
@@ -8301,7 +8428,7 @@ public boolean hasDialogflowQuerySource() {
     }
 
     public static final int MAX_RESULTS_FIELD_NUMBER = 4;
-    private int maxResults_;
+    private int maxResults_ = 0;
     /**
      *
      *
@@ -8320,7 +8447,7 @@ public int getMaxResults() {
     }
 
     public static final int CONFIDENCE_THRESHOLD_FIELD_NUMBER = 5;
-    private float confidenceThreshold_;
+    private float confidenceThreshold_ = 0F;
     /**
      *
      *
@@ -8411,7 +8538,10 @@ public boolean hasContextFilterSettings() {
     public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig
             .ContextFilterSettingsOrBuilder
         getContextFilterSettingsOrBuilder() {
-      return getContextFilterSettings();
+      return contextFilterSettings_ == null
+          ? com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig
+              .ContextFilterSettings.getDefaultInstance()
+          : contextFilterSettings_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -8727,6 +8857,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (knowledgeBaseQuerySourceBuilder_ != null) {
           knowledgeBaseQuerySourceBuilder_.clear();
         }
@@ -8737,13 +8868,10 @@ public Builder clear() {
           dialogflowQuerySourceBuilder_.clear();
         }
         maxResults_ = 0;
-
         confidenceThreshold_ = 0F;
-
-        if (contextFilterSettingsBuilder_ == null) {
-          contextFilterSettings_ = null;
-        } else {
-          contextFilterSettings_ = null;
+        contextFilterSettings_ = null;
+        if (contextFilterSettingsBuilder_ != null) {
+          contextFilterSettingsBuilder_.dispose();
           contextFilterSettingsBuilder_ = null;
         }
         querySourceCase_ = 0;
@@ -8781,37 +8909,44 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
         com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig result =
             new com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig(
                 this);
-        if (querySourceCase_ == 1) {
-          if (knowledgeBaseQuerySourceBuilder_ == null) {
-            result.querySource_ = querySource_;
-          } else {
-            result.querySource_ = knowledgeBaseQuerySourceBuilder_.build();
-          }
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
-        if (querySourceCase_ == 2) {
-          if (documentQuerySourceBuilder_ == null) {
-            result.querySource_ = querySource_;
-          } else {
-            result.querySource_ = documentQuerySourceBuilder_.build();
-          }
+        buildPartialOneofs(result);
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.maxResults_ = maxResults_;
         }
-        if (querySourceCase_ == 3) {
-          if (dialogflowQuerySourceBuilder_ == null) {
-            result.querySource_ = querySource_;
-          } else {
-            result.querySource_ = dialogflowQuerySourceBuilder_.build();
-          }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.confidenceThreshold_ = confidenceThreshold_;
         }
-        result.maxResults_ = maxResults_;
-        result.confidenceThreshold_ = confidenceThreshold_;
-        if (contextFilterSettingsBuilder_ == null) {
-          result.contextFilterSettings_ = contextFilterSettings_;
-        } else {
-          result.contextFilterSettings_ = contextFilterSettingsBuilder_.build();
+        if (((from_bitField0_ & 0x00000020) != 0)) {
+          result.contextFilterSettings_ =
+              contextFilterSettingsBuilder_ == null
+                  ? contextFilterSettings_
+                  : contextFilterSettingsBuilder_.build();
         }
+      }
+
+      private void buildPartialOneofs(
+          com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig result) {
         result.querySourceCase_ = querySourceCase_;
-        onBuilt();
-        return result;
+        result.querySource_ = this.querySource_;
+        if (querySourceCase_ == 1 && knowledgeBaseQuerySourceBuilder_ != null) {
+          result.querySource_ = knowledgeBaseQuerySourceBuilder_.build();
+        }
+        if (querySourceCase_ == 2 && documentQuerySourceBuilder_ != null) {
+          result.querySource_ = documentQuerySourceBuilder_.build();
+        }
+        if (querySourceCase_ == 3 && dialogflowQuerySourceBuilder_ != null) {
+          result.querySource_ = dialogflowQuerySourceBuilder_.build();
+        }
       }
 
       @java.lang.Override
@@ -8948,20 +9083,20 @@ public Builder mergeFrom(
               case 32:
                 {
                   maxResults_ = input.readInt32();
-
+                  bitField0_ |= 0x00000008;
                   break;
                 } // case 32
               case 45:
                 {
                   confidenceThreshold_ = input.readFloat();
-
+                  bitField0_ |= 0x00000010;
                   break;
                 } // case 45
               case 58:
                 {
                   input.readMessage(
                       getContextFilterSettingsFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000020;
                   break;
                 } // case 58
               default:
@@ -8995,6 +9130,8 @@ public Builder clearQuerySource() {
         return this;
       }
 
+      private int bitField0_;
+
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig
                   .KnowledgeBaseQuerySource,
@@ -9267,7 +9404,6 @@ public Builder clearKnowledgeBaseQuerySource() {
         }
         querySourceCase_ = 1;
         onChanged();
-        ;
         return knowledgeBaseQuerySourceBuilder_;
       }
 
@@ -9543,7 +9679,6 @@ public Builder clearDocumentQuerySource() {
         }
         querySourceCase_ = 2;
         onChanged();
-        ;
         return documentQuerySourceBuilder_;
       }
 
@@ -9810,7 +9945,6 @@ public Builder clearDialogflowQuerySource() {
         }
         querySourceCase_ = 3;
         onChanged();
-        ;
         return dialogflowQuerySourceBuilder_;
       }
 
@@ -9847,6 +9981,7 @@ public int getMaxResults() {
       public Builder setMaxResults(int value) {
 
         maxResults_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -9863,7 +9998,7 @@ public Builder setMaxResults(int value) {
        * @return This builder for chaining.
        */
       public Builder clearMaxResults() {
-
+        bitField0_ = (bitField0_ & ~0x00000008);
         maxResults_ = 0;
         onChanged();
         return this;
@@ -9926,6 +10061,7 @@ public float getConfidenceThreshold() {
       public Builder setConfidenceThreshold(float value) {
 
         confidenceThreshold_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -9954,7 +10090,7 @@ public Builder setConfidenceThreshold(float value) {
        * @return This builder for chaining.
        */
       public Builder clearConfidenceThreshold() {
-
+        bitField0_ = (bitField0_ & ~0x00000010);
         confidenceThreshold_ = 0F;
         onChanged();
         return this;
@@ -9986,7 +10122,7 @@ public Builder clearConfidenceThreshold() {
        * @return Whether the contextFilterSettings field is set.
        */
       public boolean hasContextFilterSettings() {
-        return contextFilterSettingsBuilder_ != null || contextFilterSettings_ != null;
+        return ((bitField0_ & 0x00000020) != 0);
       }
       /**
        *
@@ -10035,11 +10171,11 @@ public Builder setContextFilterSettings(
             throw new NullPointerException();
           }
           contextFilterSettings_ = value;
-          onChanged();
         } else {
           contextFilterSettingsBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000020;
+        onChanged();
         return this;
       }
       /**
@@ -10060,11 +10196,11 @@ public Builder setContextFilterSettings(
               builderForValue) {
         if (contextFilterSettingsBuilder_ == null) {
           contextFilterSettings_ = builderForValue.build();
-          onChanged();
         } else {
           contextFilterSettingsBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000020;
+        onChanged();
         return this;
       }
       /**
@@ -10084,20 +10220,20 @@ public Builder mergeContextFilterSettings(
                   .ContextFilterSettings
               value) {
         if (contextFilterSettingsBuilder_ == null) {
-          if (contextFilterSettings_ != null) {
-            contextFilterSettings_ =
-                com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig
-                    .ContextFilterSettings.newBuilder(contextFilterSettings_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000020) != 0)
+              && contextFilterSettings_ != null
+              && contextFilterSettings_
+                  != com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig
+                      .ContextFilterSettings.getDefaultInstance()) {
+            getContextFilterSettingsBuilder().mergeFrom(value);
           } else {
             contextFilterSettings_ = value;
           }
-          onChanged();
         } else {
           contextFilterSettingsBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000020;
+        onChanged();
         return this;
       }
       /**
@@ -10113,14 +10249,13 @@ public Builder mergeContextFilterSettings(
        * </code>
        */
       public Builder clearContextFilterSettings() {
-        if (contextFilterSettingsBuilder_ == null) {
-          contextFilterSettings_ = null;
-          onChanged();
-        } else {
-          contextFilterSettings_ = null;
+        bitField0_ = (bitField0_ & ~0x00000020);
+        contextFilterSettings_ = null;
+        if (contextFilterSettingsBuilder_ != null) {
+          contextFilterSettingsBuilder_.dispose();
           contextFilterSettingsBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -10138,7 +10273,7 @@ public Builder clearContextFilterSettings() {
       public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig
               .ContextFilterSettings.Builder
           getContextFilterSettingsBuilder() {
-
+        bitField0_ |= 0x00000020;
         onChanged();
         return getContextFilterSettingsFieldBuilder().getBuilder();
       }
@@ -10357,7 +10492,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int MODEL_FIELD_NUMBER = 1;
-    private volatile java.lang.Object model_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object model_ = "";
     /**
      *
      *
@@ -10622,8 +10759,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         model_ = "";
-
         return this;
       }
 
@@ -10657,11 +10794,21 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
         com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.ConversationModelConfig result =
             new com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.ConversationModelConfig(
                 this);
-        result.model_ = model_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.ConversationModelConfig result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.model_ = model_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -10718,6 +10865,7 @@ public Builder mergeFrom(
                 .getDefaultInstance()) return this;
         if (!other.getModel().isEmpty()) {
           model_ = other.model_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -10749,7 +10897,7 @@ public Builder mergeFrom(
               case 10:
                 {
                   model_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               default:
@@ -10769,6 +10917,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object model_ = "";
       /**
        *
@@ -10833,8 +10983,8 @@ public Builder setModel(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         model_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -10851,8 +11001,8 @@ public Builder setModel(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearModel() {
-
         model_ = getDefaultInstance().getModel();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -10874,8 +11024,8 @@ public Builder setModelBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         model_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -11019,7 +11169,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int RECENT_SENTENCES_COUNT_FIELD_NUMBER = 2;
-    private int recentSentencesCount_;
+    private int recentSentencesCount_ = 0;
     /**
      *
      *
@@ -11251,8 +11401,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         recentSentencesCount_ = 0;
-
         return this;
       }
 
@@ -11286,11 +11436,22 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
         com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.ConversationProcessConfig result =
             new com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.ConversationProcessConfig(
                 this);
-        result.recentSentencesCount_ = recentSentencesCount_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.ConversationProcessConfig
+              result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.recentSentencesCount_ = recentSentencesCount_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -11378,7 +11539,7 @@ public Builder mergeFrom(
               case 16:
                 {
                   recentSentencesCount_ = input.readInt32();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 16
               default:
@@ -11398,6 +11559,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private int recentSentencesCount_;
       /**
        *
@@ -11431,6 +11594,7 @@ public int getRecentSentencesCount() {
       public Builder setRecentSentencesCount(int value) {
 
         recentSentencesCount_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -11447,7 +11611,7 @@ public Builder setRecentSentencesCount(int value) {
        * @return This builder for chaining.
        */
       public Builder clearRecentSentencesCount() {
-
+        bitField0_ = (bitField0_ & ~0x00000001);
         recentSentencesCount_ = 0;
         onChanged();
         return this;
@@ -11554,11 +11718,17 @@ public interface MessageAnalysisConfigOrBuilder
      * and identifies the prevailing subjective opinion, especially to determine
      * a user's attitude as positive, negative, or neutral:
      * https://cloud.google.com/natural-language/docs/basics#sentiment_analysis
-     * For [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent] method, result will be in
+     * For
+     * [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent]
+     * method, result will be in
      * [StreamingAnalyzeContentResponse.message.SentimentAnalysisResult][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.message].
-     * For [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent] method, result will be in
+     * For
+     * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent]
+     * method, result will be in
      * [AnalyzeContentResponse.message.SentimentAnalysisResult][google.cloud.dialogflow.v2.AnalyzeContentResponse.message]
-     * For [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages] method, result will be in
+     * For
+     * [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages]
+     * method, result will be in
      * [ListMessagesResponse.messages.SentimentAnalysisResult][google.cloud.dialogflow.v2.ListMessagesResponse.messages]
      * If Pub/Sub notification is configured, result will be in
      * [ConversationEvent.new_message_payload.SentimentAnalysisResult][google.cloud.dialogflow.v2.ConversationEvent.new_message_payload].
@@ -11620,7 +11790,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int ENABLE_ENTITY_EXTRACTION_FIELD_NUMBER = 2;
-    private boolean enableEntityExtraction_;
+    private boolean enableEntityExtraction_ = false;
     /**
      *
      *
@@ -11642,7 +11812,7 @@ public boolean getEnableEntityExtraction() {
     }
 
     public static final int ENABLE_SENTIMENT_ANALYSIS_FIELD_NUMBER = 3;
-    private boolean enableSentimentAnalysis_;
+    private boolean enableSentimentAnalysis_ = false;
     /**
      *
      *
@@ -11653,11 +11823,17 @@ public boolean getEnableEntityExtraction() {
      * and identifies the prevailing subjective opinion, especially to determine
      * a user's attitude as positive, negative, or neutral:
      * https://cloud.google.com/natural-language/docs/basics#sentiment_analysis
-     * For [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent] method, result will be in
+     * For
+     * [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent]
+     * method, result will be in
      * [StreamingAnalyzeContentResponse.message.SentimentAnalysisResult][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.message].
-     * For [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent] method, result will be in
+     * For
+     * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent]
+     * method, result will be in
      * [AnalyzeContentResponse.message.SentimentAnalysisResult][google.cloud.dialogflow.v2.AnalyzeContentResponse.message]
-     * For [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages] method, result will be in
+     * For
+     * [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages]
+     * method, result will be in
      * [ListMessagesResponse.messages.SentimentAnalysisResult][google.cloud.dialogflow.v2.ListMessagesResponse.messages]
      * If Pub/Sub notification is configured, result will be in
      * [ConversationEvent.new_message_payload.SentimentAnalysisResult][google.cloud.dialogflow.v2.ConversationEvent.new_message_payload].
@@ -11893,10 +12069,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         enableEntityExtraction_ = false;
-
         enableSentimentAnalysis_ = false;
-
         return this;
       }
 
@@ -11930,12 +12105,24 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
         com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.MessageAnalysisConfig result =
             new com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.MessageAnalysisConfig(
                 this);
-        result.enableEntityExtraction_ = enableEntityExtraction_;
-        result.enableSentimentAnalysis_ = enableSentimentAnalysis_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.MessageAnalysisConfig result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.enableEntityExtraction_ = enableEntityExtraction_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.enableSentimentAnalysis_ = enableSentimentAnalysis_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -12025,13 +12212,13 @@ public Builder mergeFrom(
               case 16:
                 {
                   enableEntityExtraction_ = input.readBool();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 16
               case 24:
                 {
                   enableSentimentAnalysis_ = input.readBool();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 24
               default:
@@ -12051,6 +12238,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private boolean enableEntityExtraction_;
       /**
        *
@@ -12090,6 +12279,7 @@ public boolean getEnableEntityExtraction() {
       public Builder setEnableEntityExtraction(boolean value) {
 
         enableEntityExtraction_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -12109,7 +12299,7 @@ public Builder setEnableEntityExtraction(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearEnableEntityExtraction() {
-
+        bitField0_ = (bitField0_ & ~0x00000001);
         enableEntityExtraction_ = false;
         onChanged();
         return this;
@@ -12126,11 +12316,17 @@ public Builder clearEnableEntityExtraction() {
        * and identifies the prevailing subjective opinion, especially to determine
        * a user's attitude as positive, negative, or neutral:
        * https://cloud.google.com/natural-language/docs/basics#sentiment_analysis
-       * For [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent] method, result will be in
+       * For
+       * [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent]
+       * method, result will be in
        * [StreamingAnalyzeContentResponse.message.SentimentAnalysisResult][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.message].
-       * For [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent] method, result will be in
+       * For
+       * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent]
+       * method, result will be in
        * [AnalyzeContentResponse.message.SentimentAnalysisResult][google.cloud.dialogflow.v2.AnalyzeContentResponse.message]
-       * For [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages] method, result will be in
+       * For
+       * [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages]
+       * method, result will be in
        * [ListMessagesResponse.messages.SentimentAnalysisResult][google.cloud.dialogflow.v2.ListMessagesResponse.messages]
        * If Pub/Sub notification is configured, result will be in
        * [ConversationEvent.new_message_payload.SentimentAnalysisResult][google.cloud.dialogflow.v2.ConversationEvent.new_message_payload].
@@ -12154,11 +12350,17 @@ public boolean getEnableSentimentAnalysis() {
        * and identifies the prevailing subjective opinion, especially to determine
        * a user's attitude as positive, negative, or neutral:
        * https://cloud.google.com/natural-language/docs/basics#sentiment_analysis
-       * For [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent] method, result will be in
+       * For
+       * [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent]
+       * method, result will be in
        * [StreamingAnalyzeContentResponse.message.SentimentAnalysisResult][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.message].
-       * For [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent] method, result will be in
+       * For
+       * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent]
+       * method, result will be in
        * [AnalyzeContentResponse.message.SentimentAnalysisResult][google.cloud.dialogflow.v2.AnalyzeContentResponse.message]
-       * For [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages] method, result will be in
+       * For
+       * [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages]
+       * method, result will be in
        * [ListMessagesResponse.messages.SentimentAnalysisResult][google.cloud.dialogflow.v2.ListMessagesResponse.messages]
        * If Pub/Sub notification is configured, result will be in
        * [ConversationEvent.new_message_payload.SentimentAnalysisResult][google.cloud.dialogflow.v2.ConversationEvent.new_message_payload].
@@ -12172,6 +12374,7 @@ public boolean getEnableSentimentAnalysis() {
       public Builder setEnableSentimentAnalysis(boolean value) {
 
         enableSentimentAnalysis_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -12185,11 +12388,17 @@ public Builder setEnableSentimentAnalysis(boolean value) {
        * and identifies the prevailing subjective opinion, especially to determine
        * a user's attitude as positive, negative, or neutral:
        * https://cloud.google.com/natural-language/docs/basics#sentiment_analysis
-       * For [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent] method, result will be in
+       * For
+       * [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent]
+       * method, result will be in
        * [StreamingAnalyzeContentResponse.message.SentimentAnalysisResult][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.message].
-       * For [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent] method, result will be in
+       * For
+       * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent]
+       * method, result will be in
        * [AnalyzeContentResponse.message.SentimentAnalysisResult][google.cloud.dialogflow.v2.AnalyzeContentResponse.message]
-       * For [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages] method, result will be in
+       * For
+       * [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages]
+       * method, result will be in
        * [ListMessagesResponse.messages.SentimentAnalysisResult][google.cloud.dialogflow.v2.ListMessagesResponse.messages]
        * If Pub/Sub notification is configured, result will be in
        * [ConversationEvent.new_message_payload.SentimentAnalysisResult][google.cloud.dialogflow.v2.ConversationEvent.new_message_payload].
@@ -12200,7 +12409,7 @@ public Builder setEnableSentimentAnalysis(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearEnableSentimentAnalysis() {
-
+        bitField0_ = (bitField0_ & ~0x00000002);
         enableSentimentAnalysis_ = false;
         onChanged();
         return this;
@@ -12321,7 +12530,9 @@ public com.google.cloud.dialogflow.v2.NotificationConfig getNotificationConfig()
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.NotificationConfigOrBuilder
       getNotificationConfigOrBuilder() {
-    return getNotificationConfig();
+    return notificationConfig_ == null
+        ? com.google.cloud.dialogflow.v2.NotificationConfig.getDefaultInstance()
+        : notificationConfig_;
   }
 
   public static final int HUMAN_AGENT_SUGGESTION_CONFIG_FIELD_NUMBER = 3;
@@ -12379,7 +12590,10 @@ public boolean hasHumanAgentSuggestionConfig() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfigOrBuilder
       getHumanAgentSuggestionConfigOrBuilder() {
-    return getHumanAgentSuggestionConfig();
+    return humanAgentSuggestionConfig_ == null
+        ? com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig
+            .getDefaultInstance()
+        : humanAgentSuggestionConfig_;
   }
 
   public static final int END_USER_SUGGESTION_CONFIG_FIELD_NUMBER = 4;
@@ -12443,7 +12657,10 @@ public boolean hasEndUserSuggestionConfig() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfigOrBuilder
       getEndUserSuggestionConfigOrBuilder() {
-    return getEndUserSuggestionConfig();
+    return endUserSuggestionConfig_ == null
+        ? com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig
+            .getDefaultInstance()
+        : endUserSuggestionConfig_;
   }
 
   public static final int MESSAGE_ANALYSIS_CONFIG_FIELD_NUMBER = 5;
@@ -12501,7 +12718,10 @@ public boolean hasMessageAnalysisConfig() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.MessageAnalysisConfigOrBuilder
       getMessageAnalysisConfigOrBuilder() {
-    return getMessageAnalysisConfig();
+    return messageAnalysisConfig_ == null
+        ? com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.MessageAnalysisConfig
+            .getDefaultInstance()
+        : messageAnalysisConfig_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -12754,28 +12974,25 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (notificationConfigBuilder_ == null) {
-        notificationConfig_ = null;
-      } else {
-        notificationConfig_ = null;
+      bitField0_ = 0;
+      notificationConfig_ = null;
+      if (notificationConfigBuilder_ != null) {
+        notificationConfigBuilder_.dispose();
         notificationConfigBuilder_ = null;
       }
-      if (humanAgentSuggestionConfigBuilder_ == null) {
-        humanAgentSuggestionConfig_ = null;
-      } else {
-        humanAgentSuggestionConfig_ = null;
+      humanAgentSuggestionConfig_ = null;
+      if (humanAgentSuggestionConfigBuilder_ != null) {
+        humanAgentSuggestionConfigBuilder_.dispose();
         humanAgentSuggestionConfigBuilder_ = null;
       }
-      if (endUserSuggestionConfigBuilder_ == null) {
-        endUserSuggestionConfig_ = null;
-      } else {
-        endUserSuggestionConfig_ = null;
+      endUserSuggestionConfig_ = null;
+      if (endUserSuggestionConfigBuilder_ != null) {
+        endUserSuggestionConfigBuilder_.dispose();
         endUserSuggestionConfigBuilder_ = null;
       }
-      if (messageAnalysisConfigBuilder_ == null) {
-        messageAnalysisConfig_ = null;
-      } else {
-        messageAnalysisConfig_ = null;
+      messageAnalysisConfig_ = null;
+      if (messageAnalysisConfigBuilder_ != null) {
+        messageAnalysisConfigBuilder_.dispose();
         messageAnalysisConfigBuilder_ = null;
       }
       return this;
@@ -12805,28 +13022,39 @@ public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig build() {
     public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig buildPartial() {
       com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig result =
           new com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig(this);
-      if (notificationConfigBuilder_ == null) {
-        result.notificationConfig_ = notificationConfig_;
-      } else {
-        result.notificationConfig_ = notificationConfigBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (humanAgentSuggestionConfigBuilder_ == null) {
-        result.humanAgentSuggestionConfig_ = humanAgentSuggestionConfig_;
-      } else {
-        result.humanAgentSuggestionConfig_ = humanAgentSuggestionConfigBuilder_.build();
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.notificationConfig_ =
+            notificationConfigBuilder_ == null
+                ? notificationConfig_
+                : notificationConfigBuilder_.build();
       }
-      if (endUserSuggestionConfigBuilder_ == null) {
-        result.endUserSuggestionConfig_ = endUserSuggestionConfig_;
-      } else {
-        result.endUserSuggestionConfig_ = endUserSuggestionConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.humanAgentSuggestionConfig_ =
+            humanAgentSuggestionConfigBuilder_ == null
+                ? humanAgentSuggestionConfig_
+                : humanAgentSuggestionConfigBuilder_.build();
       }
-      if (messageAnalysisConfigBuilder_ == null) {
-        result.messageAnalysisConfig_ = messageAnalysisConfig_;
-      } else {
-        result.messageAnalysisConfig_ = messageAnalysisConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.endUserSuggestionConfig_ =
+            endUserSuggestionConfigBuilder_ == null
+                ? endUserSuggestionConfig_
+                : endUserSuggestionConfigBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.messageAnalysisConfig_ =
+            messageAnalysisConfigBuilder_ == null
+                ? messageAnalysisConfig_
+                : messageAnalysisConfigBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -12917,28 +13145,28 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getNotificationConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(
                     getHumanAgentSuggestionConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(
                     getEndUserSuggestionConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 34
             case 42:
               {
                 input.readMessage(
                     getMessageAnalysisConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 42
             default:
@@ -12958,6 +13186,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2.NotificationConfig notificationConfig_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.NotificationConfig,
@@ -12976,7 +13206,7 @@ public Builder mergeFrom(
      * @return Whether the notificationConfig field is set.
      */
     public boolean hasNotificationConfig() {
-      return notificationConfigBuilder_ != null || notificationConfig_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -13013,11 +13243,11 @@ public Builder setNotificationConfig(com.google.cloud.dialogflow.v2.Notification
           throw new NullPointerException();
         }
         notificationConfig_ = value;
-        onChanged();
       } else {
         notificationConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -13033,11 +13263,11 @@ public Builder setNotificationConfig(
         com.google.cloud.dialogflow.v2.NotificationConfig.Builder builderForValue) {
       if (notificationConfigBuilder_ == null) {
         notificationConfig_ = builderForValue.build();
-        onChanged();
       } else {
         notificationConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -13052,19 +13282,19 @@ public Builder setNotificationConfig(
     public Builder mergeNotificationConfig(
         com.google.cloud.dialogflow.v2.NotificationConfig value) {
       if (notificationConfigBuilder_ == null) {
-        if (notificationConfig_ != null) {
-          notificationConfig_ =
-              com.google.cloud.dialogflow.v2.NotificationConfig.newBuilder(notificationConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && notificationConfig_ != null
+            && notificationConfig_
+                != com.google.cloud.dialogflow.v2.NotificationConfig.getDefaultInstance()) {
+          getNotificationConfigBuilder().mergeFrom(value);
         } else {
           notificationConfig_ = value;
         }
-        onChanged();
       } else {
         notificationConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -13077,14 +13307,13 @@ public Builder mergeNotificationConfig(
      * <code>.google.cloud.dialogflow.v2.NotificationConfig notification_config = 2;</code>
      */
     public Builder clearNotificationConfig() {
-      if (notificationConfigBuilder_ == null) {
-        notificationConfig_ = null;
-        onChanged();
-      } else {
-        notificationConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      notificationConfig_ = null;
+      if (notificationConfigBuilder_ != null) {
+        notificationConfigBuilder_.dispose();
         notificationConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -13098,7 +13327,7 @@ public Builder clearNotificationConfig() {
      */
     public com.google.cloud.dialogflow.v2.NotificationConfig.Builder
         getNotificationConfigBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getNotificationConfigFieldBuilder().getBuilder();
     }
@@ -13168,7 +13397,7 @@ public Builder clearNotificationConfig() {
      * @return Whether the humanAgentSuggestionConfig field is set.
      */
     public boolean hasHumanAgentSuggestionConfig() {
-      return humanAgentSuggestionConfigBuilder_ != null || humanAgentSuggestionConfig_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -13212,11 +13441,11 @@ public Builder setHumanAgentSuggestionConfig(
           throw new NullPointerException();
         }
         humanAgentSuggestionConfig_ = value;
-        onChanged();
       } else {
         humanAgentSuggestionConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -13235,11 +13464,11 @@ public Builder setHumanAgentSuggestionConfig(
             builderForValue) {
       if (humanAgentSuggestionConfigBuilder_ == null) {
         humanAgentSuggestionConfig_ = builderForValue.build();
-        onChanged();
       } else {
         humanAgentSuggestionConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -13256,20 +13485,20 @@ public Builder setHumanAgentSuggestionConfig(
     public Builder mergeHumanAgentSuggestionConfig(
         com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig value) {
       if (humanAgentSuggestionConfigBuilder_ == null) {
-        if (humanAgentSuggestionConfig_ != null) {
-          humanAgentSuggestionConfig_ =
-              com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.newBuilder(
-                      humanAgentSuggestionConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && humanAgentSuggestionConfig_ != null
+            && humanAgentSuggestionConfig_
+                != com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig
+                    .getDefaultInstance()) {
+          getHumanAgentSuggestionConfigBuilder().mergeFrom(value);
         } else {
           humanAgentSuggestionConfig_ = value;
         }
-        onChanged();
       } else {
         humanAgentSuggestionConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -13284,14 +13513,13 @@ public Builder mergeHumanAgentSuggestionConfig(
      * </code>
      */
     public Builder clearHumanAgentSuggestionConfig() {
-      if (humanAgentSuggestionConfigBuilder_ == null) {
-        humanAgentSuggestionConfig_ = null;
-        onChanged();
-      } else {
-        humanAgentSuggestionConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      humanAgentSuggestionConfig_ = null;
+      if (humanAgentSuggestionConfigBuilder_ != null) {
+        humanAgentSuggestionConfigBuilder_.dispose();
         humanAgentSuggestionConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -13307,7 +13535,7 @@ public Builder clearHumanAgentSuggestionConfig() {
      */
     public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.Builder
         getHumanAgentSuggestionConfigBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getHumanAgentSuggestionConfigFieldBuilder().getBuilder();
     }
@@ -13384,7 +13612,7 @@ public Builder clearHumanAgentSuggestionConfig() {
      * @return Whether the endUserSuggestionConfig field is set.
      */
     public boolean hasEndUserSuggestionConfig() {
-      return endUserSuggestionConfigBuilder_ != null || endUserSuggestionConfig_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -13432,11 +13660,11 @@ public Builder setEndUserSuggestionConfig(
           throw new NullPointerException();
         }
         endUserSuggestionConfig_ = value;
-        onChanged();
       } else {
         endUserSuggestionConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -13457,11 +13685,11 @@ public Builder setEndUserSuggestionConfig(
             builderForValue) {
       if (endUserSuggestionConfigBuilder_ == null) {
         endUserSuggestionConfig_ = builderForValue.build();
-        onChanged();
       } else {
         endUserSuggestionConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -13480,20 +13708,20 @@ public Builder setEndUserSuggestionConfig(
     public Builder mergeEndUserSuggestionConfig(
         com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig value) {
       if (endUserSuggestionConfigBuilder_ == null) {
-        if (endUserSuggestionConfig_ != null) {
-          endUserSuggestionConfig_ =
-              com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.newBuilder(
-                      endUserSuggestionConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && endUserSuggestionConfig_ != null
+            && endUserSuggestionConfig_
+                != com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig
+                    .getDefaultInstance()) {
+          getEndUserSuggestionConfigBuilder().mergeFrom(value);
         } else {
           endUserSuggestionConfig_ = value;
         }
-        onChanged();
       } else {
         endUserSuggestionConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -13510,14 +13738,13 @@ public Builder mergeEndUserSuggestionConfig(
      * </code>
      */
     public Builder clearEndUserSuggestionConfig() {
-      if (endUserSuggestionConfigBuilder_ == null) {
-        endUserSuggestionConfig_ = null;
-        onChanged();
-      } else {
-        endUserSuggestionConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      endUserSuggestionConfig_ = null;
+      if (endUserSuggestionConfigBuilder_ != null) {
+        endUserSuggestionConfigBuilder_.dispose();
         endUserSuggestionConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -13535,7 +13762,7 @@ public Builder clearEndUserSuggestionConfig() {
      */
     public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.Builder
         getEndUserSuggestionConfigBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getEndUserSuggestionConfigFieldBuilder().getBuilder();
     }
@@ -13614,7 +13841,7 @@ public Builder clearEndUserSuggestionConfig() {
      * @return Whether the messageAnalysisConfig field is set.
      */
     public boolean hasMessageAnalysisConfig() {
-      return messageAnalysisConfigBuilder_ != null || messageAnalysisConfig_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -13658,11 +13885,11 @@ public Builder setMessageAnalysisConfig(
           throw new NullPointerException();
         }
         messageAnalysisConfig_ = value;
-        onChanged();
       } else {
         messageAnalysisConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -13681,11 +13908,11 @@ public Builder setMessageAnalysisConfig(
             builderForValue) {
       if (messageAnalysisConfigBuilder_ == null) {
         messageAnalysisConfig_ = builderForValue.build();
-        onChanged();
       } else {
         messageAnalysisConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -13702,20 +13929,20 @@ public Builder setMessageAnalysisConfig(
     public Builder mergeMessageAnalysisConfig(
         com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.MessageAnalysisConfig value) {
       if (messageAnalysisConfigBuilder_ == null) {
-        if (messageAnalysisConfig_ != null) {
-          messageAnalysisConfig_ =
-              com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.MessageAnalysisConfig
-                  .newBuilder(messageAnalysisConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && messageAnalysisConfig_ != null
+            && messageAnalysisConfig_
+                != com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.MessageAnalysisConfig
+                    .getDefaultInstance()) {
+          getMessageAnalysisConfigBuilder().mergeFrom(value);
         } else {
           messageAnalysisConfig_ = value;
         }
-        onChanged();
       } else {
         messageAnalysisConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -13730,14 +13957,13 @@ public Builder mergeMessageAnalysisConfig(
      * </code>
      */
     public Builder clearMessageAnalysisConfig() {
-      if (messageAnalysisConfigBuilder_ == null) {
-        messageAnalysisConfig_ = null;
-        onChanged();
-      } else {
-        messageAnalysisConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      messageAnalysisConfig_ = null;
+      if (messageAnalysisConfigBuilder_ != null) {
+        messageAnalysisConfigBuilder_.dispose();
         messageAnalysisConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -13753,7 +13979,7 @@ public Builder clearMessageAnalysisConfig() {
      */
     public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.MessageAnalysisConfig.Builder
         getMessageAnalysisConfigBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getMessageAnalysisConfigFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/HumanAgentAssistantEvent.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/HumanAgentAssistantEvent.java
index b62987b44328..2b02c25601d7 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/HumanAgentAssistantEvent.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/HumanAgentAssistantEvent.java
@@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_FIELD_NUMBER = 1;
-  private volatile java.lang.Object conversation_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversation_ = "";
   /**
    *
    *
@@ -122,7 +124,9 @@ public com.google.protobuf.ByteString getConversationBytes() {
   }
 
   public static final int PARTICIPANT_FIELD_NUMBER = 3;
-  private volatile java.lang.Object participant_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object participant_ = "";
   /**
    *
    *
@@ -175,6 +179,8 @@ public com.google.protobuf.ByteString getParticipantBytes() {
   }
 
   public static final int SUGGESTION_RESULTS_FIELD_NUMBER = 5;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.SuggestionResult> suggestionResults_;
   /**
    *
@@ -465,17 +471,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       conversation_ = "";
-
       participant_ = "";
-
       if (suggestionResultsBuilder_ == null) {
         suggestionResults_ = java.util.Collections.emptyList();
       } else {
         suggestionResults_ = null;
         suggestionResultsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000004);
       return this;
     }
 
@@ -503,20 +508,35 @@ public com.google.cloud.dialogflow.v2.HumanAgentAssistantEvent build() {
     public com.google.cloud.dialogflow.v2.HumanAgentAssistantEvent buildPartial() {
       com.google.cloud.dialogflow.v2.HumanAgentAssistantEvent result =
           new com.google.cloud.dialogflow.v2.HumanAgentAssistantEvent(this);
-      int from_bitField0_ = bitField0_;
-      result.conversation_ = conversation_;
-      result.participant_ = participant_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.HumanAgentAssistantEvent result) {
       if (suggestionResultsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000004) != 0)) {
           suggestionResults_ = java.util.Collections.unmodifiableList(suggestionResults_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.suggestionResults_ = suggestionResults_;
       } else {
         result.suggestionResults_ = suggestionResultsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.HumanAgentAssistantEvent result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversation_ = conversation_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.participant_ = participant_;
+      }
     }
 
     @java.lang.Override
@@ -567,17 +587,19 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.HumanAgentAssistantEvent
         return this;
       if (!other.getConversation().isEmpty()) {
         conversation_ = other.conversation_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getParticipant().isEmpty()) {
         participant_ = other.participant_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (suggestionResultsBuilder_ == null) {
         if (!other.suggestionResults_.isEmpty()) {
           if (suggestionResults_.isEmpty()) {
             suggestionResults_ = other.suggestionResults_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureSuggestionResultsIsMutable();
             suggestionResults_.addAll(other.suggestionResults_);
@@ -590,7 +612,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.HumanAgentAssistantEvent
             suggestionResultsBuilder_.dispose();
             suggestionResultsBuilder_ = null;
             suggestionResults_ = other.suggestionResults_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
             suggestionResultsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getSuggestionResultsFieldBuilder()
@@ -629,13 +651,13 @@ public Builder mergeFrom(
             case 10:
               {
                 conversation_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 26:
               {
                 participant_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 26
             case 42:
@@ -735,8 +757,8 @@ public Builder setConversation(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversation_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -753,8 +775,8 @@ public Builder setConversation(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversation() {
-
       conversation_ = getDefaultInstance().getConversation();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -776,8 +798,8 @@ public Builder setConversationBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversation_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -849,8 +871,8 @@ public Builder setParticipant(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       participant_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -868,8 +890,8 @@ public Builder setParticipant(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParticipant() {
-
       participant_ = getDefaultInstance().getParticipant();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -892,8 +914,8 @@ public Builder setParticipantBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       participant_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -902,11 +924,11 @@ public Builder setParticipantBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureSuggestionResultsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         suggestionResults_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.SuggestionResult>(
                 suggestionResults_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000004;
       }
     }
 
@@ -1125,7 +1147,7 @@ public Builder addAllSuggestionResults(
     public Builder clearSuggestionResults() {
       if (suggestionResultsBuilder_ == null) {
         suggestionResults_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
       } else {
         suggestionResultsBuilder_.clear();
@@ -1251,7 +1273,7 @@ public com.google.cloud.dialogflow.v2.SuggestionResult.Builder addSuggestionResu
                 com.google.cloud.dialogflow.v2.SuggestionResult.Builder,
                 com.google.cloud.dialogflow.v2.SuggestionResultOrBuilder>(
                 suggestionResults_,
-                ((bitField0_ & 0x00000001) != 0),
+                ((bitField0_ & 0x00000004) != 0),
                 getParentForChildren(),
                 isClean());
         suggestionResults_ = null;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/HumanAgentAssistantEventProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/HumanAgentAssistantEventProto.java
index e6b135a7fd2a..5e4a48e59274 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/HumanAgentAssistantEventProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/HumanAgentAssistantEventProto.java
@@ -47,11 +47,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "Event\022\024\n\014conversation\030\001 \001(\t\022\023\n\013participa"
           + "nt\030\003 \001(\t\022H\n\022suggestion_results\030\005 \003(\0132,.g"
           + "oogle.cloud.dialogflow.v2.SuggestionResu"
-          + "ltB\254\001\n\036com.google.cloud.dialogflow.v2B\035H"
-          + "umanAgentAssistantEventProtoP\001ZDgoogle.g"
-          + "olang.org/genproto/googleapis/cloud/dial"
-          + "ogflow/v2;dialogflow\370\001\001\242\002\002DF\252\002\032Google.Cl"
-          + "oud.Dialogflow.V2b\006proto3"
+          + "ltB\246\001\n\036com.google.cloud.dialogflow.v2B\035H"
+          + "umanAgentAssistantEventProtoP\001Z>cloud.go"
+          + "ogle.com/go/dialogflow/apiv2/dialogflowp"
+          + "b;dialogflowpb\370\001\001\242\002\002DF\252\002\032Google.Cloud.Di"
+          + "alogflow.V2b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/HumanAgentHandoffConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/HumanAgentHandoffConfig.java
index e25d70d4f4ac..41b6b816b735 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/HumanAgentHandoffConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/HumanAgentHandoffConfig.java
@@ -151,7 +151,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int ACCOUNT_NUMBER_FIELD_NUMBER = 1;
-    private volatile java.lang.Object accountNumber_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object accountNumber_ = "";
     /**
      *
      *
@@ -405,8 +407,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         accountNumber_ = "";
-
         return this;
       }
 
@@ -438,11 +440,21 @@ public com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig.LivePersonConfig b
           buildPartial() {
         com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig.LivePersonConfig result =
             new com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig.LivePersonConfig(this);
-        result.accountNumber_ = accountNumber_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig.LivePersonConfig result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.accountNumber_ = accountNumber_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -497,6 +509,7 @@ public Builder mergeFrom(
                 .getDefaultInstance()) return this;
         if (!other.getAccountNumber().isEmpty()) {
           accountNumber_ = other.accountNumber_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -528,7 +541,7 @@ public Builder mergeFrom(
               case 10:
                 {
                   accountNumber_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               default:
@@ -548,6 +561,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object accountNumber_ = "";
       /**
        *
@@ -612,8 +627,8 @@ public Builder setAccountNumber(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         accountNumber_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -630,8 +645,8 @@ public Builder setAccountNumber(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearAccountNumber() {
-
         accountNumber_ = getDefaultInstance().getAccountNumber();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -653,8 +668,8 @@ public Builder setAccountNumberBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         accountNumber_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -894,7 +909,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int ORGANIZATION_ID_FIELD_NUMBER = 1;
-    private volatile java.lang.Object organizationId_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object organizationId_ = "";
     /**
      *
      *
@@ -943,7 +960,9 @@ public com.google.protobuf.ByteString getOrganizationIdBytes() {
     }
 
     public static final int DEPLOYMENT_ID_FIELD_NUMBER = 2;
-    private volatile java.lang.Object deploymentId_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object deploymentId_ = "";
     /**
      *
      *
@@ -992,7 +1011,9 @@ public com.google.protobuf.ByteString getDeploymentIdBytes() {
     }
 
     public static final int BUTTON_ID_FIELD_NUMBER = 3;
-    private volatile java.lang.Object buttonId_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object buttonId_ = "";
     /**
      *
      *
@@ -1041,7 +1062,9 @@ public com.google.protobuf.ByteString getButtonIdBytes() {
     }
 
     public static final int ENDPOINT_DOMAIN_FIELD_NUMBER = 4;
-    private volatile java.lang.Object endpointDomain_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object endpointDomain_ = "";
     /**
      *
      *
@@ -1335,14 +1358,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         organizationId_ = "";
-
         deploymentId_ = "";
-
         buttonId_ = "";
-
         endpointDomain_ = "";
-
         return this;
       }
 
@@ -1376,14 +1396,30 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
         com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig.SalesforceLiveAgentConfig result =
             new com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig.SalesforceLiveAgentConfig(
                 this);
-        result.organizationId_ = organizationId_;
-        result.deploymentId_ = deploymentId_;
-        result.buttonId_ = buttonId_;
-        result.endpointDomain_ = endpointDomain_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig.SalesforceLiveAgentConfig result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.organizationId_ = organizationId_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.deploymentId_ = deploymentId_;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.buttonId_ = buttonId_;
+        }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.endpointDomain_ = endpointDomain_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1440,18 +1476,22 @@ public Builder mergeFrom(
                 .getDefaultInstance()) return this;
         if (!other.getOrganizationId().isEmpty()) {
           organizationId_ = other.organizationId_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getDeploymentId().isEmpty()) {
           deploymentId_ = other.deploymentId_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (!other.getButtonId().isEmpty()) {
           buttonId_ = other.buttonId_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
         if (!other.getEndpointDomain().isEmpty()) {
           endpointDomain_ = other.endpointDomain_;
+          bitField0_ |= 0x00000008;
           onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -1483,25 +1523,25 @@ public Builder mergeFrom(
               case 10:
                 {
                   organizationId_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
                 {
                   deploymentId_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 18
               case 26:
                 {
                   buttonId_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000004;
                   break;
                 } // case 26
               case 34:
                 {
                   endpointDomain_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000008;
                   break;
                 } // case 34
               default:
@@ -1521,6 +1561,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object organizationId_ = "";
       /**
        *
@@ -1582,8 +1624,8 @@ public Builder setOrganizationId(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         organizationId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1599,8 +1641,8 @@ public Builder setOrganizationId(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearOrganizationId() {
-
         organizationId_ = getDefaultInstance().getOrganizationId();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1621,8 +1663,8 @@ public Builder setOrganizationIdBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         organizationId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1688,8 +1730,8 @@ public Builder setDeploymentId(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         deploymentId_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1705,8 +1747,8 @@ public Builder setDeploymentId(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearDeploymentId() {
-
         deploymentId_ = getDefaultInstance().getDeploymentId();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1727,8 +1769,8 @@ public Builder setDeploymentIdBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         deploymentId_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1794,8 +1836,8 @@ public Builder setButtonId(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         buttonId_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1811,8 +1853,8 @@ public Builder setButtonId(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearButtonId() {
-
         buttonId_ = getDefaultInstance().getButtonId();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -1833,8 +1875,8 @@ public Builder setButtonIdBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         buttonId_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1909,8 +1951,8 @@ public Builder setEndpointDomain(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         endpointDomain_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -1929,8 +1971,8 @@ public Builder setEndpointDomain(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearEndpointDomain() {
-
         endpointDomain_ = getDefaultInstance().getEndpointDomain();
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
@@ -1954,8 +1996,8 @@ public Builder setEndpointDomainBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         endpointDomain_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -2443,6 +2485,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (livePersonConfigBuilder_ != null) {
         livePersonConfigBuilder_.clear();
       }
@@ -2478,25 +2521,29 @@ public com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig build() {
     public com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig buildPartial() {
       com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig result =
           new com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig(this);
-      if (agentServiceCase_ == 1) {
-        if (livePersonConfigBuilder_ == null) {
-          result.agentService_ = agentService_;
-        } else {
-          result.agentService_ = livePersonConfigBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (agentServiceCase_ == 2) {
-        if (salesforceLiveAgentConfigBuilder_ == null) {
-          result.agentService_ = agentService_;
-        } else {
-          result.agentService_ = salesforceLiveAgentConfigBuilder_.build();
-        }
-      }
-      result.agentServiceCase_ = agentServiceCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig result) {
+      int from_bitField0_ = bitField0_;
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig result) {
+      result.agentServiceCase_ = agentServiceCase_;
+      result.agentService_ = this.agentService_;
+      if (agentServiceCase_ == 1 && livePersonConfigBuilder_ != null) {
+        result.agentService_ = livePersonConfigBuilder_.build();
+      }
+      if (agentServiceCase_ == 2 && salesforceLiveAgentConfigBuilder_ != null) {
+        result.agentService_ = salesforceLiveAgentConfigBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -2630,6 +2677,8 @@ public Builder clearAgentService() {
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig.LivePersonConfig,
             com.google.cloud.dialogflow.v2.HumanAgentHandoffConfig.LivePersonConfig.Builder,
@@ -2871,7 +2920,6 @@ public Builder clearLivePersonConfig() {
       }
       agentServiceCase_ = 1;
       onChanged();
-      ;
       return livePersonConfigBuilder_;
     }
 
@@ -3124,7 +3172,6 @@ public Builder clearSalesforceLiveAgentConfig() {
       }
       agentServiceCase_ = 2;
       onChanged();
-      ;
       return salesforceLiveAgentConfigBuilder_;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportAgentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportAgentRequest.java
index 5b0087e21163..d4c6d9302e1f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportAgentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportAgentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Agents.ImportAgent][google.cloud.dialogflow.v2.Agents.ImportAgent].
+ * The request message for
+ * [Agents.ImportAgent][google.cloud.dialogflow.v2.Agents.ImportAgent].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ImportAgentRequest}
@@ -115,7 +116,9 @@ public AgentCase getAgentCase() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -492,7 +495,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Agents.ImportAgent][google.cloud.dialogflow.v2.Agents.ImportAgent].
+   * The request message for
+   * [Agents.ImportAgent][google.cloud.dialogflow.v2.Agents.ImportAgent].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ImportAgentRequest}
@@ -526,8 +530,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       agentCase_ = 0;
       agent_ = null;
       return this;
@@ -557,18 +561,26 @@ public com.google.cloud.dialogflow.v2.ImportAgentRequest build() {
     public com.google.cloud.dialogflow.v2.ImportAgentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ImportAgentRequest result =
           new com.google.cloud.dialogflow.v2.ImportAgentRequest(this);
-      result.parent_ = parent_;
-      if (agentCase_ == 2) {
-        result.agent_ = agent_;
-      }
-      if (agentCase_ == 3) {
-        result.agent_ = agent_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.agentCase_ = agentCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ImportAgentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2.ImportAgentRequest result) {
+      result.agentCase_ = agentCase_;
+      result.agent_ = this.agent_;
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -617,6 +629,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ImportAgentRequest other
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       switch (other.getAgentCase()) {
@@ -666,7 +679,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -713,6 +726,8 @@ public Builder clearAgent() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -783,8 +798,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -803,8 +818,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -828,8 +843,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportConversationDataOperationMetadata.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportConversationDataOperationMetadata.java
index edecee88c88d..4967ef6e56e3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportConversationDataOperationMetadata.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportConversationDataOperationMetadata.java
@@ -22,7 +22,9 @@
  *
  *
  * <pre>
- * Metadata for a [ConversationDatasets.ImportConversationData][google.cloud.dialogflow.v2.ConversationDatasets.ImportConversationData] operation.
+ * Metadata for a
+ * [ConversationDatasets.ImportConversationData][google.cloud.dialogflow.v2.ConversationDatasets.ImportConversationData]
+ * operation.
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata}
@@ -71,7 +73,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_DATASET_FIELD_NUMBER = 1;
-  private volatile java.lang.Object conversationDataset_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversationDataset_ = "";
   /**
    *
    *
@@ -124,6 +128,8 @@ public com.google.protobuf.ByteString getConversationDatasetBytes() {
   }
 
   public static final int PARTIAL_FAILURES_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.rpc.Status> partialFailures_;
   /**
    *
@@ -243,7 +249,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -436,7 +442,9 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Metadata for a [ConversationDatasets.ImportConversationData][google.cloud.dialogflow.v2.ConversationDatasets.ImportConversationData] operation.
+   * Metadata for a
+   * [ConversationDatasets.ImportConversationData][google.cloud.dialogflow.v2.ConversationDatasets.ImportConversationData]
+   * operation.
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata}
@@ -471,19 +479,18 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       conversationDataset_ = "";
-
       if (partialFailuresBuilder_ == null) {
         partialFailures_ = java.util.Collections.emptyList();
       } else {
         partialFailures_ = null;
         partialFailuresBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
       return this;
@@ -516,24 +523,36 @@ public com.google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata bu
     public com.google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata buildPartial() {
       com.google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata result =
           new com.google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata(this);
-      int from_bitField0_ = bitField0_;
-      result.conversationDataset_ = conversationDataset_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata result) {
       if (partialFailuresBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           partialFailures_ = java.util.Collections.unmodifiableList(partialFailures_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.partialFailures_ = partialFailures_;
       } else {
         result.partialFailures_ = partialFailuresBuilder_.build();
       }
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversationDataset_ = conversationDataset_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -587,13 +606,14 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getConversationDataset().isEmpty()) {
         conversationDataset_ = other.conversationDataset_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (partialFailuresBuilder_ == null) {
         if (!other.partialFailures_.isEmpty()) {
           if (partialFailures_.isEmpty()) {
             partialFailures_ = other.partialFailures_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensurePartialFailuresIsMutable();
             partialFailures_.addAll(other.partialFailures_);
@@ -606,7 +626,7 @@ public Builder mergeFrom(
             partialFailuresBuilder_.dispose();
             partialFailuresBuilder_ = null;
             partialFailures_ = other.partialFailures_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             partialFailuresBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getPartialFailuresFieldBuilder()
@@ -648,7 +668,7 @@ public Builder mergeFrom(
             case 10:
               {
                 conversationDataset_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -666,7 +686,7 @@ public Builder mergeFrom(
             case 26:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -755,8 +775,8 @@ public Builder setConversationDataset(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversationDataset_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -774,8 +794,8 @@ public Builder setConversationDataset(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationDataset() {
-
       conversationDataset_ = getDefaultInstance().getConversationDataset();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -798,8 +818,8 @@ public Builder setConversationDatasetBytes(com.google.protobuf.ByteString value)
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversationDataset_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -808,9 +828,9 @@ public Builder setConversationDatasetBytes(com.google.protobuf.ByteString value)
         java.util.Collections.emptyList();
 
     private void ensurePartialFailuresIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         partialFailures_ = new java.util.ArrayList<com.google.rpc.Status>(partialFailures_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -1032,7 +1052,7 @@ public Builder addAllPartialFailures(
     public Builder clearPartialFailures() {
       if (partialFailuresBuilder_ == null) {
         partialFailures_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         partialFailuresBuilder_.clear();
@@ -1159,7 +1179,7 @@ public java.util.List<com.google.rpc.Status.Builder> getPartialFailuresBuilderLi
                 com.google.rpc.Status.Builder,
                 com.google.rpc.StatusOrBuilder>(
                 partialFailures_,
-                ((bitField0_ & 0x00000001) != 0),
+                ((bitField0_ & 0x00000002) != 0),
                 getParentForChildren(),
                 isClean());
         partialFailures_ = null;
@@ -1186,7 +1206,7 @@ public java.util.List<com.google.rpc.Status.Builder> getPartialFailuresBuilderLi
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1225,11 +1245,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1245,11 +1265,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1264,17 +1284,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
         } else {
           createTime_ = value;
         }
-        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1288,14 +1309,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * <code>.google.protobuf.Timestamp create_time = 3;</code>
      */
     public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1309,7 +1329,7 @@ public Builder clearCreateTime() {
      * <code>.google.protobuf.Timestamp create_time = 3;</code>
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportConversationDataOperationResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportConversationDataOperationResponse.java
index ac144af47949..c27d6ee313d3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportConversationDataOperationResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportConversationDataOperationResponse.java
@@ -22,8 +22,9 @@
  *
  *
  * <pre>
- * Response used for [ConversationDatasets.ImportConversationData][google.cloud.dialogflow.v2.ConversationDatasets.ImportConversationData] long
- * running operation.
+ * Response used for
+ * [ConversationDatasets.ImportConversationData][google.cloud.dialogflow.v2.ConversationDatasets.ImportConversationData]
+ * long running operation.
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ImportConversationDataOperationResponse}
@@ -71,7 +72,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_DATASET_FIELD_NUMBER = 1;
-  private volatile java.lang.Object conversationDataset_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversationDataset_ = "";
   /**
    *
    *
@@ -124,7 +127,7 @@ public com.google.protobuf.ByteString getConversationDatasetBytes() {
   }
 
   public static final int IMPORT_COUNT_FIELD_NUMBER = 3;
-  private int importCount_;
+  private int importCount_ = 0;
   /**
    *
    *
@@ -315,8 +318,9 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Response used for [ConversationDatasets.ImportConversationData][google.cloud.dialogflow.v2.ConversationDatasets.ImportConversationData] long
-   * running operation.
+   * Response used for
+   * [ConversationDatasets.ImportConversationData][google.cloud.dialogflow.v2.ConversationDatasets.ImportConversationData]
+   * long running operation.
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ImportConversationDataOperationResponse}
@@ -351,10 +355,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       conversationDataset_ = "";
-
       importCount_ = 0;
-
       return this;
     }
 
@@ -385,12 +388,24 @@ public com.google.cloud.dialogflow.v2.ImportConversationDataOperationResponse bu
     public com.google.cloud.dialogflow.v2.ImportConversationDataOperationResponse buildPartial() {
       com.google.cloud.dialogflow.v2.ImportConversationDataOperationResponse result =
           new com.google.cloud.dialogflow.v2.ImportConversationDataOperationResponse(this);
-      result.conversationDataset_ = conversationDataset_;
-      result.importCount_ = importCount_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.ImportConversationDataOperationResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversationDataset_ = conversationDataset_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.importCount_ = importCount_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -442,6 +457,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getConversationDataset().isEmpty()) {
         conversationDataset_ = other.conversationDataset_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getImportCount() != 0) {
@@ -476,13 +492,13 @@ public Builder mergeFrom(
             case 10:
               {
                 conversationDataset_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 24:
               {
                 importCount_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 24
             default:
@@ -502,6 +518,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object conversationDataset_ = "";
     /**
      *
@@ -569,8 +587,8 @@ public Builder setConversationDataset(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversationDataset_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -588,8 +606,8 @@ public Builder setConversationDataset(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationDataset() {
-
       conversationDataset_ = getDefaultInstance().getConversationDataset();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -612,8 +630,8 @@ public Builder setConversationDatasetBytes(com.google.protobuf.ByteString value)
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversationDataset_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -649,6 +667,7 @@ public int getImportCount() {
     public Builder setImportCount(int value) {
 
       importCount_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -664,7 +683,7 @@ public Builder setImportCount(int value) {
      * @return This builder for chaining.
      */
     public Builder clearImportCount() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       importCount_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportConversationDataRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportConversationDataRequest.java
index 4efd985bfb8b..9bf42573b932 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportConversationDataRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportConversationDataRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [ConversationDatasets.ImportConversationData][google.cloud.dialogflow.v2.ConversationDatasets.ImportConversationData].
+ * The request message for
+ * [ConversationDatasets.ImportConversationData][google.cloud.dialogflow.v2.ConversationDatasets.ImportConversationData].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ImportConversationDataRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -175,7 +178,9 @@ public com.google.cloud.dialogflow.v2.InputConfig getInputConfig() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.InputConfigOrBuilder getInputConfigOrBuilder() {
-    return getInputConfig();
+    return inputConfig_ == null
+        ? com.google.cloud.dialogflow.v2.InputConfig.getDefaultInstance()
+        : inputConfig_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -356,7 +361,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [ConversationDatasets.ImportConversationData][google.cloud.dialogflow.v2.ConversationDatasets.ImportConversationData].
+   * The request message for
+   * [ConversationDatasets.ImportConversationData][google.cloud.dialogflow.v2.ConversationDatasets.ImportConversationData].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ImportConversationDataRequest}
@@ -390,12 +396,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
-      if (inputConfigBuilder_ == null) {
-        inputConfig_ = null;
-      } else {
-        inputConfig_ = null;
+      inputConfig_ = null;
+      if (inputConfigBuilder_ != null) {
+        inputConfigBuilder_.dispose();
         inputConfigBuilder_ = null;
       }
       return this;
@@ -426,16 +431,25 @@ public com.google.cloud.dialogflow.v2.ImportConversationDataRequest build() {
     public com.google.cloud.dialogflow.v2.ImportConversationDataRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ImportConversationDataRequest result =
           new com.google.cloud.dialogflow.v2.ImportConversationDataRequest(this);
-      result.name_ = name_;
-      if (inputConfigBuilder_ == null) {
-        result.inputConfig_ = inputConfig_;
-      } else {
-        result.inputConfig_ = inputConfigBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.ImportConversationDataRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.inputConfig_ =
+            inputConfigBuilder_ == null ? inputConfig_ : inputConfigBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -485,6 +499,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ImportConversationDataRe
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasInputConfig()) {
@@ -519,13 +534,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getInputConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -545,6 +560,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -618,8 +635,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -639,8 +656,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -665,8 +682,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -691,7 +708,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      * @return Whether the inputConfig field is set.
      */
     public boolean hasInputConfig() {
-      return inputConfigBuilder_ != null || inputConfig_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -732,11 +749,11 @@ public Builder setInputConfig(com.google.cloud.dialogflow.v2.InputConfig value)
           throw new NullPointerException();
         }
         inputConfig_ = value;
-        onChanged();
       } else {
         inputConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -754,11 +771,11 @@ public Builder setInputConfig(
         com.google.cloud.dialogflow.v2.InputConfig.Builder builderForValue) {
       if (inputConfigBuilder_ == null) {
         inputConfig_ = builderForValue.build();
-        onChanged();
       } else {
         inputConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -774,19 +791,18 @@ public Builder setInputConfig(
      */
     public Builder mergeInputConfig(com.google.cloud.dialogflow.v2.InputConfig value) {
       if (inputConfigBuilder_ == null) {
-        if (inputConfig_ != null) {
-          inputConfig_ =
-              com.google.cloud.dialogflow.v2.InputConfig.newBuilder(inputConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && inputConfig_ != null
+            && inputConfig_ != com.google.cloud.dialogflow.v2.InputConfig.getDefaultInstance()) {
+          getInputConfigBuilder().mergeFrom(value);
         } else {
           inputConfig_ = value;
         }
-        onChanged();
       } else {
         inputConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -801,14 +817,13 @@ public Builder mergeInputConfig(com.google.cloud.dialogflow.v2.InputConfig value
      * </code>
      */
     public Builder clearInputConfig() {
-      if (inputConfigBuilder_ == null) {
-        inputConfig_ = null;
-        onChanged();
-      } else {
-        inputConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      inputConfig_ = null;
+      if (inputConfigBuilder_ != null) {
+        inputConfigBuilder_.dispose();
         inputConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -823,7 +838,7 @@ public Builder clearInputConfig() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.InputConfig.Builder getInputConfigBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getInputConfigFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportDocumentTemplate.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportDocumentTemplate.java
index d0d6a066364c..6c7191b11d5f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportDocumentTemplate.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportDocumentTemplate.java
@@ -80,7 +80,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   }
 
   public static final int MIME_TYPE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object mimeType_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object mimeType_ = "";
   /**
    *
    *
@@ -129,7 +131,10 @@ public com.google.protobuf.ByteString getMimeTypeBytes() {
   }
 
   public static final int KNOWLEDGE_TYPES_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<java.lang.Integer> knowledgeTypes_;
+
   private static final com.google.protobuf.Internal.ListAdapter.Converter<
           java.lang.Integer, com.google.cloud.dialogflow.v2.Document.KnowledgeType>
       knowledgeTypes_converter_ =
@@ -137,9 +142,8 @@ public com.google.protobuf.ByteString getMimeTypeBytes() {
               java.lang.Integer, com.google.cloud.dialogflow.v2.Document.KnowledgeType>() {
             public com.google.cloud.dialogflow.v2.Document.KnowledgeType convert(
                 java.lang.Integer from) {
-              @SuppressWarnings("deprecation")
               com.google.cloud.dialogflow.v2.Document.KnowledgeType result =
-                  com.google.cloud.dialogflow.v2.Document.KnowledgeType.valueOf(from);
+                  com.google.cloud.dialogflow.v2.Document.KnowledgeType.forNumber(from);
               return result == null
                   ? com.google.cloud.dialogflow.v2.Document.KnowledgeType.UNRECOGNIZED
                   : result;
@@ -251,6 +255,7 @@ private static final class MetadataDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> metadata_;
 
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> internalGetMetadata() {
@@ -317,8 +322,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
    * <code>map&lt;string, string&gt; metadata = 3;</code>
    */
   @java.lang.Override
-  public java.lang.String getMetadataOrDefault(
-      java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getMetadataOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -610,10 +617,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       mimeType_ = "";
-
       knowledgeTypes_ = java.util.Collections.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       internalGetMutableMetadata().clear();
       return this;
     }
@@ -642,19 +649,34 @@ public com.google.cloud.dialogflow.v2.ImportDocumentTemplate build() {
     public com.google.cloud.dialogflow.v2.ImportDocumentTemplate buildPartial() {
       com.google.cloud.dialogflow.v2.ImportDocumentTemplate result =
           new com.google.cloud.dialogflow.v2.ImportDocumentTemplate(this);
-      int from_bitField0_ = bitField0_;
-      result.mimeType_ = mimeType_;
-      if (((bitField0_ & 0x00000001) != 0)) {
-        knowledgeTypes_ = java.util.Collections.unmodifiableList(knowledgeTypes_);
-        bitField0_ = (bitField0_ & ~0x00000001);
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.knowledgeTypes_ = knowledgeTypes_;
-      result.metadata_ = internalGetMetadata();
-      result.metadata_.makeImmutable();
       onBuilt();
       return result;
     }
 
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.ImportDocumentTemplate result) {
+      if (((bitField0_ & 0x00000002) != 0)) {
+        knowledgeTypes_ = java.util.Collections.unmodifiableList(knowledgeTypes_);
+        bitField0_ = (bitField0_ & ~0x00000002);
+      }
+      result.knowledgeTypes_ = knowledgeTypes_;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ImportDocumentTemplate result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.mimeType_ = mimeType_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.metadata_ = internalGetMetadata();
+        result.metadata_.makeImmutable();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -703,12 +725,13 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ImportDocumentTemplate o
         return this;
       if (!other.getMimeType().isEmpty()) {
         mimeType_ = other.mimeType_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.knowledgeTypes_.isEmpty()) {
         if (knowledgeTypes_.isEmpty()) {
           knowledgeTypes_ = other.knowledgeTypes_;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureKnowledgeTypesIsMutable();
           knowledgeTypes_.addAll(other.knowledgeTypes_);
@@ -716,6 +739,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ImportDocumentTemplate o
         onChanged();
       }
       internalGetMutableMetadata().mergeFrom(other.internalGetMetadata());
+      bitField0_ |= 0x00000004;
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -745,7 +769,7 @@ public Builder mergeFrom(
             case 10:
               {
                 mimeType_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
@@ -776,6 +800,7 @@ public Builder mergeFrom(
                 internalGetMutableMetadata()
                     .getMutableMap()
                     .put(metadata__.getKey(), metadata__.getValue());
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -858,8 +883,8 @@ public Builder setMimeType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       mimeType_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -875,8 +900,8 @@ public Builder setMimeType(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearMimeType() {
-
       mimeType_ = getDefaultInstance().getMimeType();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -897,8 +922,8 @@ public Builder setMimeTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       mimeType_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -906,9 +931,9 @@ public Builder setMimeTypeBytes(com.google.protobuf.ByteString value) {
     private java.util.List<java.lang.Integer> knowledgeTypes_ = java.util.Collections.emptyList();
 
     private void ensureKnowledgeTypesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         knowledgeTypes_ = new java.util.ArrayList<java.lang.Integer>(knowledgeTypes_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
     /**
@@ -1050,7 +1075,7 @@ public Builder addAllKnowledgeTypes(
      */
     public Builder clearKnowledgeTypes() {
       knowledgeTypes_ = java.util.Collections.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1162,8 +1187,6 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
         internalGetMutableMetadata() {
-      onChanged();
-      ;
       if (metadata_ == null) {
         metadata_ =
             com.google.protobuf.MapField.newMapField(MetadataDefaultEntryHolder.defaultEntry);
@@ -1171,6 +1194,8 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
       if (!metadata_.isMutable()) {
         metadata_ = metadata_.copy();
       }
+      bitField0_ |= 0x00000004;
+      onChanged();
       return metadata_;
     }
 
@@ -1231,8 +1256,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
      * <code>map&lt;string, string&gt; metadata = 3;</code>
      */
     @java.lang.Override
-    public java.lang.String getMetadataOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getMetadataOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1264,6 +1291,7 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
     }
 
     public Builder clearMetadata() {
+      bitField0_ = (bitField0_ & ~0x00000004);
       internalGetMutableMetadata().getMutableMap().clear();
       return this;
     }
@@ -1289,6 +1317,7 @@ public Builder removeMetadata(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMutableMetadata() {
+      bitField0_ |= 0x00000004;
       return internalGetMutableMetadata().getMutableMap();
     }
     /**
@@ -1310,8 +1339,8 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableMetadata().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000004;
       return this;
     }
     /**
@@ -1328,6 +1357,7 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllMetadata(java.util.Map<java.lang.String, java.lang.String> values) {
       internalGetMutableMetadata().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000004;
       return this;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportDocumentTemplateOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportDocumentTemplateOrBuilder.java
index acc02b63b559..3a03c64c675f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportDocumentTemplateOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportDocumentTemplateOrBuilder.java
@@ -175,7 +175,6 @@ public interface ImportDocumentTemplateOrBuilder
    *
    * <code>map&lt;string, string&gt; metadata = 3;</code>
    */
-
   /* nullable */
   java.lang.String getMetadataOrDefault(
       java.lang.String key,
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportDocumentsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportDocumentsRequest.java
index daccdd100030..69deca1b486d 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportDocumentsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportDocumentsRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * Request message for [Documents.ImportDocuments][google.cloud.dialogflow.v2.Documents.ImportDocuments].
+ * Request message for
+ * [Documents.ImportDocuments][google.cloud.dialogflow.v2.Documents.ImportDocuments].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ImportDocumentsRequest}
@@ -112,7 +113,9 @@ public SourceCase getSourceCase() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -283,11 +286,13 @@ public com.google.cloud.dialogflow.v2.ImportDocumentTemplate getDocumentTemplate
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.ImportDocumentTemplateOrBuilder
       getDocumentTemplateOrBuilder() {
-    return getDocumentTemplate();
+    return documentTemplate_ == null
+        ? com.google.cloud.dialogflow.v2.ImportDocumentTemplate.getDefaultInstance()
+        : documentTemplate_;
   }
 
   public static final int IMPORT_GCS_CUSTOM_METADATA_FIELD_NUMBER = 4;
-  private boolean importGcsCustomMetadata_;
+  private boolean importGcsCustomMetadata_ = false;
   /**
    *
    *
@@ -516,7 +521,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Request message for [Documents.ImportDocuments][google.cloud.dialogflow.v2.Documents.ImportDocuments].
+   * Request message for
+   * [Documents.ImportDocuments][google.cloud.dialogflow.v2.Documents.ImportDocuments].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ImportDocumentsRequest}
@@ -550,19 +556,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       if (gcsSourceBuilder_ != null) {
         gcsSourceBuilder_.clear();
       }
-      if (documentTemplateBuilder_ == null) {
-        documentTemplate_ = null;
-      } else {
-        documentTemplate_ = null;
+      documentTemplate_ = null;
+      if (documentTemplateBuilder_ != null) {
+        documentTemplateBuilder_.dispose();
         documentTemplateBuilder_ = null;
       }
       importGcsCustomMetadata_ = false;
-
       sourceCase_ = 0;
       source_ = null;
       return this;
@@ -592,25 +596,36 @@ public com.google.cloud.dialogflow.v2.ImportDocumentsRequest build() {
     public com.google.cloud.dialogflow.v2.ImportDocumentsRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ImportDocumentsRequest result =
           new com.google.cloud.dialogflow.v2.ImportDocumentsRequest(this);
-      result.parent_ = parent_;
-      if (sourceCase_ == 2) {
-        if (gcsSourceBuilder_ == null) {
-          result.source_ = source_;
-        } else {
-          result.source_ = gcsSourceBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (documentTemplateBuilder_ == null) {
-        result.documentTemplate_ = documentTemplate_;
-      } else {
-        result.documentTemplate_ = documentTemplateBuilder_.build();
-      }
-      result.importGcsCustomMetadata_ = importGcsCustomMetadata_;
-      result.sourceCase_ = sourceCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ImportDocumentsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.documentTemplate_ =
+            documentTemplateBuilder_ == null ? documentTemplate_ : documentTemplateBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.importGcsCustomMetadata_ = importGcsCustomMetadata_;
+      }
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2.ImportDocumentsRequest result) {
+      result.sourceCase_ = sourceCase_;
+      result.source_ = this.source_;
+      if (sourceCase_ == 2 && gcsSourceBuilder_ != null) {
+        result.source_ = gcsSourceBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -659,6 +674,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ImportDocumentsRequest o
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasDocumentTemplate()) {
@@ -707,7 +723,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -720,13 +736,13 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getDocumentTemplateFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 32:
               {
                 importGcsCustomMetadata_ = input.readBool();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 32
             default:
@@ -760,6 +776,8 @@ public Builder clearSource() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -833,8 +851,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -854,8 +872,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -880,8 +898,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1127,7 +1145,6 @@ public com.google.cloud.dialogflow.v2.GcsSourcesOrBuilder getGcsSourceOrBuilder(
       }
       sourceCase_ = 2;
       onChanged();
-      ;
       return gcsSourceBuilder_;
     }
 
@@ -1151,7 +1168,7 @@ public com.google.cloud.dialogflow.v2.GcsSourcesOrBuilder getGcsSourceOrBuilder(
      * @return Whether the documentTemplate field is set.
      */
     public boolean hasDocumentTemplate() {
-      return documentTemplateBuilder_ != null || documentTemplate_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1193,11 +1210,11 @@ public Builder setDocumentTemplate(
           throw new NullPointerException();
         }
         documentTemplate_ = value;
-        onChanged();
       } else {
         documentTemplateBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1215,11 +1232,11 @@ public Builder setDocumentTemplate(
         com.google.cloud.dialogflow.v2.ImportDocumentTemplate.Builder builderForValue) {
       if (documentTemplateBuilder_ == null) {
         documentTemplate_ = builderForValue.build();
-        onChanged();
       } else {
         documentTemplateBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1236,19 +1253,19 @@ public Builder setDocumentTemplate(
     public Builder mergeDocumentTemplate(
         com.google.cloud.dialogflow.v2.ImportDocumentTemplate value) {
       if (documentTemplateBuilder_ == null) {
-        if (documentTemplate_ != null) {
-          documentTemplate_ =
-              com.google.cloud.dialogflow.v2.ImportDocumentTemplate.newBuilder(documentTemplate_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && documentTemplate_ != null
+            && documentTemplate_
+                != com.google.cloud.dialogflow.v2.ImportDocumentTemplate.getDefaultInstance()) {
+          getDocumentTemplateBuilder().mergeFrom(value);
         } else {
           documentTemplate_ = value;
         }
-        onChanged();
       } else {
         documentTemplateBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1263,14 +1280,13 @@ public Builder mergeDocumentTemplate(
      * </code>
      */
     public Builder clearDocumentTemplate() {
-      if (documentTemplateBuilder_ == null) {
-        documentTemplate_ = null;
-        onChanged();
-      } else {
-        documentTemplate_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      documentTemplate_ = null;
+      if (documentTemplateBuilder_ != null) {
+        documentTemplateBuilder_.dispose();
         documentTemplateBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1286,7 +1302,7 @@ public Builder clearDocumentTemplate() {
      */
     public com.google.cloud.dialogflow.v2.ImportDocumentTemplate.Builder
         getDocumentTemplateBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getDocumentTemplateFieldBuilder().getBuilder();
     }
@@ -1372,6 +1388,7 @@ public boolean getImportGcsCustomMetadata() {
     public Builder setImportGcsCustomMetadata(boolean value) {
 
       importGcsCustomMetadata_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1388,7 +1405,7 @@ public Builder setImportGcsCustomMetadata(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearImportGcsCustomMetadata() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       importGcsCustomMetadata_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportDocumentsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportDocumentsResponse.java
index 4fa626c8447b..f29bc7677041 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportDocumentsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportDocumentsResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * Response message for [Documents.ImportDocuments][google.cloud.dialogflow.v2.Documents.ImportDocuments].
+ * Response message for
+ * [Documents.ImportDocuments][google.cloud.dialogflow.v2.Documents.ImportDocuments].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ImportDocumentsResponse}
@@ -68,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int WARNINGS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.rpc.Status> warnings_;
   /**
    *
@@ -301,7 +304,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Response message for [Documents.ImportDocuments][google.cloud.dialogflow.v2.Documents.ImportDocuments].
+   * Response message for
+   * [Documents.ImportDocuments][google.cloud.dialogflow.v2.Documents.ImportDocuments].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ImportDocumentsResponse}
@@ -335,6 +339,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (warningsBuilder_ == null) {
         warnings_ = java.util.Collections.emptyList();
       } else {
@@ -369,7 +374,16 @@ public com.google.cloud.dialogflow.v2.ImportDocumentsResponse build() {
     public com.google.cloud.dialogflow.v2.ImportDocumentsResponse buildPartial() {
       com.google.cloud.dialogflow.v2.ImportDocumentsResponse result =
           new com.google.cloud.dialogflow.v2.ImportDocumentsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.ImportDocumentsResponse result) {
       if (warningsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           warnings_ = java.util.Collections.unmodifiableList(warnings_);
@@ -379,8 +393,10 @@ public com.google.cloud.dialogflow.v2.ImportDocumentsResponse buildPartial() {
       } else {
         result.warnings_ = warningsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ImportDocumentsResponse result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputAudioConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputAudioConfig.java
index e57fbf6b148b..71d585c9f694 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputAudioConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputAudioConfig.java
@@ -73,7 +73,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int AUDIO_ENCODING_FIELD_NUMBER = 1;
-  private int audioEncoding_;
+  private int audioEncoding_ = 0;
   /**
    *
    *
@@ -102,14 +102,13 @@ public int getAudioEncodingValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.AudioEncoding getAudioEncoding() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.AudioEncoding result =
-        com.google.cloud.dialogflow.v2.AudioEncoding.valueOf(audioEncoding_);
+        com.google.cloud.dialogflow.v2.AudioEncoding.forNumber(audioEncoding_);
     return result == null ? com.google.cloud.dialogflow.v2.AudioEncoding.UNRECOGNIZED : result;
   }
 
   public static final int SAMPLE_RATE_HERTZ_FIELD_NUMBER = 2;
-  private int sampleRateHertz_;
+  private int sampleRateHertz_ = 0;
   /**
    *
    *
@@ -131,7 +130,9 @@ public int getSampleRateHertz() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -188,15 +189,17 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
   }
 
   public static final int ENABLE_WORD_INFO_FIELD_NUMBER = 13;
-  private boolean enableWordInfo_;
+  private boolean enableWordInfo_ = false;
   /**
    *
    *
    * <pre>
-   * If `true`, Dialogflow returns [SpeechWordInfo][google.cloud.dialogflow.v2.SpeechWordInfo] in
-   * [StreamingRecognitionResult][google.cloud.dialogflow.v2.StreamingRecognitionResult] with information about the recognized speech
-   * words, e.g. start and end time offsets. If false or unspecified, Speech
-   * doesn't return any word-level information.
+   * If `true`, Dialogflow returns
+   * [SpeechWordInfo][google.cloud.dialogflow.v2.SpeechWordInfo] in
+   * [StreamingRecognitionResult][google.cloud.dialogflow.v2.StreamingRecognitionResult]
+   * with information about the recognized speech words, e.g. start and end time
+   * offsets. If false or unspecified, Speech doesn't return any word-level
+   * information.
    * </pre>
    *
    * <code>bool enable_word_info = 13;</code>
@@ -209,6 +212,8 @@ public boolean getEnableWordInfo() {
   }
 
   public static final int PHRASE_HINTS_FIELD_NUMBER = 4;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList phraseHints_;
   /**
    *
@@ -227,7 +232,7 @@ public boolean getEnableWordInfo() {
    * <code>repeated string phrase_hints = 4 [deprecated = true];</code>
    *
    * @deprecated google.cloud.dialogflow.v2.InputAudioConfig.phrase_hints is deprecated. See
-   *     google/cloud/dialogflow/v2/audio_config.proto;l=220
+   *     google/cloud/dialogflow/v2/audio_config.proto;l=223
    * @return A list containing the phraseHints.
    */
   @java.lang.Deprecated
@@ -251,7 +256,7 @@ public com.google.protobuf.ProtocolStringList getPhraseHintsList() {
    * <code>repeated string phrase_hints = 4 [deprecated = true];</code>
    *
    * @deprecated google.cloud.dialogflow.v2.InputAudioConfig.phrase_hints is deprecated. See
-   *     google/cloud/dialogflow/v2/audio_config.proto;l=220
+   *     google/cloud/dialogflow/v2/audio_config.proto;l=223
    * @return The count of phraseHints.
    */
   @java.lang.Deprecated
@@ -275,7 +280,7 @@ public int getPhraseHintsCount() {
    * <code>repeated string phrase_hints = 4 [deprecated = true];</code>
    *
    * @deprecated google.cloud.dialogflow.v2.InputAudioConfig.phrase_hints is deprecated. See
-   *     google/cloud/dialogflow/v2/audio_config.proto;l=220
+   *     google/cloud/dialogflow/v2/audio_config.proto;l=223
    * @param index The index of the element to return.
    * @return The phraseHints at the given index.
    */
@@ -300,7 +305,7 @@ public java.lang.String getPhraseHints(int index) {
    * <code>repeated string phrase_hints = 4 [deprecated = true];</code>
    *
    * @deprecated google.cloud.dialogflow.v2.InputAudioConfig.phrase_hints is deprecated. See
-   *     google/cloud/dialogflow/v2/audio_config.proto;l=220
+   *     google/cloud/dialogflow/v2/audio_config.proto;l=223
    * @param index The index of the value to return.
    * @return The bytes of the phraseHints at the given index.
    */
@@ -310,6 +315,8 @@ public com.google.protobuf.ByteString getPhraseHintsBytes(int index) {
   }
 
   public static final int SPEECH_CONTEXTS_FIELD_NUMBER = 11;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.SpeechContext> speechContexts_;
   /**
    *
@@ -395,7 +402,9 @@ public com.google.cloud.dialogflow.v2.SpeechContextOrBuilder getSpeechContextsOr
   }
 
   public static final int MODEL_FIELD_NUMBER = 7;
-  private volatile java.lang.Object model_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object model_ = "";
   /**
    *
    *
@@ -464,12 +473,13 @@ public com.google.protobuf.ByteString getModelBytes() {
   }
 
   public static final int MODEL_VARIANT_FIELD_NUMBER = 10;
-  private int modelVariant_;
+  private int modelVariant_ = 0;
   /**
    *
    *
    * <pre>
-   * Which variant of the [Speech model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
+   * Which variant of the [Speech
+   * model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.SpeechModelVariant model_variant = 10;</code>
@@ -484,7 +494,8 @@ public int getModelVariantValue() {
    *
    *
    * <pre>
-   * Which variant of the [Speech model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
+   * Which variant of the [Speech
+   * model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.SpeechModelVariant model_variant = 10;</code>
@@ -493,14 +504,13 @@ public int getModelVariantValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.SpeechModelVariant getModelVariant() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.SpeechModelVariant result =
-        com.google.cloud.dialogflow.v2.SpeechModelVariant.valueOf(modelVariant_);
+        com.google.cloud.dialogflow.v2.SpeechModelVariant.forNumber(modelVariant_);
     return result == null ? com.google.cloud.dialogflow.v2.SpeechModelVariant.UNRECOGNIZED : result;
   }
 
   public static final int SINGLE_UTTERANCE_FIELD_NUMBER = 8;
-  private boolean singleUtterance_;
+  private boolean singleUtterance_ = false;
   /**
    *
    *
@@ -527,12 +537,14 @@ public boolean getSingleUtterance() {
   }
 
   public static final int DISABLE_NO_SPEECH_RECOGNIZED_EVENT_FIELD_NUMBER = 14;
-  private boolean disableNoSpeechRecognizedEvent_;
+  private boolean disableNoSpeechRecognizedEvent_ = false;
   /**
    *
    *
    * <pre>
-   * Only used in [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent] and
+   * Only used in
+   * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent]
+   * and
    * [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent].
    * If `false` and recognition doesn't return any result, trigger
    * `NO_SPEECH_RECOGNIZED` event to Dialogflow agent.
@@ -844,31 +856,24 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       audioEncoding_ = 0;
-
       sampleRateHertz_ = 0;
-
       languageCode_ = "";
-
       enableWordInfo_ = false;
-
       phraseHints_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000010);
       if (speechContextsBuilder_ == null) {
         speechContexts_ = java.util.Collections.emptyList();
       } else {
         speechContexts_ = null;
         speechContextsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000020);
       model_ = "";
-
       modelVariant_ = 0;
-
       singleUtterance_ = false;
-
       disableNoSpeechRecognizedEvent_ = false;
-
       return this;
     }
 
@@ -896,31 +901,58 @@ public com.google.cloud.dialogflow.v2.InputAudioConfig build() {
     public com.google.cloud.dialogflow.v2.InputAudioConfig buildPartial() {
       com.google.cloud.dialogflow.v2.InputAudioConfig result =
           new com.google.cloud.dialogflow.v2.InputAudioConfig(this);
-      int from_bitField0_ = bitField0_;
-      result.audioEncoding_ = audioEncoding_;
-      result.sampleRateHertz_ = sampleRateHertz_;
-      result.languageCode_ = languageCode_;
-      result.enableWordInfo_ = enableWordInfo_;
-      if (((bitField0_ & 0x00000001) != 0)) {
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.InputAudioConfig result) {
+      if (((bitField0_ & 0x00000010) != 0)) {
         phraseHints_ = phraseHints_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000010);
       }
       result.phraseHints_ = phraseHints_;
       if (speechContextsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000020) != 0)) {
           speechContexts_ = java.util.Collections.unmodifiableList(speechContexts_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000020);
         }
         result.speechContexts_ = speechContexts_;
       } else {
         result.speechContexts_ = speechContextsBuilder_.build();
       }
-      result.model_ = model_;
-      result.modelVariant_ = modelVariant_;
-      result.singleUtterance_ = singleUtterance_;
-      result.disableNoSpeechRecognizedEvent_ = disableNoSpeechRecognizedEvent_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.InputAudioConfig result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.audioEncoding_ = audioEncoding_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.sampleRateHertz_ = sampleRateHertz_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.enableWordInfo_ = enableWordInfo_;
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.model_ = model_;
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.modelVariant_ = modelVariant_;
+      }
+      if (((from_bitField0_ & 0x00000100) != 0)) {
+        result.singleUtterance_ = singleUtterance_;
+      }
+      if (((from_bitField0_ & 0x00000200) != 0)) {
+        result.disableNoSpeechRecognizedEvent_ = disableNoSpeechRecognizedEvent_;
+      }
     }
 
     @java.lang.Override
@@ -977,6 +1009,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.InputAudioConfig other)
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.getEnableWordInfo() != false) {
@@ -985,7 +1018,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.InputAudioConfig other)
       if (!other.phraseHints_.isEmpty()) {
         if (phraseHints_.isEmpty()) {
           phraseHints_ = other.phraseHints_;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000010);
         } else {
           ensurePhraseHintsIsMutable();
           phraseHints_.addAll(other.phraseHints_);
@@ -996,7 +1029,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.InputAudioConfig other)
         if (!other.speechContexts_.isEmpty()) {
           if (speechContexts_.isEmpty()) {
             speechContexts_ = other.speechContexts_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000020);
           } else {
             ensureSpeechContextsIsMutable();
             speechContexts_.addAll(other.speechContexts_);
@@ -1009,7 +1042,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.InputAudioConfig other)
             speechContextsBuilder_.dispose();
             speechContextsBuilder_ = null;
             speechContexts_ = other.speechContexts_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000020);
             speechContextsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getSpeechContextsFieldBuilder()
@@ -1021,6 +1054,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.InputAudioConfig other)
       }
       if (!other.getModel().isEmpty()) {
         model_ = other.model_;
+        bitField0_ |= 0x00000040;
         onChanged();
       }
       if (other.modelVariant_ != 0) {
@@ -1061,19 +1095,19 @@ public Builder mergeFrom(
             case 8:
               {
                 audioEncoding_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 16:
               {
                 sampleRateHertz_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
@@ -1086,19 +1120,19 @@ public Builder mergeFrom(
             case 58:
               {
                 model_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 58
             case 64:
               {
                 singleUtterance_ = input.readBool();
-
+                bitField0_ |= 0x00000100;
                 break;
               } // case 64
             case 80:
               {
                 modelVariant_ = input.readEnum();
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 80
             case 90:
@@ -1117,13 +1151,13 @@ public Builder mergeFrom(
             case 104:
               {
                 enableWordInfo_ = input.readBool();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 104
             case 112:
               {
                 disableNoSpeechRecognizedEvent_ = input.readBool();
-
+                bitField0_ |= 0x00000200;
                 break;
               } // case 112
             default:
@@ -1174,8 +1208,8 @@ public int getAudioEncodingValue() {
      * @return This builder for chaining.
      */
     public Builder setAudioEncodingValue(int value) {
-
       audioEncoding_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1192,9 +1226,8 @@ public Builder setAudioEncodingValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.AudioEncoding getAudioEncoding() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.AudioEncoding result =
-          com.google.cloud.dialogflow.v2.AudioEncoding.valueOf(audioEncoding_);
+          com.google.cloud.dialogflow.v2.AudioEncoding.forNumber(audioEncoding_);
       return result == null ? com.google.cloud.dialogflow.v2.AudioEncoding.UNRECOGNIZED : result;
     }
     /**
@@ -1213,7 +1246,7 @@ public Builder setAudioEncoding(com.google.cloud.dialogflow.v2.AudioEncoding val
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       audioEncoding_ = value.getNumber();
       onChanged();
       return this;
@@ -1230,7 +1263,7 @@ public Builder setAudioEncoding(com.google.cloud.dialogflow.v2.AudioEncoding val
      * @return This builder for chaining.
      */
     public Builder clearAudioEncoding() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       audioEncoding_ = 0;
       onChanged();
       return this;
@@ -1275,6 +1308,7 @@ public int getSampleRateHertz() {
     public Builder setSampleRateHertz(int value) {
 
       sampleRateHertz_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1294,7 +1328,7 @@ public Builder setSampleRateHertz(int value) {
      * @return This builder for chaining.
      */
     public Builder clearSampleRateHertz() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       sampleRateHertz_ = 0;
       onChanged();
       return this;
@@ -1373,8 +1407,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1394,8 +1428,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1420,8 +1454,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1431,10 +1465,12 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
      *
      *
      * <pre>
-     * If `true`, Dialogflow returns [SpeechWordInfo][google.cloud.dialogflow.v2.SpeechWordInfo] in
-     * [StreamingRecognitionResult][google.cloud.dialogflow.v2.StreamingRecognitionResult] with information about the recognized speech
-     * words, e.g. start and end time offsets. If false or unspecified, Speech
-     * doesn't return any word-level information.
+     * If `true`, Dialogflow returns
+     * [SpeechWordInfo][google.cloud.dialogflow.v2.SpeechWordInfo] in
+     * [StreamingRecognitionResult][google.cloud.dialogflow.v2.StreamingRecognitionResult]
+     * with information about the recognized speech words, e.g. start and end time
+     * offsets. If false or unspecified, Speech doesn't return any word-level
+     * information.
      * </pre>
      *
      * <code>bool enable_word_info = 13;</code>
@@ -1449,10 +1485,12 @@ public boolean getEnableWordInfo() {
      *
      *
      * <pre>
-     * If `true`, Dialogflow returns [SpeechWordInfo][google.cloud.dialogflow.v2.SpeechWordInfo] in
-     * [StreamingRecognitionResult][google.cloud.dialogflow.v2.StreamingRecognitionResult] with information about the recognized speech
-     * words, e.g. start and end time offsets. If false or unspecified, Speech
-     * doesn't return any word-level information.
+     * If `true`, Dialogflow returns
+     * [SpeechWordInfo][google.cloud.dialogflow.v2.SpeechWordInfo] in
+     * [StreamingRecognitionResult][google.cloud.dialogflow.v2.StreamingRecognitionResult]
+     * with information about the recognized speech words, e.g. start and end time
+     * offsets. If false or unspecified, Speech doesn't return any word-level
+     * information.
      * </pre>
      *
      * <code>bool enable_word_info = 13;</code>
@@ -1463,6 +1501,7 @@ public boolean getEnableWordInfo() {
     public Builder setEnableWordInfo(boolean value) {
 
       enableWordInfo_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1470,10 +1509,12 @@ public Builder setEnableWordInfo(boolean value) {
      *
      *
      * <pre>
-     * If `true`, Dialogflow returns [SpeechWordInfo][google.cloud.dialogflow.v2.SpeechWordInfo] in
-     * [StreamingRecognitionResult][google.cloud.dialogflow.v2.StreamingRecognitionResult] with information about the recognized speech
-     * words, e.g. start and end time offsets. If false or unspecified, Speech
-     * doesn't return any word-level information.
+     * If `true`, Dialogflow returns
+     * [SpeechWordInfo][google.cloud.dialogflow.v2.SpeechWordInfo] in
+     * [StreamingRecognitionResult][google.cloud.dialogflow.v2.StreamingRecognitionResult]
+     * with information about the recognized speech words, e.g. start and end time
+     * offsets. If false or unspecified, Speech doesn't return any word-level
+     * information.
      * </pre>
      *
      * <code>bool enable_word_info = 13;</code>
@@ -1481,7 +1522,7 @@ public Builder setEnableWordInfo(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearEnableWordInfo() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       enableWordInfo_ = false;
       onChanged();
       return this;
@@ -1491,9 +1532,9 @@ public Builder clearEnableWordInfo() {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensurePhraseHintsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         phraseHints_ = new com.google.protobuf.LazyStringArrayList(phraseHints_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000010;
       }
     }
     /**
@@ -1513,7 +1554,7 @@ private void ensurePhraseHintsIsMutable() {
      * <code>repeated string phrase_hints = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.dialogflow.v2.InputAudioConfig.phrase_hints is deprecated. See
-     *     google/cloud/dialogflow/v2/audio_config.proto;l=220
+     *     google/cloud/dialogflow/v2/audio_config.proto;l=223
      * @return A list containing the phraseHints.
      */
     @java.lang.Deprecated
@@ -1537,7 +1578,7 @@ public com.google.protobuf.ProtocolStringList getPhraseHintsList() {
      * <code>repeated string phrase_hints = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.dialogflow.v2.InputAudioConfig.phrase_hints is deprecated. See
-     *     google/cloud/dialogflow/v2/audio_config.proto;l=220
+     *     google/cloud/dialogflow/v2/audio_config.proto;l=223
      * @return The count of phraseHints.
      */
     @java.lang.Deprecated
@@ -1561,7 +1602,7 @@ public int getPhraseHintsCount() {
      * <code>repeated string phrase_hints = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.dialogflow.v2.InputAudioConfig.phrase_hints is deprecated. See
-     *     google/cloud/dialogflow/v2/audio_config.proto;l=220
+     *     google/cloud/dialogflow/v2/audio_config.proto;l=223
      * @param index The index of the element to return.
      * @return The phraseHints at the given index.
      */
@@ -1586,7 +1627,7 @@ public java.lang.String getPhraseHints(int index) {
      * <code>repeated string phrase_hints = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.dialogflow.v2.InputAudioConfig.phrase_hints is deprecated. See
-     *     google/cloud/dialogflow/v2/audio_config.proto;l=220
+     *     google/cloud/dialogflow/v2/audio_config.proto;l=223
      * @param index The index of the value to return.
      * @return The bytes of the phraseHints at the given index.
      */
@@ -1611,7 +1652,7 @@ public com.google.protobuf.ByteString getPhraseHintsBytes(int index) {
      * <code>repeated string phrase_hints = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.dialogflow.v2.InputAudioConfig.phrase_hints is deprecated. See
-     *     google/cloud/dialogflow/v2/audio_config.proto;l=220
+     *     google/cloud/dialogflow/v2/audio_config.proto;l=223
      * @param index The index to set the value at.
      * @param value The phraseHints to set.
      * @return This builder for chaining.
@@ -1643,7 +1684,7 @@ public Builder setPhraseHints(int index, java.lang.String value) {
      * <code>repeated string phrase_hints = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.dialogflow.v2.InputAudioConfig.phrase_hints is deprecated. See
-     *     google/cloud/dialogflow/v2/audio_config.proto;l=220
+     *     google/cloud/dialogflow/v2/audio_config.proto;l=223
      * @param value The phraseHints to add.
      * @return This builder for chaining.
      */
@@ -1674,7 +1715,7 @@ public Builder addPhraseHints(java.lang.String value) {
      * <code>repeated string phrase_hints = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.dialogflow.v2.InputAudioConfig.phrase_hints is deprecated. See
-     *     google/cloud/dialogflow/v2/audio_config.proto;l=220
+     *     google/cloud/dialogflow/v2/audio_config.proto;l=223
      * @param values The phraseHints to add.
      * @return This builder for chaining.
      */
@@ -1702,13 +1743,13 @@ public Builder addAllPhraseHints(java.lang.Iterable<java.lang.String> values) {
      * <code>repeated string phrase_hints = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.dialogflow.v2.InputAudioConfig.phrase_hints is deprecated. See
-     *     google/cloud/dialogflow/v2/audio_config.proto;l=220
+     *     google/cloud/dialogflow/v2/audio_config.proto;l=223
      * @return This builder for chaining.
      */
     @java.lang.Deprecated
     public Builder clearPhraseHints() {
       phraseHints_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000010);
       onChanged();
       return this;
     }
@@ -1729,7 +1770,7 @@ public Builder clearPhraseHints() {
      * <code>repeated string phrase_hints = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.dialogflow.v2.InputAudioConfig.phrase_hints is deprecated. See
-     *     google/cloud/dialogflow/v2/audio_config.proto;l=220
+     *     google/cloud/dialogflow/v2/audio_config.proto;l=223
      * @param value The bytes of the phraseHints to add.
      * @return This builder for chaining.
      */
@@ -1749,10 +1790,10 @@ public Builder addPhraseHintsBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureSpeechContextsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000020) != 0)) {
         speechContexts_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.SpeechContext>(speechContexts_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000020;
       }
     }
 
@@ -2003,7 +2044,7 @@ public Builder addAllSpeechContexts(
     public Builder clearSpeechContexts() {
       if (speechContextsBuilder_ == null) {
         speechContexts_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000020);
         onChanged();
       } else {
         speechContextsBuilder_.clear();
@@ -2150,7 +2191,7 @@ public com.google.cloud.dialogflow.v2.SpeechContext.Builder addSpeechContextsBui
                 com.google.cloud.dialogflow.v2.SpeechContext.Builder,
                 com.google.cloud.dialogflow.v2.SpeechContextOrBuilder>(
                 speechContexts_,
-                ((bitField0_ & 0x00000002) != 0),
+                ((bitField0_ & 0x00000020) != 0),
                 getParentForChildren(),
                 isClean());
         speechContexts_ = null;
@@ -2249,8 +2290,8 @@ public Builder setModel(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       model_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2276,8 +2317,8 @@ public Builder setModel(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearModel() {
-
       model_ = getDefaultInstance().getModel();
+      bitField0_ = (bitField0_ & ~0x00000040);
       onChanged();
       return this;
     }
@@ -2308,8 +2349,8 @@ public Builder setModelBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       model_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2319,7 +2360,8 @@ public Builder setModelBytes(com.google.protobuf.ByteString value) {
      *
      *
      * <pre>
-     * Which variant of the [Speech model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
+     * Which variant of the [Speech
+     * model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.SpeechModelVariant model_variant = 10;</code>
@@ -2334,7 +2376,8 @@ public int getModelVariantValue() {
      *
      *
      * <pre>
-     * Which variant of the [Speech model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
+     * Which variant of the [Speech
+     * model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.SpeechModelVariant model_variant = 10;</code>
@@ -2343,8 +2386,8 @@ public int getModelVariantValue() {
      * @return This builder for chaining.
      */
     public Builder setModelVariantValue(int value) {
-
       modelVariant_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2352,7 +2395,8 @@ public Builder setModelVariantValue(int value) {
      *
      *
      * <pre>
-     * Which variant of the [Speech model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
+     * Which variant of the [Speech
+     * model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.SpeechModelVariant model_variant = 10;</code>
@@ -2361,9 +2405,8 @@ public Builder setModelVariantValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.SpeechModelVariant getModelVariant() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.SpeechModelVariant result =
-          com.google.cloud.dialogflow.v2.SpeechModelVariant.valueOf(modelVariant_);
+          com.google.cloud.dialogflow.v2.SpeechModelVariant.forNumber(modelVariant_);
       return result == null
           ? com.google.cloud.dialogflow.v2.SpeechModelVariant.UNRECOGNIZED
           : result;
@@ -2372,7 +2415,8 @@ public com.google.cloud.dialogflow.v2.SpeechModelVariant getModelVariant() {
      *
      *
      * <pre>
-     * Which variant of the [Speech model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
+     * Which variant of the [Speech
+     * model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.SpeechModelVariant model_variant = 10;</code>
@@ -2384,7 +2428,7 @@ public Builder setModelVariant(com.google.cloud.dialogflow.v2.SpeechModelVariant
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000080;
       modelVariant_ = value.getNumber();
       onChanged();
       return this;
@@ -2393,7 +2437,8 @@ public Builder setModelVariant(com.google.cloud.dialogflow.v2.SpeechModelVariant
      *
      *
      * <pre>
-     * Which variant of the [Speech model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
+     * Which variant of the [Speech
+     * model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.SpeechModelVariant model_variant = 10;</code>
@@ -2401,7 +2446,7 @@ public Builder setModelVariant(com.google.cloud.dialogflow.v2.SpeechModelVariant
      * @return This builder for chaining.
      */
     public Builder clearModelVariant() {
-
+      bitField0_ = (bitField0_ & ~0x00000080);
       modelVariant_ = 0;
       onChanged();
       return this;
@@ -2456,6 +2501,7 @@ public boolean getSingleUtterance() {
     public Builder setSingleUtterance(boolean value) {
 
       singleUtterance_ = value;
+      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -2480,7 +2526,7 @@ public Builder setSingleUtterance(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearSingleUtterance() {
-
+      bitField0_ = (bitField0_ & ~0x00000100);
       singleUtterance_ = false;
       onChanged();
       return this;
@@ -2491,7 +2537,9 @@ public Builder clearSingleUtterance() {
      *
      *
      * <pre>
-     * Only used in [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent] and
+     * Only used in
+     * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent]
+     * and
      * [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent].
      * If `false` and recognition doesn't return any result, trigger
      * `NO_SPEECH_RECOGNIZED` event to Dialogflow agent.
@@ -2509,7 +2557,9 @@ public boolean getDisableNoSpeechRecognizedEvent() {
      *
      *
      * <pre>
-     * Only used in [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent] and
+     * Only used in
+     * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent]
+     * and
      * [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent].
      * If `false` and recognition doesn't return any result, trigger
      * `NO_SPEECH_RECOGNIZED` event to Dialogflow agent.
@@ -2523,6 +2573,7 @@ public boolean getDisableNoSpeechRecognizedEvent() {
     public Builder setDisableNoSpeechRecognizedEvent(boolean value) {
 
       disableNoSpeechRecognizedEvent_ = value;
+      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -2530,7 +2581,9 @@ public Builder setDisableNoSpeechRecognizedEvent(boolean value) {
      *
      *
      * <pre>
-     * Only used in [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent] and
+     * Only used in
+     * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent]
+     * and
      * [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent].
      * If `false` and recognition doesn't return any result, trigger
      * `NO_SPEECH_RECOGNIZED` event to Dialogflow agent.
@@ -2541,7 +2594,7 @@ public Builder setDisableNoSpeechRecognizedEvent(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearDisableNoSpeechRecognizedEvent() {
-
+      bitField0_ = (bitField0_ & ~0x00000200);
       disableNoSpeechRecognizedEvent_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputAudioConfigOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputAudioConfigOrBuilder.java
index 1e9c90f5d154..eb9c0b1f218f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputAudioConfigOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputAudioConfigOrBuilder.java
@@ -102,10 +102,12 @@ public interface InputAudioConfigOrBuilder
    *
    *
    * <pre>
-   * If `true`, Dialogflow returns [SpeechWordInfo][google.cloud.dialogflow.v2.SpeechWordInfo] in
-   * [StreamingRecognitionResult][google.cloud.dialogflow.v2.StreamingRecognitionResult] with information about the recognized speech
-   * words, e.g. start and end time offsets. If false or unspecified, Speech
-   * doesn't return any word-level information.
+   * If `true`, Dialogflow returns
+   * [SpeechWordInfo][google.cloud.dialogflow.v2.SpeechWordInfo] in
+   * [StreamingRecognitionResult][google.cloud.dialogflow.v2.StreamingRecognitionResult]
+   * with information about the recognized speech words, e.g. start and end time
+   * offsets. If false or unspecified, Speech doesn't return any word-level
+   * information.
    * </pre>
    *
    * <code>bool enable_word_info = 13;</code>
@@ -131,7 +133,7 @@ public interface InputAudioConfigOrBuilder
    * <code>repeated string phrase_hints = 4 [deprecated = true];</code>
    *
    * @deprecated google.cloud.dialogflow.v2.InputAudioConfig.phrase_hints is deprecated. See
-   *     google/cloud/dialogflow/v2/audio_config.proto;l=220
+   *     google/cloud/dialogflow/v2/audio_config.proto;l=223
    * @return A list containing the phraseHints.
    */
   @java.lang.Deprecated
@@ -153,7 +155,7 @@ public interface InputAudioConfigOrBuilder
    * <code>repeated string phrase_hints = 4 [deprecated = true];</code>
    *
    * @deprecated google.cloud.dialogflow.v2.InputAudioConfig.phrase_hints is deprecated. See
-   *     google/cloud/dialogflow/v2/audio_config.proto;l=220
+   *     google/cloud/dialogflow/v2/audio_config.proto;l=223
    * @return The count of phraseHints.
    */
   @java.lang.Deprecated
@@ -175,7 +177,7 @@ public interface InputAudioConfigOrBuilder
    * <code>repeated string phrase_hints = 4 [deprecated = true];</code>
    *
    * @deprecated google.cloud.dialogflow.v2.InputAudioConfig.phrase_hints is deprecated. See
-   *     google/cloud/dialogflow/v2/audio_config.proto;l=220
+   *     google/cloud/dialogflow/v2/audio_config.proto;l=223
    * @param index The index of the element to return.
    * @return The phraseHints at the given index.
    */
@@ -198,7 +200,7 @@ public interface InputAudioConfigOrBuilder
    * <code>repeated string phrase_hints = 4 [deprecated = true];</code>
    *
    * @deprecated google.cloud.dialogflow.v2.InputAudioConfig.phrase_hints is deprecated. See
-   *     google/cloud/dialogflow/v2/audio_config.proto;l=220
+   *     google/cloud/dialogflow/v2/audio_config.proto;l=223
    * @param index The index of the value to return.
    * @return The bytes of the phraseHints at the given index.
    */
@@ -321,7 +323,8 @@ public interface InputAudioConfigOrBuilder
    *
    *
    * <pre>
-   * Which variant of the [Speech model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
+   * Which variant of the [Speech
+   * model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.SpeechModelVariant model_variant = 10;</code>
@@ -333,7 +336,8 @@ public interface InputAudioConfigOrBuilder
    *
    *
    * <pre>
-   * Which variant of the [Speech model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
+   * Which variant of the [Speech
+   * model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.SpeechModelVariant model_variant = 10;</code>
@@ -368,7 +372,9 @@ public interface InputAudioConfigOrBuilder
    *
    *
    * <pre>
-   * Only used in [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent] and
+   * Only used in
+   * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent]
+   * and
    * [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent].
    * If `false` and recognition doesn't return any result, trigger
    * `NO_SPEECH_RECOGNIZED` event to Dialogflow agent.
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputConfig.java
index f165246b3910..44bfab2a2e83 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputConfig.java
@@ -380,6 +380,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (gcsSourceBuilder_ != null) {
         gcsSourceBuilder_.clear();
       }
@@ -412,18 +413,26 @@ public com.google.cloud.dialogflow.v2.InputConfig build() {
     public com.google.cloud.dialogflow.v2.InputConfig buildPartial() {
       com.google.cloud.dialogflow.v2.InputConfig result =
           new com.google.cloud.dialogflow.v2.InputConfig(this);
-      if (sourceCase_ == 1) {
-        if (gcsSourceBuilder_ == null) {
-          result.source_ = source_;
-        } else {
-          result.source_ = gcsSourceBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.sourceCase_ = sourceCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.InputConfig result) {
+      int from_bitField0_ = bitField0_;
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2.InputConfig result) {
+      result.sourceCase_ = sourceCase_;
+      result.source_ = this.source_;
+      if (sourceCase_ == 1 && gcsSourceBuilder_ != null) {
+        result.source_ = gcsSourceBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -543,6 +552,8 @@ public Builder clearSource() {
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.GcsSources,
             com.google.cloud.dialogflow.v2.GcsSources.Builder,
@@ -766,7 +777,6 @@ public com.google.cloud.dialogflow.v2.GcsSourcesOrBuilder getGcsSourceOrBuilder(
       }
       sourceCase_ = 1;
       onChanged();
-      ;
       return gcsSourceBuilder_;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputDataset.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputDataset.java
index 1b782c619cc2..b7c74301764e 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputDataset.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputDataset.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int DATASET_FIELD_NUMBER = 1;
-  private volatile java.lang.Object dataset_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object dataset_ = "";
   /**
    *
    *
@@ -323,8 +325,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       dataset_ = "";
-
       return this;
     }
 
@@ -352,11 +354,20 @@ public com.google.cloud.dialogflow.v2.InputDataset build() {
     public com.google.cloud.dialogflow.v2.InputDataset buildPartial() {
       com.google.cloud.dialogflow.v2.InputDataset result =
           new com.google.cloud.dialogflow.v2.InputDataset(this);
-      result.dataset_ = dataset_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.InputDataset result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.dataset_ = dataset_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -404,6 +415,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.InputDataset other) {
       if (other == com.google.cloud.dialogflow.v2.InputDataset.getDefaultInstance()) return this;
       if (!other.getDataset().isEmpty()) {
         dataset_ = other.dataset_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -435,7 +447,7 @@ public Builder mergeFrom(
             case 10:
               {
                 dataset_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -455,6 +467,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object dataset_ = "";
     /**
      *
@@ -528,8 +542,8 @@ public Builder setDataset(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       dataset_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -549,8 +563,8 @@ public Builder setDataset(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDataset() {
-
       dataset_ = getDefaultInstance().getDataset();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -575,8 +589,8 @@ public Builder setDatasetBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       dataset_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputTextConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputTextConfig.java
index 738a0a8f71aa..5775162e9ef3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputTextConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputTextConfig.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -317,8 +319,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       languageCode_ = "";
-
       return this;
     }
 
@@ -346,11 +348,20 @@ public com.google.cloud.dialogflow.v2.InputTextConfig build() {
     public com.google.cloud.dialogflow.v2.InputTextConfig buildPartial() {
       com.google.cloud.dialogflow.v2.InputTextConfig result =
           new com.google.cloud.dialogflow.v2.InputTextConfig(this);
-      result.languageCode_ = languageCode_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.InputTextConfig result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -398,6 +409,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.InputTextConfig other) {
       if (other == com.google.cloud.dialogflow.v2.InputTextConfig.getDefaultInstance()) return this;
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -429,7 +441,7 @@ public Builder mergeFrom(
             case 10:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -449,6 +461,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object languageCode_ = "";
     /**
      *
@@ -516,8 +530,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -535,8 +549,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -559,8 +573,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java
index 1a4df71f291e..9534ea389a9f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java
@@ -316,7 +316,9 @@ public interface TrainingPhraseOrBuilder
      * Note: Do not forget to include whitespace at part boundaries,
      * so the training phrase is well formatted when the parts are concatenated.
      * If the training phrase does not need to be annotated with parameters,
-     * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+     * you just need a single part with only the
+     * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+     * field set.
      * If you want to annotate the training phrase, you must create multiple
      * parts, where the fields of each part are populated in one of two ways:
      * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -341,7 +343,9 @@ public interface TrainingPhraseOrBuilder
      * Note: Do not forget to include whitespace at part boundaries,
      * so the training phrase is well formatted when the parts are concatenated.
      * If the training phrase does not need to be annotated with parameters,
-     * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+     * you just need a single part with only the
+     * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+     * field set.
      * If you want to annotate the training phrase, you must create multiple
      * parts, where the fields of each part are populated in one of two ways:
      * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -366,7 +370,9 @@ public interface TrainingPhraseOrBuilder
      * Note: Do not forget to include whitespace at part boundaries,
      * so the training phrase is well formatted when the parts are concatenated.
      * If the training phrase does not need to be annotated with parameters,
-     * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+     * you just need a single part with only the
+     * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+     * field set.
      * If you want to annotate the training phrase, you must create multiple
      * parts, where the fields of each part are populated in one of two ways:
      * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -391,7 +397,9 @@ public interface TrainingPhraseOrBuilder
      * Note: Do not forget to include whitespace at part boundaries,
      * so the training phrase is well formatted when the parts are concatenated.
      * If the training phrase does not need to be annotated with parameters,
-     * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+     * you just need a single part with only the
+     * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+     * field set.
      * If you want to annotate the training phrase, you must create multiple
      * parts, where the fields of each part are populated in one of two ways:
      * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -417,7 +425,9 @@ public interface TrainingPhraseOrBuilder
      * Note: Do not forget to include whitespace at part boundaries,
      * so the training phrase is well formatted when the parts are concatenated.
      * If the training phrase does not need to be annotated with parameters,
-     * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+     * you just need a single part with only the
+     * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+     * field set.
      * If you want to annotate the training phrase, you must create multiple
      * parts, where the fields of each part are populated in one of two ways:
      * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -824,7 +834,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int TEXT_FIELD_NUMBER = 1;
-      private volatile java.lang.Object text_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object text_ = "";
       /**
        *
        *
@@ -873,7 +885,9 @@ public com.google.protobuf.ByteString getTextBytes() {
       }
 
       public static final int ENTITY_TYPE_FIELD_NUMBER = 2;
-      private volatile java.lang.Object entityType_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object entityType_ = "";
       /**
        *
        *
@@ -924,7 +938,9 @@ public com.google.protobuf.ByteString getEntityTypeBytes() {
       }
 
       public static final int ALIAS_FIELD_NUMBER = 3;
-      private volatile java.lang.Object alias_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object alias_ = "";
       /**
        *
        *
@@ -977,7 +993,7 @@ public com.google.protobuf.ByteString getAliasBytes() {
       }
 
       public static final int USER_DEFINED_FIELD_NUMBER = 4;
-      private boolean userDefined_;
+      private boolean userDefined_ = false;
       /**
        *
        *
@@ -1224,14 +1240,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           text_ = "";
-
           entityType_ = "";
-
           alias_ = "";
-
           userDefined_ = false;
-
           return this;
         }
 
@@ -1260,14 +1273,30 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part build() {
         public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part result =
               new com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part(this);
-          result.text_ = text_;
-          result.entityType_ = entityType_;
-          result.alias_ = alias_;
-          result.userDefined_ = userDefined_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.text_ = text_;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.entityType_ = entityType_;
+          }
+          if (((from_bitField0_ & 0x00000004) != 0)) {
+            result.alias_ = alias_;
+          }
+          if (((from_bitField0_ & 0x00000008) != 0)) {
+            result.userDefined_ = userDefined_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -1319,14 +1348,17 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Pa
             return this;
           if (!other.getText().isEmpty()) {
             text_ = other.text_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (!other.getEntityType().isEmpty()) {
             entityType_ = other.entityType_;
+            bitField0_ |= 0x00000002;
             onChanged();
           }
           if (!other.getAlias().isEmpty()) {
             alias_ = other.alias_;
+            bitField0_ |= 0x00000004;
             onChanged();
           }
           if (other.getUserDefined() != false) {
@@ -1361,25 +1393,25 @@ public Builder mergeFrom(
                 case 10:
                   {
                     text_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
                   {
                     entityType_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 18
                 case 26:
                   {
                     alias_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000004;
                     break;
                   } // case 26
                 case 32:
                   {
                     userDefined_ = input.readBool();
-
+                    bitField0_ |= 0x00000008;
                     break;
                   } // case 32
                 default:
@@ -1399,6 +1431,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object text_ = "";
         /**
          *
@@ -1460,8 +1494,8 @@ public Builder setText(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           text_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -1477,8 +1511,8 @@ public Builder setText(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearText() {
-
           text_ = getDefaultInstance().getText();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -1499,8 +1533,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           text_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -1569,8 +1603,8 @@ public Builder setEntityType(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           entityType_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -1587,8 +1621,8 @@ public Builder setEntityType(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearEntityType() {
-
           entityType_ = getDefaultInstance().getEntityType();
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -1610,8 +1644,8 @@ public Builder setEntityTypeBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           entityType_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -1683,8 +1717,8 @@ public Builder setAlias(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           alias_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -1702,8 +1736,8 @@ public Builder setAlias(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearAlias() {
-
           alias_ = getDefaultInstance().getAlias();
+          bitField0_ = (bitField0_ & ~0x00000004);
           onChanged();
           return this;
         }
@@ -1726,8 +1760,8 @@ public Builder setAliasBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           alias_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -1769,6 +1803,7 @@ public boolean getUserDefined() {
         public Builder setUserDefined(boolean value) {
 
           userDefined_ = value;
+          bitField0_ |= 0x00000008;
           onChanged();
           return this;
         }
@@ -1787,7 +1822,7 @@ public Builder setUserDefined(boolean value) {
          * @return This builder for chaining.
          */
         public Builder clearUserDefined() {
-
+          bitField0_ = (bitField0_ & ~0x00000008);
           userDefined_ = false;
           onChanged();
           return this;
@@ -1859,7 +1894,9 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part getDefaultInsta
     }
 
     public static final int NAME_FIELD_NUMBER = 1;
-    private volatile java.lang.Object name_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object name_ = "";
     /**
      *
      *
@@ -1908,7 +1945,7 @@ public com.google.protobuf.ByteString getNameBytes() {
     }
 
     public static final int TYPE_FIELD_NUMBER = 2;
-    private int type_;
+    private int type_ = 0;
     /**
      *
      *
@@ -1941,15 +1978,16 @@ public int getTypeValue() {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type result =
-          com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type.valueOf(type_);
+          com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type.forNumber(type_);
       return result == null
           ? com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type.UNRECOGNIZED
           : result;
     }
 
     public static final int PARTS_FIELD_NUMBER = 3;
+
+    @SuppressWarnings("serial")
     private java.util.List<com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part> parts_;
     /**
      *
@@ -1962,7 +2000,9 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type getType() {
      * Note: Do not forget to include whitespace at part boundaries,
      * so the training phrase is well formatted when the parts are concatenated.
      * If the training phrase does not need to be annotated with parameters,
-     * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+     * you just need a single part with only the
+     * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+     * field set.
      * If you want to annotate the training phrase, you must create multiple
      * parts, where the fields of each part are populated in one of two ways:
      * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -1991,7 +2031,9 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type getType() {
      * Note: Do not forget to include whitespace at part boundaries,
      * so the training phrase is well formatted when the parts are concatenated.
      * If the training phrase does not need to be annotated with parameters,
-     * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+     * you just need a single part with only the
+     * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+     * field set.
      * If you want to annotate the training phrase, you must create multiple
      * parts, where the fields of each part are populated in one of two ways:
      * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -2021,7 +2063,9 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type getType() {
      * Note: Do not forget to include whitespace at part boundaries,
      * so the training phrase is well formatted when the parts are concatenated.
      * If the training phrase does not need to be annotated with parameters,
-     * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+     * you just need a single part with only the
+     * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+     * field set.
      * If you want to annotate the training phrase, you must create multiple
      * parts, where the fields of each part are populated in one of two ways:
      * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -2049,7 +2093,9 @@ public int getPartsCount() {
      * Note: Do not forget to include whitespace at part boundaries,
      * so the training phrase is well formatted when the parts are concatenated.
      * If the training phrase does not need to be annotated with parameters,
-     * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+     * you just need a single part with only the
+     * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+     * field set.
      * If you want to annotate the training phrase, you must create multiple
      * parts, where the fields of each part are populated in one of two ways:
      * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -2077,7 +2123,9 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part getParts(int in
      * Note: Do not forget to include whitespace at part boundaries,
      * so the training phrase is well formatted when the parts are concatenated.
      * If the training phrase does not need to be annotated with parameters,
-     * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+     * you just need a single part with only the
+     * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+     * field set.
      * If you want to annotate the training phrase, you must create multiple
      * parts, where the fields of each part are populated in one of two ways:
      * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -2097,7 +2145,7 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.PartOrBuilder getPar
     }
 
     public static final int TIMES_ADDED_COUNT_FIELD_NUMBER = 4;
-    private int timesAddedCount_;
+    private int timesAddedCount_ = 0;
     /**
      *
      *
@@ -2349,19 +2397,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         name_ = "";
-
         type_ = 0;
-
         if (partsBuilder_ == null) {
           parts_ = java.util.Collections.emptyList();
         } else {
           parts_ = null;
           partsBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000004);
         timesAddedCount_ = 0;
-
         return this;
       }
 
@@ -2389,21 +2435,38 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase build() {
       public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase buildPartial() {
         com.google.cloud.dialogflow.v2.Intent.TrainingPhrase result =
             new com.google.cloud.dialogflow.v2.Intent.TrainingPhrase(this);
-        int from_bitField0_ = bitField0_;
-        result.name_ = name_;
-        result.type_ = type_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(
+          com.google.cloud.dialogflow.v2.Intent.TrainingPhrase result) {
         if (partsBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
+          if (((bitField0_ & 0x00000004) != 0)) {
             parts_ = java.util.Collections.unmodifiableList(parts_);
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
           }
           result.parts_ = parts_;
         } else {
           result.parts_ = partsBuilder_.build();
         }
-        result.timesAddedCount_ = timesAddedCount_;
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(com.google.cloud.dialogflow.v2.Intent.TrainingPhrase result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.name_ = name_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.type_ = type_;
+        }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.timesAddedCount_ = timesAddedCount_;
+        }
       }
 
       @java.lang.Override
@@ -2456,6 +2519,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.TrainingPhrase ot
           return this;
         if (!other.getName().isEmpty()) {
           name_ = other.name_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.type_ != 0) {
@@ -2465,7 +2529,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.TrainingPhrase ot
           if (!other.parts_.isEmpty()) {
             if (parts_.isEmpty()) {
               parts_ = other.parts_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000004);
             } else {
               ensurePartsIsMutable();
               parts_.addAll(other.parts_);
@@ -2478,7 +2542,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.TrainingPhrase ot
               partsBuilder_.dispose();
               partsBuilder_ = null;
               parts_ = other.parts_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000004);
               partsBuilder_ =
                   com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                       ? getPartsFieldBuilder()
@@ -2520,13 +2584,13 @@ public Builder mergeFrom(
               case 10:
                 {
                   name_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 16:
                 {
                   type_ = input.readEnum();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 16
               case 26:
@@ -2546,7 +2610,7 @@ public Builder mergeFrom(
               case 32:
                 {
                   timesAddedCount_ = input.readInt32();
-
+                  bitField0_ |= 0x00000008;
                   break;
                 } // case 32
               default:
@@ -2629,8 +2693,8 @@ public Builder setName(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         name_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2646,8 +2710,8 @@ public Builder setName(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearName() {
-
         name_ = getDefaultInstance().getName();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -2668,8 +2732,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         name_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2707,8 +2771,8 @@ public int getTypeValue() {
        * @return This builder for chaining.
        */
       public Builder setTypeValue(int value) {
-
         type_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2727,9 +2791,8 @@ public Builder setTypeValue(int value) {
        */
       @java.lang.Override
       public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type getType() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type result =
-            com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type.valueOf(type_);
+            com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type.forNumber(type_);
         return result == null
             ? com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type.UNRECOGNIZED
             : result;
@@ -2752,7 +2815,7 @@ public Builder setType(com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type
         if (value == null) {
           throw new NullPointerException();
         }
-
+        bitField0_ |= 0x00000002;
         type_ = value.getNumber();
         onChanged();
         return this;
@@ -2771,7 +2834,7 @@ public Builder setType(com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type
        * @return This builder for chaining.
        */
       public Builder clearType() {
-
+        bitField0_ = (bitField0_ & ~0x00000002);
         type_ = 0;
         onChanged();
         return this;
@@ -2781,11 +2844,11 @@ public Builder clearType() {
           java.util.Collections.emptyList();
 
       private void ensurePartsIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!((bitField0_ & 0x00000004) != 0)) {
           parts_ =
               new java.util.ArrayList<com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part>(
                   parts_);
-          bitField0_ |= 0x00000001;
+          bitField0_ |= 0x00000004;
         }
       }
 
@@ -2806,7 +2869,9 @@ private void ensurePartsIsMutable() {
        * Note: Do not forget to include whitespace at part boundaries,
        * so the training phrase is well formatted when the parts are concatenated.
        * If the training phrase does not need to be annotated with parameters,
-       * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+       * you just need a single part with only the
+       * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+       * field set.
        * If you want to annotate the training phrase, you must create multiple
        * parts, where the fields of each part are populated in one of two ways:
        * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -2838,7 +2903,9 @@ private void ensurePartsIsMutable() {
        * Note: Do not forget to include whitespace at part boundaries,
        * so the training phrase is well formatted when the parts are concatenated.
        * If the training phrase does not need to be annotated with parameters,
-       * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+       * you just need a single part with only the
+       * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+       * field set.
        * If you want to annotate the training phrase, you must create multiple
        * parts, where the fields of each part are populated in one of two ways:
        * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -2869,7 +2936,9 @@ public int getPartsCount() {
        * Note: Do not forget to include whitespace at part boundaries,
        * so the training phrase is well formatted when the parts are concatenated.
        * If the training phrase does not need to be annotated with parameters,
-       * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+       * you just need a single part with only the
+       * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+       * field set.
        * If you want to annotate the training phrase, you must create multiple
        * parts, where the fields of each part are populated in one of two ways:
        * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -2900,7 +2969,9 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part getParts(int in
        * Note: Do not forget to include whitespace at part boundaries,
        * so the training phrase is well formatted when the parts are concatenated.
        * If the training phrase does not need to be annotated with parameters,
-       * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+       * you just need a single part with only the
+       * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+       * field set.
        * If you want to annotate the training phrase, you must create multiple
        * parts, where the fields of each part are populated in one of two ways:
        * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -2938,7 +3009,9 @@ public Builder setParts(
        * Note: Do not forget to include whitespace at part boundaries,
        * so the training phrase is well formatted when the parts are concatenated.
        * If the training phrase does not need to be annotated with parameters,
-       * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+       * you just need a single part with only the
+       * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+       * field set.
        * If you want to annotate the training phrase, you must create multiple
        * parts, where the fields of each part are populated in one of two ways:
        * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -2974,7 +3047,9 @@ public Builder setParts(
        * Note: Do not forget to include whitespace at part boundaries,
        * so the training phrase is well formatted when the parts are concatenated.
        * If the training phrase does not need to be annotated with parameters,
-       * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+       * you just need a single part with only the
+       * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+       * field set.
        * If you want to annotate the training phrase, you must create multiple
        * parts, where the fields of each part are populated in one of two ways:
        * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -3011,7 +3086,9 @@ public Builder addParts(com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Par
        * Note: Do not forget to include whitespace at part boundaries,
        * so the training phrase is well formatted when the parts are concatenated.
        * If the training phrase does not need to be annotated with parameters,
-       * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+       * you just need a single part with only the
+       * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+       * field set.
        * If you want to annotate the training phrase, you must create multiple
        * parts, where the fields of each part are populated in one of two ways:
        * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -3049,7 +3126,9 @@ public Builder addParts(
        * Note: Do not forget to include whitespace at part boundaries,
        * so the training phrase is well formatted when the parts are concatenated.
        * If the training phrase does not need to be annotated with parameters,
-       * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+       * you just need a single part with only the
+       * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+       * field set.
        * If you want to annotate the training phrase, you must create multiple
        * parts, where the fields of each part are populated in one of two ways:
        * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -3084,7 +3163,9 @@ public Builder addParts(
        * Note: Do not forget to include whitespace at part boundaries,
        * so the training phrase is well formatted when the parts are concatenated.
        * If the training phrase does not need to be annotated with parameters,
-       * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+       * you just need a single part with only the
+       * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+       * field set.
        * If you want to annotate the training phrase, you must create multiple
        * parts, where the fields of each part are populated in one of two ways:
        * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -3120,7 +3201,9 @@ public Builder addParts(
        * Note: Do not forget to include whitespace at part boundaries,
        * so the training phrase is well formatted when the parts are concatenated.
        * If the training phrase does not need to be annotated with parameters,
-       * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+       * you just need a single part with only the
+       * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+       * field set.
        * If you want to annotate the training phrase, you must create multiple
        * parts, where the fields of each part are populated in one of two ways:
        * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -3156,7 +3239,9 @@ public Builder addAllParts(
        * Note: Do not forget to include whitespace at part boundaries,
        * so the training phrase is well formatted when the parts are concatenated.
        * If the training phrase does not need to be annotated with parameters,
-       * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+       * you just need a single part with only the
+       * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+       * field set.
        * If you want to annotate the training phrase, you must create multiple
        * parts, where the fields of each part are populated in one of two ways:
        * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -3172,7 +3257,7 @@ public Builder addAllParts(
       public Builder clearParts() {
         if (partsBuilder_ == null) {
           parts_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000004);
           onChanged();
         } else {
           partsBuilder_.clear();
@@ -3190,7 +3275,9 @@ public Builder clearParts() {
        * Note: Do not forget to include whitespace at part boundaries,
        * so the training phrase is well formatted when the parts are concatenated.
        * If the training phrase does not need to be annotated with parameters,
-       * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+       * you just need a single part with only the
+       * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+       * field set.
        * If you want to annotate the training phrase, you must create multiple
        * parts, where the fields of each part are populated in one of two ways:
        * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -3224,7 +3311,9 @@ public Builder removeParts(int index) {
        * Note: Do not forget to include whitespace at part boundaries,
        * so the training phrase is well formatted when the parts are concatenated.
        * If the training phrase does not need to be annotated with parameters,
-       * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+       * you just need a single part with only the
+       * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+       * field set.
        * If you want to annotate the training phrase, you must create multiple
        * parts, where the fields of each part are populated in one of two ways:
        * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -3252,7 +3341,9 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.Builder getPart
        * Note: Do not forget to include whitespace at part boundaries,
        * so the training phrase is well formatted when the parts are concatenated.
        * If the training phrase does not need to be annotated with parameters,
-       * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+       * you just need a single part with only the
+       * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+       * field set.
        * If you want to annotate the training phrase, you must create multiple
        * parts, where the fields of each part are populated in one of two ways:
        * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -3284,7 +3375,9 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.PartOrBuilder getPar
        * Note: Do not forget to include whitespace at part boundaries,
        * so the training phrase is well formatted when the parts are concatenated.
        * If the training phrase does not need to be annotated with parameters,
-       * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+       * you just need a single part with only the
+       * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+       * field set.
        * If you want to annotate the training phrase, you must create multiple
        * parts, where the fields of each part are populated in one of two ways:
        * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -3317,7 +3410,9 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.PartOrBuilder getPar
        * Note: Do not forget to include whitespace at part boundaries,
        * so the training phrase is well formatted when the parts are concatenated.
        * If the training phrase does not need to be annotated with parameters,
-       * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+       * you just need a single part with only the
+       * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+       * field set.
        * If you want to annotate the training phrase, you must create multiple
        * parts, where the fields of each part are populated in one of two ways:
        * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -3346,7 +3441,9 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.Builder addPart
        * Note: Do not forget to include whitespace at part boundaries,
        * so the training phrase is well formatted when the parts are concatenated.
        * If the training phrase does not need to be annotated with parameters,
-       * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+       * you just need a single part with only the
+       * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+       * field set.
        * If you want to annotate the training phrase, you must create multiple
        * parts, where the fields of each part are populated in one of two ways:
        * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -3377,7 +3474,9 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.Builder addPart
        * Note: Do not forget to include whitespace at part boundaries,
        * so the training phrase is well formatted when the parts are concatenated.
        * If the training phrase does not need to be annotated with parameters,
-       * you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+       * you just need a single part with only the
+       * [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+       * field set.
        * If you want to annotate the training phrase, you must create multiple
        * parts, where the fields of each part are populated in one of two ways:
        * -   `Part.text` is set to a part of the phrase that has no parameters.
@@ -3406,7 +3505,7 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.Builder addPart
                   com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part,
                   com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.Builder,
                   com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.PartOrBuilder>(
-                  parts_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                  parts_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
           parts_ = null;
         }
         return partsBuilder_;
@@ -3447,6 +3546,7 @@ public int getTimesAddedCount() {
       public Builder setTimesAddedCount(int value) {
 
         timesAddedCount_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -3464,7 +3564,7 @@ public Builder setTimesAddedCount(int value) {
        * @return This builder for chaining.
        */
       public Builder clearTimesAddedCount() {
-
+        bitField0_ = (bitField0_ & ~0x00000008);
         timesAddedCount_ = 0;
         onChanged();
         return this;
@@ -3822,7 +3922,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int NAME_FIELD_NUMBER = 1;
-    private volatile java.lang.Object name_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object name_ = "";
     /**
      *
      *
@@ -3871,7 +3973,9 @@ public com.google.protobuf.ByteString getNameBytes() {
     }
 
     public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-    private volatile java.lang.Object displayName_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object displayName_ = "";
     /**
      *
      *
@@ -3920,7 +4024,9 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
     }
 
     public static final int VALUE_FIELD_NUMBER = 3;
-    private volatile java.lang.Object value_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object value_ = "";
     /**
      *
      *
@@ -3979,7 +4085,9 @@ public com.google.protobuf.ByteString getValueBytes() {
     }
 
     public static final int DEFAULT_VALUE_FIELD_NUMBER = 4;
-    private volatile java.lang.Object defaultValue_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object defaultValue_ = "";
     /**
      *
      *
@@ -4034,7 +4142,9 @@ public com.google.protobuf.ByteString getDefaultValueBytes() {
     }
 
     public static final int ENTITY_TYPE_DISPLAY_NAME_FIELD_NUMBER = 5;
-    private volatile java.lang.Object entityTypeDisplayName_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object entityTypeDisplayName_ = "";
     /**
      *
      *
@@ -4087,7 +4197,7 @@ public com.google.protobuf.ByteString getEntityTypeDisplayNameBytes() {
     }
 
     public static final int MANDATORY_FIELD_NUMBER = 6;
-    private boolean mandatory_;
+    private boolean mandatory_ = false;
     /**
      *
      *
@@ -4107,6 +4217,8 @@ public boolean getMandatory() {
     }
 
     public static final int PROMPTS_FIELD_NUMBER = 7;
+
+    @SuppressWarnings("serial")
     private com.google.protobuf.LazyStringList prompts_;
     /**
      *
@@ -4172,7 +4284,7 @@ public com.google.protobuf.ByteString getPromptsBytes(int index) {
     }
 
     public static final int IS_LIST_FIELD_NUMBER = 8;
-    private boolean isList_;
+    private boolean isList_ = false;
     /**
      *
      *
@@ -4458,22 +4570,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         name_ = "";
-
         displayName_ = "";
-
         value_ = "";
-
         defaultValue_ = "";
-
         entityTypeDisplayName_ = "";
-
         mandatory_ = false;
-
         prompts_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000040);
         isList_ = false;
-
         return this;
       }
 
@@ -4501,23 +4607,48 @@ public com.google.cloud.dialogflow.v2.Intent.Parameter build() {
       public com.google.cloud.dialogflow.v2.Intent.Parameter buildPartial() {
         com.google.cloud.dialogflow.v2.Intent.Parameter result =
             new com.google.cloud.dialogflow.v2.Intent.Parameter(this);
-        int from_bitField0_ = bitField0_;
-        result.name_ = name_;
-        result.displayName_ = displayName_;
-        result.value_ = value_;
-        result.defaultValue_ = defaultValue_;
-        result.entityTypeDisplayName_ = entityTypeDisplayName_;
-        result.mandatory_ = mandatory_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          prompts_ = prompts_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000001);
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
-        result.prompts_ = prompts_;
-        result.isList_ = isList_;
         onBuilt();
         return result;
       }
 
+      private void buildPartialRepeatedFields(
+          com.google.cloud.dialogflow.v2.Intent.Parameter result) {
+        if (((bitField0_ & 0x00000040) != 0)) {
+          prompts_ = prompts_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000040);
+        }
+        result.prompts_ = prompts_;
+      }
+
+      private void buildPartial0(com.google.cloud.dialogflow.v2.Intent.Parameter result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.name_ = name_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.displayName_ = displayName_;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.value_ = value_;
+        }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.defaultValue_ = defaultValue_;
+        }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.entityTypeDisplayName_ = entityTypeDisplayName_;
+        }
+        if (((from_bitField0_ & 0x00000020) != 0)) {
+          result.mandatory_ = mandatory_;
+        }
+        if (((from_bitField0_ & 0x00000080) != 0)) {
+          result.isList_ = isList_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -4568,22 +4699,27 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Parameter other)
           return this;
         if (!other.getName().isEmpty()) {
           name_ = other.name_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getDisplayName().isEmpty()) {
           displayName_ = other.displayName_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (!other.getValue().isEmpty()) {
           value_ = other.value_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
         if (!other.getDefaultValue().isEmpty()) {
           defaultValue_ = other.defaultValue_;
+          bitField0_ |= 0x00000008;
           onChanged();
         }
         if (!other.getEntityTypeDisplayName().isEmpty()) {
           entityTypeDisplayName_ = other.entityTypeDisplayName_;
+          bitField0_ |= 0x00000010;
           onChanged();
         }
         if (other.getMandatory() != false) {
@@ -4592,7 +4728,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Parameter other)
         if (!other.prompts_.isEmpty()) {
           if (prompts_.isEmpty()) {
             prompts_ = other.prompts_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000040);
           } else {
             ensurePromptsIsMutable();
             prompts_.addAll(other.prompts_);
@@ -4631,37 +4767,37 @@ public Builder mergeFrom(
               case 10:
                 {
                   name_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
                 {
                   displayName_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 18
               case 26:
                 {
                   value_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000004;
                   break;
                 } // case 26
               case 34:
                 {
                   defaultValue_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000008;
                   break;
                 } // case 34
               case 42:
                 {
                   entityTypeDisplayName_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000010;
                   break;
                 } // case 42
               case 48:
                 {
                   mandatory_ = input.readBool();
-
+                  bitField0_ |= 0x00000020;
                   break;
                 } // case 48
               case 58:
@@ -4674,7 +4810,7 @@ public Builder mergeFrom(
               case 64:
                 {
                   isList_ = input.readBool();
-
+                  bitField0_ |= 0x00000080;
                   break;
                 } // case 64
               default:
@@ -4757,8 +4893,8 @@ public Builder setName(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         name_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4774,8 +4910,8 @@ public Builder setName(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearName() {
-
         name_ = getDefaultInstance().getName();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -4796,8 +4932,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         name_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4863,8 +4999,8 @@ public Builder setDisplayName(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         displayName_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4880,8 +5016,8 @@ public Builder setDisplayName(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearDisplayName() {
-
         displayName_ = getDefaultInstance().getDisplayName();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -4902,8 +5038,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         displayName_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4984,8 +5120,8 @@ public Builder setValue(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         value_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -5006,8 +5142,8 @@ public Builder setValue(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearValue() {
-
         value_ = getDefaultInstance().getValue();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -5033,8 +5169,8 @@ public Builder setValueBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         value_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -5109,8 +5245,8 @@ public Builder setDefaultValue(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         defaultValue_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -5129,8 +5265,8 @@ public Builder setDefaultValue(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearDefaultValue() {
-
         defaultValue_ = getDefaultInstance().getDefaultValue();
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
@@ -5154,8 +5290,8 @@ public Builder setDefaultValueBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         defaultValue_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -5227,8 +5363,8 @@ public Builder setEntityTypeDisplayName(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         entityTypeDisplayName_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -5246,8 +5382,8 @@ public Builder setEntityTypeDisplayName(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearEntityTypeDisplayName() {
-
         entityTypeDisplayName_ = getDefaultInstance().getEntityTypeDisplayName();
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
       }
@@ -5270,8 +5406,8 @@ public Builder setEntityTypeDisplayNameBytes(com.google.protobuf.ByteString valu
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         entityTypeDisplayName_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -5311,6 +5447,7 @@ public boolean getMandatory() {
       public Builder setMandatory(boolean value) {
 
         mandatory_ = value;
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -5328,7 +5465,7 @@ public Builder setMandatory(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearMandatory() {
-
+        bitField0_ = (bitField0_ & ~0x00000020);
         mandatory_ = false;
         onChanged();
         return this;
@@ -5338,9 +5475,9 @@ public Builder clearMandatory() {
           com.google.protobuf.LazyStringArrayList.EMPTY;
 
       private void ensurePromptsIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!((bitField0_ & 0x00000040) != 0)) {
           prompts_ = new com.google.protobuf.LazyStringArrayList(prompts_);
-          bitField0_ |= 0x00000001;
+          bitField0_ |= 0x00000040;
         }
       }
       /**
@@ -5483,7 +5620,7 @@ public Builder addAllPrompts(java.lang.Iterable<java.lang.String> values) {
        */
       public Builder clearPrompts() {
         prompts_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000040);
         onChanged();
         return this;
       }
@@ -5542,6 +5679,7 @@ public boolean getIsList() {
       public Builder setIsList(boolean value) {
 
         isList_ = value;
+        bitField0_ |= 0x00000080;
         onChanged();
         return this;
       }
@@ -5557,7 +5695,7 @@ public Builder setIsList(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearIsList() {
-
+        bitField0_ = (bitField0_ & ~0x00000080);
         isList_ = false;
         onChanged();
         return this;
@@ -6641,6 +6779,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int TEXT_FIELD_NUMBER = 1;
+
+      @SuppressWarnings("serial")
       private com.google.protobuf.LazyStringList text_;
       /**
        *
@@ -6908,6 +7048,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           text_ = com.google.protobuf.LazyStringArrayList.EMPTY;
           bitField0_ = (bitField0_ & ~0x00000001);
           return this;
@@ -6937,14 +7078,25 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Text build() {
         public com.google.cloud.dialogflow.v2.Intent.Message.Text buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.Text result =
               new com.google.cloud.dialogflow.v2.Intent.Message.Text(this);
-          int from_bitField0_ = bitField0_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2.Intent.Message.Text result) {
           if (((bitField0_ & 0x00000001) != 0)) {
             text_ = text_.getUnmodifiableView();
             bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.text_ = text_;
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(com.google.cloud.dialogflow.v2.Intent.Message.Text result) {
+          int from_bitField0_ = bitField0_;
         }
 
         @java.lang.Override
@@ -7397,7 +7549,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int IMAGE_URI_FIELD_NUMBER = 1;
-      private volatile java.lang.Object imageUri_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object imageUri_ = "";
       /**
        *
        *
@@ -7446,7 +7600,9 @@ public com.google.protobuf.ByteString getImageUriBytes() {
       }
 
       public static final int ACCESSIBILITY_TEXT_FIELD_NUMBER = 2;
-      private volatile java.lang.Object accessibilityText_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object accessibilityText_ = "";
       /**
        *
        *
@@ -7705,10 +7861,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           imageUri_ = "";
-
           accessibilityText_ = "";
-
           return this;
         }
 
@@ -7736,12 +7891,23 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Image build() {
         public com.google.cloud.dialogflow.v2.Intent.Message.Image buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.Image result =
               new com.google.cloud.dialogflow.v2.Intent.Message.Image(this);
-          result.imageUri_ = imageUri_;
-          result.accessibilityText_ = accessibilityText_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(com.google.cloud.dialogflow.v2.Intent.Message.Image result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.imageUri_ = imageUri_;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.accessibilityText_ = accessibilityText_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -7792,10 +7958,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.Image oth
             return this;
           if (!other.getImageUri().isEmpty()) {
             imageUri_ = other.imageUri_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (!other.getAccessibilityText().isEmpty()) {
             accessibilityText_ = other.accessibilityText_;
+            bitField0_ |= 0x00000002;
             onChanged();
           }
           this.mergeUnknownFields(other.getUnknownFields());
@@ -7827,13 +7995,13 @@ public Builder mergeFrom(
                 case 10:
                   {
                     imageUri_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
                   {
                     accessibilityText_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 18
                 default:
@@ -7853,6 +8021,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object imageUri_ = "";
         /**
          *
@@ -7914,8 +8084,8 @@ public Builder setImageUri(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           imageUri_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -7931,8 +8101,8 @@ public Builder setImageUri(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearImageUri() {
-
           imageUri_ = getDefaultInstance().getImageUri();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -7953,8 +8123,8 @@ public Builder setImageUriBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           imageUri_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -8023,8 +8193,8 @@ public Builder setAccessibilityText(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           accessibilityText_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -8041,8 +8211,8 @@ public Builder setAccessibilityText(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearAccessibilityText() {
-
           accessibilityText_ = getDefaultInstance().getAccessibilityText();
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -8064,8 +8234,8 @@ public Builder setAccessibilityTextBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           accessibilityText_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -8266,7 +8436,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int TITLE_FIELD_NUMBER = 1;
-      private volatile java.lang.Object title_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object title_ = "";
       /**
        *
        *
@@ -8315,6 +8487,8 @@ public com.google.protobuf.ByteString getTitleBytes() {
       }
 
       public static final int QUICK_REPLIES_FIELD_NUMBER = 2;
+
+      @SuppressWarnings("serial")
       private com.google.protobuf.LazyStringList quickReplies_;
       /**
        *
@@ -8591,10 +8765,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           title_ = "";
-
           quickReplies_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
@@ -8623,17 +8797,31 @@ public com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies build() {
         public com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies result =
               new com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies(this);
-          int from_bitField0_ = bitField0_;
-          result.title_ = title_;
-          if (((bitField0_ & 0x00000001) != 0)) {
-            quickReplies_ = quickReplies_.getUnmodifiableView();
-            bitField0_ = (bitField0_ & ~0x00000001);
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
           }
-          result.quickReplies_ = quickReplies_;
           onBuilt();
           return result;
         }
 
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies result) {
+          if (((bitField0_ & 0x00000002) != 0)) {
+            quickReplies_ = quickReplies_.getUnmodifiableView();
+            bitField0_ = (bitField0_ & ~0x00000002);
+          }
+          result.quickReplies_ = quickReplies_;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.title_ = title_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -8685,12 +8873,13 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.QuickRepl
             return this;
           if (!other.getTitle().isEmpty()) {
             title_ = other.title_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (!other.quickReplies_.isEmpty()) {
             if (quickReplies_.isEmpty()) {
               quickReplies_ = other.quickReplies_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
             } else {
               ensureQuickRepliesIsMutable();
               quickReplies_.addAll(other.quickReplies_);
@@ -8726,7 +8915,7 @@ public Builder mergeFrom(
                 case 10:
                   {
                     title_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
@@ -8816,8 +9005,8 @@ public Builder setTitle(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -8833,8 +9022,8 @@ public Builder setTitle(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearTitle() {
-
           title_ = getDefaultInstance().getTitle();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -8855,8 +9044,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -8865,9 +9054,9 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
             com.google.protobuf.LazyStringArrayList.EMPTY;
 
         private void ensureQuickRepliesIsMutable() {
-          if (!((bitField0_ & 0x00000001) != 0)) {
+          if (!((bitField0_ & 0x00000002) != 0)) {
             quickReplies_ = new com.google.protobuf.LazyStringArrayList(quickReplies_);
-            bitField0_ |= 0x00000001;
+            bitField0_ |= 0x00000002;
           }
         }
         /**
@@ -9002,7 +9191,7 @@ public Builder addAllQuickReplies(java.lang.Iterable<java.lang.String> values) {
          */
         public Builder clearQuickReplies() {
           quickReplies_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -9399,7 +9588,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         }
 
         public static final int TEXT_FIELD_NUMBER = 1;
-        private volatile java.lang.Object text_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object text_ = "";
         /**
          *
          *
@@ -9448,7 +9639,9 @@ public com.google.protobuf.ByteString getTextBytes() {
         }
 
         public static final int POSTBACK_FIELD_NUMBER = 2;
-        private volatile java.lang.Object postback_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object postback_ = "";
         /**
          *
          *
@@ -9709,10 +9902,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           @java.lang.Override
           public Builder clear() {
             super.clear();
+            bitField0_ = 0;
             text_ = "";
-
             postback_ = "";
-
             return this;
           }
 
@@ -9741,12 +9933,24 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Card.Button build() {
           public com.google.cloud.dialogflow.v2.Intent.Message.Card.Button buildPartial() {
             com.google.cloud.dialogflow.v2.Intent.Message.Card.Button result =
                 new com.google.cloud.dialogflow.v2.Intent.Message.Card.Button(this);
-            result.text_ = text_;
-            result.postback_ = postback_;
+            if (bitField0_ != 0) {
+              buildPartial0(result);
+            }
             onBuilt();
             return result;
           }
 
+          private void buildPartial0(
+              com.google.cloud.dialogflow.v2.Intent.Message.Card.Button result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+              result.text_ = text_;
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+              result.postback_ = postback_;
+            }
+          }
+
           @java.lang.Override
           public Builder clone() {
             return super.clone();
@@ -9799,10 +10003,12 @@ public Builder mergeFrom(
               return this;
             if (!other.getText().isEmpty()) {
               text_ = other.text_;
+              bitField0_ |= 0x00000001;
               onChanged();
             }
             if (!other.getPostback().isEmpty()) {
               postback_ = other.postback_;
+              bitField0_ |= 0x00000002;
               onChanged();
             }
             this.mergeUnknownFields(other.getUnknownFields());
@@ -9834,13 +10040,13 @@ public Builder mergeFrom(
                   case 10:
                     {
                       text_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000001;
                       break;
                     } // case 10
                   case 18:
                     {
                       postback_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000002;
                       break;
                     } // case 18
                   default:
@@ -9860,6 +10066,8 @@ public Builder mergeFrom(
             return this;
           }
 
+          private int bitField0_;
+
           private java.lang.Object text_ = "";
           /**
            *
@@ -9921,8 +10129,8 @@ public Builder setText(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             text_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
           }
@@ -9938,8 +10146,8 @@ public Builder setText(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearText() {
-
             text_ = getDefaultInstance().getText();
+            bitField0_ = (bitField0_ & ~0x00000001);
             onChanged();
             return this;
           }
@@ -9960,8 +10168,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             text_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
           }
@@ -10030,8 +10238,8 @@ public Builder setPostback(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             postback_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -10048,8 +10256,8 @@ public Builder setPostback(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearPostback() {
-
             postback_ = getDefaultInstance().getPostback();
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
             return this;
           }
@@ -10071,8 +10279,8 @@ public Builder setPostbackBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             postback_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -10145,7 +10353,9 @@ public com.google.protobuf.Parser<Button> getParserForType() {
       }
 
       public static final int TITLE_FIELD_NUMBER = 1;
-      private volatile java.lang.Object title_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object title_ = "";
       /**
        *
        *
@@ -10194,7 +10404,9 @@ public com.google.protobuf.ByteString getTitleBytes() {
       }
 
       public static final int SUBTITLE_FIELD_NUMBER = 2;
-      private volatile java.lang.Object subtitle_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object subtitle_ = "";
       /**
        *
        *
@@ -10243,7 +10455,9 @@ public com.google.protobuf.ByteString getSubtitleBytes() {
       }
 
       public static final int IMAGE_URI_FIELD_NUMBER = 3;
-      private volatile java.lang.Object imageUri_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object imageUri_ = "";
       /**
        *
        *
@@ -10292,6 +10506,8 @@ public com.google.protobuf.ByteString getImageUriBytes() {
       }
 
       public static final int BUTTONS_FIELD_NUMBER = 4;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2.Intent.Message.Card.Button> buttons_;
       /**
        *
@@ -10602,19 +10818,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           title_ = "";
-
           subtitle_ = "";
-
           imageUri_ = "";
-
           if (buttonsBuilder_ == null) {
             buttons_ = java.util.Collections.emptyList();
           } else {
             buttons_ = null;
             buttonsBuilder_.clear();
           }
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000008);
           return this;
         }
 
@@ -10642,21 +10856,38 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Card build() {
         public com.google.cloud.dialogflow.v2.Intent.Message.Card buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.Card result =
               new com.google.cloud.dialogflow.v2.Intent.Message.Card(this);
-          int from_bitField0_ = bitField0_;
-          result.title_ = title_;
-          result.subtitle_ = subtitle_;
-          result.imageUri_ = imageUri_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2.Intent.Message.Card result) {
           if (buttonsBuilder_ == null) {
-            if (((bitField0_ & 0x00000001) != 0)) {
+            if (((bitField0_ & 0x00000008) != 0)) {
               buttons_ = java.util.Collections.unmodifiableList(buttons_);
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000008);
             }
             result.buttons_ = buttons_;
           } else {
             result.buttons_ = buttonsBuilder_.build();
           }
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(com.google.cloud.dialogflow.v2.Intent.Message.Card result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.title_ = title_;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.subtitle_ = subtitle_;
+          }
+          if (((from_bitField0_ & 0x00000004) != 0)) {
+            result.imageUri_ = imageUri_;
+          }
         }
 
         @java.lang.Override
@@ -10709,21 +10940,24 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.Card othe
             return this;
           if (!other.getTitle().isEmpty()) {
             title_ = other.title_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (!other.getSubtitle().isEmpty()) {
             subtitle_ = other.subtitle_;
+            bitField0_ |= 0x00000002;
             onChanged();
           }
           if (!other.getImageUri().isEmpty()) {
             imageUri_ = other.imageUri_;
+            bitField0_ |= 0x00000004;
             onChanged();
           }
           if (buttonsBuilder_ == null) {
             if (!other.buttons_.isEmpty()) {
               if (buttons_.isEmpty()) {
                 buttons_ = other.buttons_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000008);
               } else {
                 ensureButtonsIsMutable();
                 buttons_.addAll(other.buttons_);
@@ -10736,7 +10970,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.Card othe
                 buttonsBuilder_.dispose();
                 buttonsBuilder_ = null;
                 buttons_ = other.buttons_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000008);
                 buttonsBuilder_ =
                     com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                         ? getButtonsFieldBuilder()
@@ -10775,19 +11009,19 @@ public Builder mergeFrom(
                 case 10:
                   {
                     title_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
                   {
                     subtitle_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 18
                 case 26:
                   {
                     imageUri_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000004;
                     break;
                   } // case 26
                 case 34:
@@ -10884,8 +11118,8 @@ public Builder setTitle(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -10901,8 +11135,8 @@ public Builder setTitle(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearTitle() {
-
           title_ = getDefaultInstance().getTitle();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -10923,8 +11157,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -10990,8 +11224,8 @@ public Builder setSubtitle(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           subtitle_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -11007,8 +11241,8 @@ public Builder setSubtitle(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearSubtitle() {
-
           subtitle_ = getDefaultInstance().getSubtitle();
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -11029,8 +11263,8 @@ public Builder setSubtitleBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           subtitle_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -11096,8 +11330,8 @@ public Builder setImageUri(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           imageUri_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -11113,8 +11347,8 @@ public Builder setImageUri(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearImageUri() {
-
           imageUri_ = getDefaultInstance().getImageUri();
+          bitField0_ = (bitField0_ & ~0x00000004);
           onChanged();
           return this;
         }
@@ -11135,8 +11369,8 @@ public Builder setImageUriBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           imageUri_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -11145,11 +11379,11 @@ public Builder setImageUriBytes(com.google.protobuf.ByteString value) {
             java.util.Collections.emptyList();
 
         private void ensureButtonsIsMutable() {
-          if (!((bitField0_ & 0x00000001) != 0)) {
+          if (!((bitField0_ & 0x00000008) != 0)) {
             buttons_ =
                 new java.util.ArrayList<com.google.cloud.dialogflow.v2.Intent.Message.Card.Button>(
                     buttons_);
-            bitField0_ |= 0x00000001;
+            bitField0_ |= 0x00000008;
           }
         }
 
@@ -11393,7 +11627,7 @@ public Builder addAllButtons(
         public Builder clearButtons() {
           if (buttonsBuilder_ == null) {
             buttons_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000008);
             onChanged();
           } else {
             buttonsBuilder_.clear();
@@ -11537,7 +11771,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Card.Button.Builder addButt
                     com.google.cloud.dialogflow.v2.Intent.Message.Card.Button,
                     com.google.cloud.dialogflow.v2.Intent.Message.Card.Button.Builder,
                     com.google.cloud.dialogflow.v2.Intent.Message.Card.ButtonOrBuilder>(
-                    buttons_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                    buttons_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
             buttons_ = null;
           }
           return buttonsBuilder_;
@@ -11745,7 +11979,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int TEXT_TO_SPEECH_FIELD_NUMBER = 1;
-      private volatile java.lang.Object textToSpeech_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object textToSpeech_ = "";
       /**
        *
        *
@@ -11796,7 +12032,9 @@ public com.google.protobuf.ByteString getTextToSpeechBytes() {
       }
 
       public static final int SSML_FIELD_NUMBER = 2;
-      private volatile java.lang.Object ssml_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object ssml_ = "";
       /**
        *
        *
@@ -11849,7 +12087,9 @@ public com.google.protobuf.ByteString getSsmlBytes() {
       }
 
       public static final int DISPLAY_TEXT_FIELD_NUMBER = 3;
-      private volatile java.lang.Object displayText_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object displayText_ = "";
       /**
        *
        *
@@ -12115,12 +12355,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           textToSpeech_ = "";
-
           ssml_ = "";
-
           displayText_ = "";
-
           return this;
         }
 
@@ -12149,13 +12387,27 @@ public com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponse build() {
         public com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponse buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponse result =
               new com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponse(this);
-          result.textToSpeech_ = textToSpeech_;
-          result.ssml_ = ssml_;
-          result.displayText_ = displayText_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponse result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.textToSpeech_ = textToSpeech_;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.ssml_ = ssml_;
+          }
+          if (((from_bitField0_ & 0x00000004) != 0)) {
+            result.displayText_ = displayText_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -12208,14 +12460,17 @@ public Builder mergeFrom(
             return this;
           if (!other.getTextToSpeech().isEmpty()) {
             textToSpeech_ = other.textToSpeech_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (!other.getSsml().isEmpty()) {
             ssml_ = other.ssml_;
+            bitField0_ |= 0x00000002;
             onChanged();
           }
           if (!other.getDisplayText().isEmpty()) {
             displayText_ = other.displayText_;
+            bitField0_ |= 0x00000004;
             onChanged();
           }
           this.mergeUnknownFields(other.getUnknownFields());
@@ -12247,19 +12502,19 @@ public Builder mergeFrom(
                 case 10:
                   {
                     textToSpeech_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
                   {
                     ssml_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 18
                 case 26:
                   {
                     displayText_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000004;
                     break;
                   } // case 26
                 default:
@@ -12279,6 +12534,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object textToSpeech_ = "";
         /**
          *
@@ -12343,8 +12600,8 @@ public Builder setTextToSpeech(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           textToSpeech_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -12361,8 +12618,8 @@ public Builder setTextToSpeech(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearTextToSpeech() {
-
           textToSpeech_ = getDefaultInstance().getTextToSpeech();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -12384,8 +12641,8 @@ public Builder setTextToSpeechBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           textToSpeech_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -12457,8 +12714,8 @@ public Builder setSsml(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           ssml_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -12476,8 +12733,8 @@ public Builder setSsml(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearSsml() {
-
           ssml_ = getDefaultInstance().getSsml();
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -12500,8 +12757,8 @@ public Builder setSsmlBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           ssml_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -12567,8 +12824,8 @@ public Builder setDisplayText(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           displayText_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -12584,8 +12841,8 @@ public Builder setDisplayText(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearDisplayText() {
-
           displayText_ = getDefaultInstance().getDisplayText();
+          bitField0_ = (bitField0_ & ~0x00000004);
           onChanged();
           return this;
         }
@@ -12606,8 +12863,8 @@ public Builder setDisplayTextBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           displayText_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -12802,6 +13059,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int SIMPLE_RESPONSES_FIELD_NUMBER = 1;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponse>
           simpleResponses_;
       /**
@@ -13094,6 +13353,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           if (simpleResponsesBuilder_ == null) {
             simpleResponses_ = java.util.Collections.emptyList();
           } else {
@@ -13129,7 +13389,16 @@ public com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponses build() {
         public com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponses buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponses result =
               new com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponses(this);
-          int from_bitField0_ = bitField0_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponses result) {
           if (simpleResponsesBuilder_ == null) {
             if (((bitField0_ & 0x00000001) != 0)) {
               simpleResponses_ = java.util.Collections.unmodifiableList(simpleResponses_);
@@ -13139,8 +13408,11 @@ public com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponses buildPartia
           } else {
             result.simpleResponses_ = simpleResponsesBuilder_.build();
           }
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponses result) {
+          int from_bitField0_ = bitField0_;
         }
 
         @java.lang.Override
@@ -14199,7 +14471,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
           }
 
           public static final int URI_FIELD_NUMBER = 1;
-          private volatile java.lang.Object uri_;
+
+          @SuppressWarnings("serial")
+          private volatile java.lang.Object uri_ = "";
           /**
            *
            *
@@ -14466,8 +14740,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
             @java.lang.Override
             public Builder clear() {
               super.clear();
+              bitField0_ = 0;
               uri_ = "";
-
               return this;
             }
 
@@ -14501,11 +14775,22 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
               com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button.OpenUriAction result =
                   new com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button.OpenUriAction(
                       this);
-              result.uri_ = uri_;
+              if (bitField0_ != 0) {
+                buildPartial0(result);
+              }
               onBuilt();
               return result;
             }
 
+            private void buildPartial0(
+                com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button.OpenUriAction
+                    result) {
+              int from_bitField0_ = bitField0_;
+              if (((from_bitField0_ & 0x00000001) != 0)) {
+                result.uri_ = uri_;
+              }
+            }
+
             @java.lang.Override
             public Builder clone() {
               return super.clone();
@@ -14563,6 +14848,7 @@ public Builder mergeFrom(
                       .getDefaultInstance()) return this;
               if (!other.getUri().isEmpty()) {
                 uri_ = other.uri_;
+                bitField0_ |= 0x00000001;
                 onChanged();
               }
               this.mergeUnknownFields(other.getUnknownFields());
@@ -14594,7 +14880,7 @@ public Builder mergeFrom(
                     case 10:
                       {
                         uri_ = input.readStringRequireUtf8();
-
+                        bitField0_ |= 0x00000001;
                         break;
                       } // case 10
                     default:
@@ -14614,6 +14900,8 @@ public Builder mergeFrom(
               return this;
             }
 
+            private int bitField0_;
+
             private java.lang.Object uri_ = "";
             /**
              *
@@ -14675,8 +14963,8 @@ public Builder setUri(java.lang.String value) {
               if (value == null) {
                 throw new NullPointerException();
               }
-
               uri_ = value;
+              bitField0_ |= 0x00000001;
               onChanged();
               return this;
             }
@@ -14692,8 +14980,8 @@ public Builder setUri(java.lang.String value) {
              * @return This builder for chaining.
              */
             public Builder clearUri() {
-
               uri_ = getDefaultInstance().getUri();
+              bitField0_ = (bitField0_ & ~0x00000001);
               onChanged();
               return this;
             }
@@ -14714,8 +15002,8 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
               }
               checkByteStringIsUtf8(value);
-
               uri_ = value;
+              bitField0_ |= 0x00000001;
               onChanged();
               return this;
             }
@@ -14790,7 +15078,9 @@ public com.google.protobuf.Parser<OpenUriAction> getParserForType() {
         }
 
         public static final int TITLE_FIELD_NUMBER = 1;
-        private volatile java.lang.Object title_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object title_ = "";
         /**
          *
          *
@@ -14893,7 +15183,10 @@ public boolean hasOpenUriAction() {
         @java.lang.Override
         public com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button.OpenUriActionOrBuilder
             getOpenUriActionOrBuilder() {
-          return getOpenUriAction();
+          return openUriAction_ == null
+              ? com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button.OpenUriAction
+                  .getDefaultInstance()
+              : openUriAction_;
         }
 
         private byte memoizedIsInitialized = -1;
@@ -15115,12 +15408,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           @java.lang.Override
           public Builder clear() {
             super.clear();
+            bitField0_ = 0;
             title_ = "";
-
-            if (openUriActionBuilder_ == null) {
-              openUriAction_ = null;
-            } else {
-              openUriAction_ = null;
+            openUriAction_ = null;
+            if (openUriActionBuilder_ != null) {
+              openUriActionBuilder_.dispose();
               openUriActionBuilder_ = null;
             }
             return this;
@@ -15152,16 +15444,25 @@ public com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button build() {
           public com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button buildPartial() {
             com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button result =
                 new com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button(this);
-            result.title_ = title_;
-            if (openUriActionBuilder_ == null) {
-              result.openUriAction_ = openUriAction_;
-            } else {
-              result.openUriAction_ = openUriActionBuilder_.build();
+            if (bitField0_ != 0) {
+              buildPartial0(result);
             }
             onBuilt();
             return result;
           }
 
+          private void buildPartial0(
+              com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+              result.title_ = title_;
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+              result.openUriAction_ =
+                  openUriActionBuilder_ == null ? openUriAction_ : openUriActionBuilder_.build();
+            }
+          }
+
           @java.lang.Override
           public Builder clone() {
             return super.clone();
@@ -15215,6 +15516,7 @@ public Builder mergeFrom(
                     .getDefaultInstance()) return this;
             if (!other.getTitle().isEmpty()) {
               title_ = other.title_;
+              bitField0_ |= 0x00000001;
               onChanged();
             }
             if (other.hasOpenUriAction()) {
@@ -15249,14 +15551,14 @@ public Builder mergeFrom(
                   case 10:
                     {
                       title_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000001;
                       break;
                     } // case 10
                   case 18:
                     {
                       input.readMessage(
                           getOpenUriActionFieldBuilder().getBuilder(), extensionRegistry);
-
+                      bitField0_ |= 0x00000002;
                       break;
                     } // case 18
                   default:
@@ -15276,6 +15578,8 @@ public Builder mergeFrom(
             return this;
           }
 
+          private int bitField0_;
+
           private java.lang.Object title_ = "";
           /**
            *
@@ -15337,8 +15641,8 @@ public Builder setTitle(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             title_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
           }
@@ -15354,8 +15658,8 @@ public Builder setTitle(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearTitle() {
-
             title_ = getDefaultInstance().getTitle();
+            bitField0_ = (bitField0_ & ~0x00000001);
             onChanged();
             return this;
           }
@@ -15376,8 +15680,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             title_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
           }
@@ -15405,7 +15709,7 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
            * @return Whether the openUriAction field is set.
            */
           public boolean hasOpenUriAction() {
-            return openUriActionBuilder_ != null || openUriAction_ != null;
+            return ((bitField0_ & 0x00000002) != 0);
           }
           /**
            *
@@ -15449,11 +15753,11 @@ public Builder setOpenUriAction(
                 throw new NullPointerException();
               }
               openUriAction_ = value;
-              onChanged();
             } else {
               openUriActionBuilder_.setMessage(value);
             }
-
+            bitField0_ |= 0x00000002;
+            onChanged();
             return this;
           }
           /**
@@ -15472,11 +15776,11 @@ public Builder setOpenUriAction(
                   builderForValue) {
             if (openUriActionBuilder_ == null) {
               openUriAction_ = builderForValue.build();
-              onChanged();
             } else {
               openUriActionBuilder_.setMessage(builderForValue.build());
             }
-
+            bitField0_ |= 0x00000002;
+            onChanged();
             return this;
           }
           /**
@@ -15493,20 +15797,20 @@ public Builder setOpenUriAction(
           public Builder mergeOpenUriAction(
               com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button.OpenUriAction value) {
             if (openUriActionBuilder_ == null) {
-              if (openUriAction_ != null) {
-                openUriAction_ =
-                    com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button.OpenUriAction
-                        .newBuilder(openUriAction_)
-                        .mergeFrom(value)
-                        .buildPartial();
+              if (((bitField0_ & 0x00000002) != 0)
+                  && openUriAction_ != null
+                  && openUriAction_
+                      != com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button
+                          .OpenUriAction.getDefaultInstance()) {
+                getOpenUriActionBuilder().mergeFrom(value);
               } else {
                 openUriAction_ = value;
               }
-              onChanged();
             } else {
               openUriActionBuilder_.mergeFrom(value);
             }
-
+            bitField0_ |= 0x00000002;
+            onChanged();
             return this;
           }
           /**
@@ -15521,14 +15825,13 @@ public Builder mergeOpenUriAction(
            * </code>
            */
           public Builder clearOpenUriAction() {
-            if (openUriActionBuilder_ == null) {
-              openUriAction_ = null;
-              onChanged();
-            } else {
-              openUriAction_ = null;
+            bitField0_ = (bitField0_ & ~0x00000002);
+            openUriAction_ = null;
+            if (openUriActionBuilder_ != null) {
+              openUriActionBuilder_.dispose();
               openUriActionBuilder_ = null;
             }
-
+            onChanged();
             return this;
           }
           /**
@@ -15545,7 +15848,7 @@ public Builder clearOpenUriAction() {
           public com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button.OpenUriAction
                   .Builder
               getOpenUriActionBuilder() {
-
+            bitField0_ |= 0x00000002;
             onChanged();
             return getOpenUriActionFieldBuilder().getBuilder();
           }
@@ -15672,7 +15975,9 @@ public com.google.protobuf.Parser<Button> getParserForType() {
       }
 
       public static final int TITLE_FIELD_NUMBER = 1;
-      private volatile java.lang.Object title_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object title_ = "";
       /**
        *
        *
@@ -15721,7 +16026,9 @@ public com.google.protobuf.ByteString getTitleBytes() {
       }
 
       public static final int SUBTITLE_FIELD_NUMBER = 2;
-      private volatile java.lang.Object subtitle_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object subtitle_ = "";
       /**
        *
        *
@@ -15770,7 +16077,9 @@ public com.google.protobuf.ByteString getSubtitleBytes() {
       }
 
       public static final int FORMATTED_TEXT_FIELD_NUMBER = 3;
-      private volatile java.lang.Object formattedText_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object formattedText_ = "";
       /**
        *
        *
@@ -15869,10 +16178,14 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Image getImage() {
        */
       @java.lang.Override
       public com.google.cloud.dialogflow.v2.Intent.Message.ImageOrBuilder getImageOrBuilder() {
-        return getImage();
+        return image_ == null
+            ? com.google.cloud.dialogflow.v2.Intent.Message.Image.getDefaultInstance()
+            : image_;
       }
 
       public static final int BUTTONS_FIELD_NUMBER = 5;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button>
           buttons_;
       /**
@@ -16198,16 +16511,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           title_ = "";
-
           subtitle_ = "";
-
           formattedText_ = "";
-
-          if (imageBuilder_ == null) {
-            image_ = null;
-          } else {
-            image_ = null;
+          image_ = null;
+          if (imageBuilder_ != null) {
+            imageBuilder_.dispose();
             imageBuilder_ = null;
           }
           if (buttonsBuilder_ == null) {
@@ -16216,7 +16526,7 @@ public Builder clear() {
             buttons_ = null;
             buttonsBuilder_.clear();
           }
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000010);
           return this;
         }
 
@@ -16244,26 +16554,41 @@ public com.google.cloud.dialogflow.v2.Intent.Message.BasicCard build() {
         public com.google.cloud.dialogflow.v2.Intent.Message.BasicCard buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.BasicCard result =
               new com.google.cloud.dialogflow.v2.Intent.Message.BasicCard(this);
-          int from_bitField0_ = bitField0_;
-          result.title_ = title_;
-          result.subtitle_ = subtitle_;
-          result.formattedText_ = formattedText_;
-          if (imageBuilder_ == null) {
-            result.image_ = image_;
-          } else {
-            result.image_ = imageBuilder_.build();
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
           }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2.Intent.Message.BasicCard result) {
           if (buttonsBuilder_ == null) {
-            if (((bitField0_ & 0x00000001) != 0)) {
+            if (((bitField0_ & 0x00000010) != 0)) {
               buttons_ = java.util.Collections.unmodifiableList(buttons_);
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000010);
             }
             result.buttons_ = buttons_;
           } else {
             result.buttons_ = buttonsBuilder_.build();
           }
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(com.google.cloud.dialogflow.v2.Intent.Message.BasicCard result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.title_ = title_;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.subtitle_ = subtitle_;
+          }
+          if (((from_bitField0_ & 0x00000004) != 0)) {
+            result.formattedText_ = formattedText_;
+          }
+          if (((from_bitField0_ & 0x00000008) != 0)) {
+            result.image_ = imageBuilder_ == null ? image_ : imageBuilder_.build();
+          }
         }
 
         @java.lang.Override
@@ -16316,14 +16641,17 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.BasicCard
             return this;
           if (!other.getTitle().isEmpty()) {
             title_ = other.title_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (!other.getSubtitle().isEmpty()) {
             subtitle_ = other.subtitle_;
+            bitField0_ |= 0x00000002;
             onChanged();
           }
           if (!other.getFormattedText().isEmpty()) {
             formattedText_ = other.formattedText_;
+            bitField0_ |= 0x00000004;
             onChanged();
           }
           if (other.hasImage()) {
@@ -16333,7 +16661,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.BasicCard
             if (!other.buttons_.isEmpty()) {
               if (buttons_.isEmpty()) {
                 buttons_ = other.buttons_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000010);
               } else {
                 ensureButtonsIsMutable();
                 buttons_.addAll(other.buttons_);
@@ -16346,7 +16674,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.BasicCard
                 buttonsBuilder_.dispose();
                 buttonsBuilder_ = null;
                 buttons_ = other.buttons_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000010);
                 buttonsBuilder_ =
                     com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                         ? getButtonsFieldBuilder()
@@ -16385,25 +16713,25 @@ public Builder mergeFrom(
                 case 10:
                   {
                     title_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
                   {
                     subtitle_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 18
                 case 26:
                   {
                     formattedText_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000004;
                     break;
                   } // case 26
                 case 34:
                   {
                     input.readMessage(getImageFieldBuilder().getBuilder(), extensionRegistry);
-
+                    bitField0_ |= 0x00000008;
                     break;
                   } // case 34
                 case 42:
@@ -16500,8 +16828,8 @@ public Builder setTitle(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -16517,8 +16845,8 @@ public Builder setTitle(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearTitle() {
-
           title_ = getDefaultInstance().getTitle();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -16539,8 +16867,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -16606,8 +16934,8 @@ public Builder setSubtitle(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           subtitle_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -16623,8 +16951,8 @@ public Builder setSubtitle(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearSubtitle() {
-
           subtitle_ = getDefaultInstance().getSubtitle();
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -16645,8 +16973,8 @@ public Builder setSubtitleBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           subtitle_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -16712,8 +17040,8 @@ public Builder setFormattedText(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           formattedText_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -16729,8 +17057,8 @@ public Builder setFormattedText(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearFormattedText() {
-
           formattedText_ = getDefaultInstance().getFormattedText();
+          bitField0_ = (bitField0_ & ~0x00000004);
           onChanged();
           return this;
         }
@@ -16751,8 +17079,8 @@ public Builder setFormattedTextBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           formattedText_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -16777,7 +17105,7 @@ public Builder setFormattedTextBytes(com.google.protobuf.ByteString value) {
          * @return Whether the image field is set.
          */
         public boolean hasImage() {
-          return imageBuilder_ != null || image_ != null;
+          return ((bitField0_ & 0x00000008) != 0);
         }
         /**
          *
@@ -16818,11 +17146,11 @@ public Builder setImage(com.google.cloud.dialogflow.v2.Intent.Message.Image valu
               throw new NullPointerException();
             }
             image_ = value;
-            onChanged();
           } else {
             imageBuilder_.setMessage(value);
           }
-
+          bitField0_ |= 0x00000008;
+          onChanged();
           return this;
         }
         /**
@@ -16840,11 +17168,11 @@ public Builder setImage(
             com.google.cloud.dialogflow.v2.Intent.Message.Image.Builder builderForValue) {
           if (imageBuilder_ == null) {
             image_ = builderForValue.build();
-            onChanged();
           } else {
             imageBuilder_.setMessage(builderForValue.build());
           }
-
+          bitField0_ |= 0x00000008;
+          onChanged();
           return this;
         }
         /**
@@ -16860,19 +17188,19 @@ public Builder setImage(
          */
         public Builder mergeImage(com.google.cloud.dialogflow.v2.Intent.Message.Image value) {
           if (imageBuilder_ == null) {
-            if (image_ != null) {
-              image_ =
-                  com.google.cloud.dialogflow.v2.Intent.Message.Image.newBuilder(image_)
-                      .mergeFrom(value)
-                      .buildPartial();
+            if (((bitField0_ & 0x00000008) != 0)
+                && image_ != null
+                && image_
+                    != com.google.cloud.dialogflow.v2.Intent.Message.Image.getDefaultInstance()) {
+              getImageBuilder().mergeFrom(value);
             } else {
               image_ = value;
             }
-            onChanged();
           } else {
             imageBuilder_.mergeFrom(value);
           }
-
+          bitField0_ |= 0x00000008;
+          onChanged();
           return this;
         }
         /**
@@ -16887,14 +17215,13 @@ public Builder mergeImage(com.google.cloud.dialogflow.v2.Intent.Message.Image va
          * </code>
          */
         public Builder clearImage() {
-          if (imageBuilder_ == null) {
-            image_ = null;
-            onChanged();
-          } else {
-            image_ = null;
+          bitField0_ = (bitField0_ & ~0x00000008);
+          image_ = null;
+          if (imageBuilder_ != null) {
+            imageBuilder_.dispose();
             imageBuilder_ = null;
           }
-
+          onChanged();
           return this;
         }
         /**
@@ -16909,7 +17236,7 @@ public Builder clearImage() {
          * </code>
          */
         public com.google.cloud.dialogflow.v2.Intent.Message.Image.Builder getImageBuilder() {
-
+          bitField0_ |= 0x00000008;
           onChanged();
           return getImageFieldBuilder().getBuilder();
         }
@@ -16965,11 +17292,11 @@ public com.google.cloud.dialogflow.v2.Intent.Message.ImageOrBuilder getImageOrBu
             buttons_ = java.util.Collections.emptyList();
 
         private void ensureButtonsIsMutable() {
-          if (!((bitField0_ & 0x00000001) != 0)) {
+          if (!((bitField0_ & 0x00000010) != 0)) {
             buttons_ =
                 new java.util.ArrayList<
                     com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button>(buttons_);
-            bitField0_ |= 0x00000001;
+            bitField0_ |= 0x00000010;
           }
         }
 
@@ -17219,7 +17546,7 @@ public Builder addAllButtons(
         public Builder clearButtons() {
           if (buttonsBuilder_ == null) {
             buttons_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
             onChanged();
           } else {
             buttonsBuilder_.clear();
@@ -17366,7 +17693,7 @@ public Builder removeButtons(int index) {
                     com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button,
                     com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button.Builder,
                     com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.ButtonOrBuilder>(
-                    buttons_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                    buttons_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
             buttons_ = null;
           }
           return buttonsBuilder_;
@@ -17517,7 +17844,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int TITLE_FIELD_NUMBER = 1;
-      private volatile java.lang.Object title_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object title_ = "";
       /**
        *
        *
@@ -17766,8 +18095,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           title_ = "";
-
           return this;
         }
 
@@ -17796,11 +18125,21 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Suggestion build() {
         public com.google.cloud.dialogflow.v2.Intent.Message.Suggestion buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.Suggestion result =
               new com.google.cloud.dialogflow.v2.Intent.Message.Suggestion(this);
-          result.title_ = title_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2.Intent.Message.Suggestion result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.title_ = title_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -17852,6 +18191,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.Suggestio
             return this;
           if (!other.getTitle().isEmpty()) {
             title_ = other.title_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           this.mergeUnknownFields(other.getUnknownFields());
@@ -17883,7 +18223,7 @@ public Builder mergeFrom(
                 case 10:
                   {
                     title_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 default:
@@ -17903,6 +18243,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object title_ = "";
         /**
          *
@@ -17964,8 +18306,8 @@ public Builder setTitle(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -17981,8 +18323,8 @@ public Builder setTitle(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearTitle() {
-
           title_ = getDefaultInstance().getTitle();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -18003,8 +18345,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -18192,6 +18534,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int SUGGESTIONS_FIELD_NUMBER = 1;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2.Intent.Message.Suggestion> suggestions_;
       /**
        *
@@ -18475,6 +18819,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           if (suggestionsBuilder_ == null) {
             suggestions_ = java.util.Collections.emptyList();
           } else {
@@ -18510,7 +18855,16 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Suggestions build() {
         public com.google.cloud.dialogflow.v2.Intent.Message.Suggestions buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.Suggestions result =
               new com.google.cloud.dialogflow.v2.Intent.Message.Suggestions(this);
-          int from_bitField0_ = bitField0_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2.Intent.Message.Suggestions result) {
           if (suggestionsBuilder_ == null) {
             if (((bitField0_ & 0x00000001) != 0)) {
               suggestions_ = java.util.Collections.unmodifiableList(suggestions_);
@@ -18520,8 +18874,11 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Suggestions buildPartial()
           } else {
             result.suggestions_ = suggestionsBuilder_.build();
           }
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2.Intent.Message.Suggestions result) {
+          int from_bitField0_ = bitField0_;
         }
 
         @java.lang.Override
@@ -19239,7 +19596,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int DESTINATION_NAME_FIELD_NUMBER = 1;
-      private volatile java.lang.Object destinationName_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object destinationName_ = "";
       /**
        *
        *
@@ -19288,7 +19647,9 @@ public com.google.protobuf.ByteString getDestinationNameBytes() {
       }
 
       public static final int URI_FIELD_NUMBER = 2;
-      private volatile java.lang.Object uri_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object uri_ = "";
       /**
        *
        *
@@ -19551,10 +19912,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           destinationName_ = "";
-
           uri_ = "";
-
           return this;
         }
 
@@ -19584,12 +19944,24 @@ public com.google.cloud.dialogflow.v2.Intent.Message.LinkOutSuggestion build() {
         public com.google.cloud.dialogflow.v2.Intent.Message.LinkOutSuggestion buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.LinkOutSuggestion result =
               new com.google.cloud.dialogflow.v2.Intent.Message.LinkOutSuggestion(this);
-          result.destinationName_ = destinationName_;
-          result.uri_ = uri_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2.Intent.Message.LinkOutSuggestion result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.destinationName_ = destinationName_;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.uri_ = uri_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -19643,10 +20015,12 @@ public Builder mergeFrom(
                   .getDefaultInstance()) return this;
           if (!other.getDestinationName().isEmpty()) {
             destinationName_ = other.destinationName_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (!other.getUri().isEmpty()) {
             uri_ = other.uri_;
+            bitField0_ |= 0x00000002;
             onChanged();
           }
           this.mergeUnknownFields(other.getUnknownFields());
@@ -19678,13 +20052,13 @@ public Builder mergeFrom(
                 case 10:
                   {
                     destinationName_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
                   {
                     uri_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 18
                 default:
@@ -19704,6 +20078,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object destinationName_ = "";
         /**
          *
@@ -19765,8 +20141,8 @@ public Builder setDestinationName(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           destinationName_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -19782,8 +20158,8 @@ public Builder setDestinationName(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearDestinationName() {
-
           destinationName_ = getDefaultInstance().getDestinationName();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -19804,8 +20180,8 @@ public Builder setDestinationNameBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           destinationName_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -19874,8 +20250,8 @@ public Builder setUri(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           uri_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -19892,8 +20268,8 @@ public Builder setUri(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearUri() {
-
           uri_ = getDefaultInstance().getUri();
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -19915,8 +20291,8 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           uri_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -20397,11 +20773,15 @@ public com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo getInfo() {
         @java.lang.Override
         public com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfoOrBuilder
             getInfoOrBuilder() {
-          return getInfo();
+          return info_ == null
+              ? com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo.getDefaultInstance()
+              : info_;
         }
 
         public static final int TITLE_FIELD_NUMBER = 2;
-        private volatile java.lang.Object title_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object title_ = "";
         /**
          *
          *
@@ -20450,7 +20830,9 @@ public com.google.protobuf.ByteString getTitleBytes() {
         }
 
         public static final int DESCRIPTION_FIELD_NUMBER = 3;
-        private volatile java.lang.Object description_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object description_ = "";
         /**
          *
          *
@@ -20549,7 +20931,9 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Image getImage() {
          */
         @java.lang.Override
         public com.google.cloud.dialogflow.v2.Intent.Message.ImageOrBuilder getImageOrBuilder() {
-          return getImage();
+          return image_ == null
+              ? com.google.cloud.dialogflow.v2.Intent.Message.Image.getDefaultInstance()
+              : image_;
         }
 
         private byte memoizedIsInitialized = -1;
@@ -20794,20 +21178,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           @java.lang.Override
           public Builder clear() {
             super.clear();
-            if (infoBuilder_ == null) {
-              info_ = null;
-            } else {
-              info_ = null;
+            bitField0_ = 0;
+            info_ = null;
+            if (infoBuilder_ != null) {
+              infoBuilder_.dispose();
               infoBuilder_ = null;
             }
             title_ = "";
-
             description_ = "";
-
-            if (imageBuilder_ == null) {
-              image_ = null;
-            } else {
-              image_ = null;
+            image_ = null;
+            if (imageBuilder_ != null) {
+              imageBuilder_.dispose();
               imageBuilder_ = null;
             }
             return this;
@@ -20839,22 +21220,30 @@ public com.google.cloud.dialogflow.v2.Intent.Message.ListSelect.Item build() {
           public com.google.cloud.dialogflow.v2.Intent.Message.ListSelect.Item buildPartial() {
             com.google.cloud.dialogflow.v2.Intent.Message.ListSelect.Item result =
                 new com.google.cloud.dialogflow.v2.Intent.Message.ListSelect.Item(this);
-            if (infoBuilder_ == null) {
-              result.info_ = info_;
-            } else {
-              result.info_ = infoBuilder_.build();
-            }
-            result.title_ = title_;
-            result.description_ = description_;
-            if (imageBuilder_ == null) {
-              result.image_ = image_;
-            } else {
-              result.image_ = imageBuilder_.build();
+            if (bitField0_ != 0) {
+              buildPartial0(result);
             }
             onBuilt();
             return result;
           }
 
+          private void buildPartial0(
+              com.google.cloud.dialogflow.v2.Intent.Message.ListSelect.Item result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+              result.info_ = infoBuilder_ == null ? info_ : infoBuilder_.build();
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+              result.title_ = title_;
+            }
+            if (((from_bitField0_ & 0x00000004) != 0)) {
+              result.description_ = description_;
+            }
+            if (((from_bitField0_ & 0x00000008) != 0)) {
+              result.image_ = imageBuilder_ == null ? image_ : imageBuilder_.build();
+            }
+          }
+
           @java.lang.Override
           public Builder clone() {
             return super.clone();
@@ -20911,10 +21300,12 @@ public Builder mergeFrom(
             }
             if (!other.getTitle().isEmpty()) {
               title_ = other.title_;
+              bitField0_ |= 0x00000002;
               onChanged();
             }
             if (!other.getDescription().isEmpty()) {
               description_ = other.description_;
+              bitField0_ |= 0x00000004;
               onChanged();
             }
             if (other.hasImage()) {
@@ -20949,25 +21340,25 @@ public Builder mergeFrom(
                   case 10:
                     {
                       input.readMessage(getInfoFieldBuilder().getBuilder(), extensionRegistry);
-
+                      bitField0_ |= 0x00000001;
                       break;
                     } // case 10
                   case 18:
                     {
                       title_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000002;
                       break;
                     } // case 18
                   case 26:
                     {
                       description_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000004;
                       break;
                     } // case 26
                   case 34:
                     {
                       input.readMessage(getImageFieldBuilder().getBuilder(), extensionRegistry);
-
+                      bitField0_ |= 0x00000008;
                       break;
                     } // case 34
                   default:
@@ -20987,6 +21378,8 @@ public Builder mergeFrom(
             return this;
           }
 
+          private int bitField0_;
+
           private com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo info_;
           private com.google.protobuf.SingleFieldBuilderV3<
                   com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo,
@@ -21007,7 +21400,7 @@ public Builder mergeFrom(
            * @return Whether the info field is set.
            */
           public boolean hasInfo() {
-            return infoBuilder_ != null || info_ != null;
+            return ((bitField0_ & 0x00000001) != 0);
           }
           /**
            *
@@ -21050,11 +21443,11 @@ public Builder setInfo(
                 throw new NullPointerException();
               }
               info_ = value;
-              onChanged();
             } else {
               infoBuilder_.setMessage(value);
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
           }
           /**
@@ -21073,11 +21466,11 @@ public Builder setInfo(
                   builderForValue) {
             if (infoBuilder_ == null) {
               info_ = builderForValue.build();
-              onChanged();
             } else {
               infoBuilder_.setMessage(builderForValue.build());
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
           }
           /**
@@ -21094,19 +21487,20 @@ public Builder setInfo(
           public Builder mergeInfo(
               com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo value) {
             if (infoBuilder_ == null) {
-              if (info_ != null) {
-                info_ =
-                    com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo.newBuilder(info_)
-                        .mergeFrom(value)
-                        .buildPartial();
+              if (((bitField0_ & 0x00000001) != 0)
+                  && info_ != null
+                  && info_
+                      != com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo
+                          .getDefaultInstance()) {
+                getInfoBuilder().mergeFrom(value);
               } else {
                 info_ = value;
               }
-              onChanged();
             } else {
               infoBuilder_.mergeFrom(value);
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
           }
           /**
@@ -21121,14 +21515,13 @@ public Builder mergeInfo(
            * </code>
            */
           public Builder clearInfo() {
-            if (infoBuilder_ == null) {
-              info_ = null;
-              onChanged();
-            } else {
-              info_ = null;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            info_ = null;
+            if (infoBuilder_ != null) {
+              infoBuilder_.dispose();
               infoBuilder_ = null;
             }
-
+            onChanged();
             return this;
           }
           /**
@@ -21144,7 +21537,7 @@ public Builder clearInfo() {
            */
           public com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo.Builder
               getInfoBuilder() {
-
+            bitField0_ |= 0x00000001;
             onChanged();
             return getInfoFieldBuilder().getBuilder();
           }
@@ -21259,8 +21652,8 @@ public Builder setTitle(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             title_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -21276,8 +21669,8 @@ public Builder setTitle(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearTitle() {
-
             title_ = getDefaultInstance().getTitle();
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
             return this;
           }
@@ -21298,8 +21691,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             title_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -21365,8 +21758,8 @@ public Builder setDescription(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             description_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
           }
@@ -21382,8 +21775,8 @@ public Builder setDescription(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearDescription() {
-
             description_ = getDefaultInstance().getDescription();
+            bitField0_ = (bitField0_ & ~0x00000004);
             onChanged();
             return this;
           }
@@ -21404,8 +21797,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             description_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
           }
@@ -21430,7 +21823,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
            * @return Whether the image field is set.
            */
           public boolean hasImage() {
-            return imageBuilder_ != null || image_ != null;
+            return ((bitField0_ & 0x00000008) != 0);
           }
           /**
            *
@@ -21471,11 +21864,11 @@ public Builder setImage(com.google.cloud.dialogflow.v2.Intent.Message.Image valu
                 throw new NullPointerException();
               }
               image_ = value;
-              onChanged();
             } else {
               imageBuilder_.setMessage(value);
             }
-
+            bitField0_ |= 0x00000008;
+            onChanged();
             return this;
           }
           /**
@@ -21493,11 +21886,11 @@ public Builder setImage(
               com.google.cloud.dialogflow.v2.Intent.Message.Image.Builder builderForValue) {
             if (imageBuilder_ == null) {
               image_ = builderForValue.build();
-              onChanged();
             } else {
               imageBuilder_.setMessage(builderForValue.build());
             }
-
+            bitField0_ |= 0x00000008;
+            onChanged();
             return this;
           }
           /**
@@ -21513,19 +21906,19 @@ public Builder setImage(
            */
           public Builder mergeImage(com.google.cloud.dialogflow.v2.Intent.Message.Image value) {
             if (imageBuilder_ == null) {
-              if (image_ != null) {
-                image_ =
-                    com.google.cloud.dialogflow.v2.Intent.Message.Image.newBuilder(image_)
-                        .mergeFrom(value)
-                        .buildPartial();
+              if (((bitField0_ & 0x00000008) != 0)
+                  && image_ != null
+                  && image_
+                      != com.google.cloud.dialogflow.v2.Intent.Message.Image.getDefaultInstance()) {
+                getImageBuilder().mergeFrom(value);
               } else {
                 image_ = value;
               }
-              onChanged();
             } else {
               imageBuilder_.mergeFrom(value);
             }
-
+            bitField0_ |= 0x00000008;
+            onChanged();
             return this;
           }
           /**
@@ -21540,14 +21933,13 @@ public Builder mergeImage(com.google.cloud.dialogflow.v2.Intent.Message.Image va
            * </code>
            */
           public Builder clearImage() {
-            if (imageBuilder_ == null) {
-              image_ = null;
-              onChanged();
-            } else {
-              image_ = null;
+            bitField0_ = (bitField0_ & ~0x00000008);
+            image_ = null;
+            if (imageBuilder_ != null) {
+              imageBuilder_.dispose();
               imageBuilder_ = null;
             }
-
+            onChanged();
             return this;
           }
           /**
@@ -21562,7 +21954,7 @@ public Builder clearImage() {
            * </code>
            */
           public com.google.cloud.dialogflow.v2.Intent.Message.Image.Builder getImageBuilder() {
-
+            bitField0_ |= 0x00000008;
             onChanged();
             return getImageFieldBuilder().getBuilder();
           }
@@ -21682,7 +22074,9 @@ public com.google.protobuf.Parser<Item> getParserForType() {
       }
 
       public static final int TITLE_FIELD_NUMBER = 1;
-      private volatile java.lang.Object title_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object title_ = "";
       /**
        *
        *
@@ -21731,6 +22125,8 @@ public com.google.protobuf.ByteString getTitleBytes() {
       }
 
       public static final int ITEMS_FIELD_NUMBER = 2;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2.Intent.Message.ListSelect.Item> items_;
       /**
        *
@@ -21813,7 +22209,9 @@ public com.google.cloud.dialogflow.v2.Intent.Message.ListSelect.Item getItems(in
       }
 
       public static final int SUBTITLE_FIELD_NUMBER = 3;
-      private volatile java.lang.Object subtitle_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object subtitle_ = "";
       /**
        *
        *
@@ -22081,17 +22479,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           title_ = "";
-
           if (itemsBuilder_ == null) {
             items_ = java.util.Collections.emptyList();
           } else {
             items_ = null;
             itemsBuilder_.clear();
           }
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
           subtitle_ = "";
-
           return this;
         }
 
@@ -22120,20 +22517,36 @@ public com.google.cloud.dialogflow.v2.Intent.Message.ListSelect build() {
         public com.google.cloud.dialogflow.v2.Intent.Message.ListSelect buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.ListSelect result =
               new com.google.cloud.dialogflow.v2.Intent.Message.ListSelect(this);
-          int from_bitField0_ = bitField0_;
-          result.title_ = title_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2.Intent.Message.ListSelect result) {
           if (itemsBuilder_ == null) {
-            if (((bitField0_ & 0x00000001) != 0)) {
+            if (((bitField0_ & 0x00000002) != 0)) {
               items_ = java.util.Collections.unmodifiableList(items_);
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
             }
             result.items_ = items_;
           } else {
             result.items_ = itemsBuilder_.build();
           }
-          result.subtitle_ = subtitle_;
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2.Intent.Message.ListSelect result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.title_ = title_;
+          }
+          if (((from_bitField0_ & 0x00000004) != 0)) {
+            result.subtitle_ = subtitle_;
+          }
         }
 
         @java.lang.Override
@@ -22187,13 +22600,14 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.ListSelec
             return this;
           if (!other.getTitle().isEmpty()) {
             title_ = other.title_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (itemsBuilder_ == null) {
             if (!other.items_.isEmpty()) {
               if (items_.isEmpty()) {
                 items_ = other.items_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000002);
               } else {
                 ensureItemsIsMutable();
                 items_.addAll(other.items_);
@@ -22206,7 +22620,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.ListSelec
                 itemsBuilder_.dispose();
                 itemsBuilder_ = null;
                 items_ = other.items_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000002);
                 itemsBuilder_ =
                     com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                         ? getItemsFieldBuilder()
@@ -22218,6 +22632,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.ListSelec
           }
           if (!other.getSubtitle().isEmpty()) {
             subtitle_ = other.subtitle_;
+            bitField0_ |= 0x00000004;
             onChanged();
           }
           this.mergeUnknownFields(other.getUnknownFields());
@@ -22249,7 +22664,7 @@ public Builder mergeFrom(
                 case 10:
                   {
                     title_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
@@ -22269,7 +22684,7 @@ public Builder mergeFrom(
                 case 26:
                   {
                     subtitle_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000004;
                     break;
                   } // case 26
                 default:
@@ -22352,8 +22767,8 @@ public Builder setTitle(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -22369,8 +22784,8 @@ public Builder setTitle(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearTitle() {
-
           title_ = getDefaultInstance().getTitle();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -22391,8 +22806,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -22401,11 +22816,11 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
             items_ = java.util.Collections.emptyList();
 
         private void ensureItemsIsMutable() {
-          if (!((bitField0_ & 0x00000001) != 0)) {
+          if (!((bitField0_ & 0x00000002) != 0)) {
             items_ =
                 new java.util.ArrayList<
                     com.google.cloud.dialogflow.v2.Intent.Message.ListSelect.Item>(items_);
-            bitField0_ |= 0x00000001;
+            bitField0_ |= 0x00000002;
           }
         }
 
@@ -22651,7 +23066,7 @@ public Builder addAllItems(
         public Builder clearItems() {
           if (itemsBuilder_ == null) {
             items_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
           } else {
             itemsBuilder_.clear();
@@ -22797,7 +23212,7 @@ public Builder removeItems(int index) {
                     com.google.cloud.dialogflow.v2.Intent.Message.ListSelect.Item,
                     com.google.cloud.dialogflow.v2.Intent.Message.ListSelect.Item.Builder,
                     com.google.cloud.dialogflow.v2.Intent.Message.ListSelect.ItemOrBuilder>(
-                    items_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                    items_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
             items_ = null;
           }
           return itemsBuilder_;
@@ -22864,8 +23279,8 @@ public Builder setSubtitle(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           subtitle_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -22881,8 +23296,8 @@ public Builder setSubtitle(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearSubtitle() {
-
           subtitle_ = getDefaultInstance().getSubtitle();
+          bitField0_ = (bitField0_ & ~0x00000004);
           onChanged();
           return this;
         }
@@ -22903,8 +23318,8 @@ public Builder setSubtitleBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           subtitle_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -23332,11 +23747,15 @@ public com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo getInfo() {
         @java.lang.Override
         public com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfoOrBuilder
             getInfoOrBuilder() {
-          return getInfo();
+          return info_ == null
+              ? com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo.getDefaultInstance()
+              : info_;
         }
 
         public static final int TITLE_FIELD_NUMBER = 2;
-        private volatile java.lang.Object title_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object title_ = "";
         /**
          *
          *
@@ -23385,7 +23804,9 @@ public com.google.protobuf.ByteString getTitleBytes() {
         }
 
         public static final int DESCRIPTION_FIELD_NUMBER = 3;
-        private volatile java.lang.Object description_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object description_ = "";
         /**
          *
          *
@@ -23484,7 +23905,9 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Image getImage() {
          */
         @java.lang.Override
         public com.google.cloud.dialogflow.v2.Intent.Message.ImageOrBuilder getImageOrBuilder() {
-          return getImage();
+          return image_ == null
+              ? com.google.cloud.dialogflow.v2.Intent.Message.Image.getDefaultInstance()
+              : image_;
         }
 
         private byte memoizedIsInitialized = -1;
@@ -23730,20 +24153,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           @java.lang.Override
           public Builder clear() {
             super.clear();
-            if (infoBuilder_ == null) {
-              info_ = null;
-            } else {
-              info_ = null;
+            bitField0_ = 0;
+            info_ = null;
+            if (infoBuilder_ != null) {
+              infoBuilder_.dispose();
               infoBuilder_ = null;
             }
             title_ = "";
-
             description_ = "";
-
-            if (imageBuilder_ == null) {
-              image_ = null;
-            } else {
-              image_ = null;
+            image_ = null;
+            if (imageBuilder_ != null) {
+              imageBuilder_.dispose();
               imageBuilder_ = null;
             }
             return this;
@@ -23776,22 +24196,30 @@ public com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect.Item build()
           public com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect.Item buildPartial() {
             com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect.Item result =
                 new com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect.Item(this);
-            if (infoBuilder_ == null) {
-              result.info_ = info_;
-            } else {
-              result.info_ = infoBuilder_.build();
-            }
-            result.title_ = title_;
-            result.description_ = description_;
-            if (imageBuilder_ == null) {
-              result.image_ = image_;
-            } else {
-              result.image_ = imageBuilder_.build();
+            if (bitField0_ != 0) {
+              buildPartial0(result);
             }
             onBuilt();
             return result;
           }
 
+          private void buildPartial0(
+              com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect.Item result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+              result.info_ = infoBuilder_ == null ? info_ : infoBuilder_.build();
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+              result.title_ = title_;
+            }
+            if (((from_bitField0_ & 0x00000004) != 0)) {
+              result.description_ = description_;
+            }
+            if (((from_bitField0_ & 0x00000008) != 0)) {
+              result.image_ = imageBuilder_ == null ? image_ : imageBuilder_.build();
+            }
+          }
+
           @java.lang.Override
           public Builder clone() {
             return super.clone();
@@ -23849,10 +24277,12 @@ public Builder mergeFrom(
             }
             if (!other.getTitle().isEmpty()) {
               title_ = other.title_;
+              bitField0_ |= 0x00000002;
               onChanged();
             }
             if (!other.getDescription().isEmpty()) {
               description_ = other.description_;
+              bitField0_ |= 0x00000004;
               onChanged();
             }
             if (other.hasImage()) {
@@ -23887,25 +24317,25 @@ public Builder mergeFrom(
                   case 10:
                     {
                       input.readMessage(getInfoFieldBuilder().getBuilder(), extensionRegistry);
-
+                      bitField0_ |= 0x00000001;
                       break;
                     } // case 10
                   case 18:
                     {
                       title_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000002;
                       break;
                     } // case 18
                   case 26:
                     {
                       description_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000004;
                       break;
                     } // case 26
                   case 34:
                     {
                       input.readMessage(getImageFieldBuilder().getBuilder(), extensionRegistry);
-
+                      bitField0_ |= 0x00000008;
                       break;
                     } // case 34
                   default:
@@ -23925,6 +24355,8 @@ public Builder mergeFrom(
             return this;
           }
 
+          private int bitField0_;
+
           private com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo info_;
           private com.google.protobuf.SingleFieldBuilderV3<
                   com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo,
@@ -23945,7 +24377,7 @@ public Builder mergeFrom(
            * @return Whether the info field is set.
            */
           public boolean hasInfo() {
-            return infoBuilder_ != null || info_ != null;
+            return ((bitField0_ & 0x00000001) != 0);
           }
           /**
            *
@@ -23988,11 +24420,11 @@ public Builder setInfo(
                 throw new NullPointerException();
               }
               info_ = value;
-              onChanged();
             } else {
               infoBuilder_.setMessage(value);
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
           }
           /**
@@ -24011,11 +24443,11 @@ public Builder setInfo(
                   builderForValue) {
             if (infoBuilder_ == null) {
               info_ = builderForValue.build();
-              onChanged();
             } else {
               infoBuilder_.setMessage(builderForValue.build());
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
           }
           /**
@@ -24032,19 +24464,20 @@ public Builder setInfo(
           public Builder mergeInfo(
               com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo value) {
             if (infoBuilder_ == null) {
-              if (info_ != null) {
-                info_ =
-                    com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo.newBuilder(info_)
-                        .mergeFrom(value)
-                        .buildPartial();
+              if (((bitField0_ & 0x00000001) != 0)
+                  && info_ != null
+                  && info_
+                      != com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo
+                          .getDefaultInstance()) {
+                getInfoBuilder().mergeFrom(value);
               } else {
                 info_ = value;
               }
-              onChanged();
             } else {
               infoBuilder_.mergeFrom(value);
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
           }
           /**
@@ -24059,14 +24492,13 @@ public Builder mergeInfo(
            * </code>
            */
           public Builder clearInfo() {
-            if (infoBuilder_ == null) {
-              info_ = null;
-              onChanged();
-            } else {
-              info_ = null;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            info_ = null;
+            if (infoBuilder_ != null) {
+              infoBuilder_.dispose();
               infoBuilder_ = null;
             }
-
+            onChanged();
             return this;
           }
           /**
@@ -24082,7 +24514,7 @@ public Builder clearInfo() {
            */
           public com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo.Builder
               getInfoBuilder() {
-
+            bitField0_ |= 0x00000001;
             onChanged();
             return getInfoFieldBuilder().getBuilder();
           }
@@ -24197,8 +24629,8 @@ public Builder setTitle(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             title_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -24214,8 +24646,8 @@ public Builder setTitle(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearTitle() {
-
             title_ = getDefaultInstance().getTitle();
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
             return this;
           }
@@ -24236,8 +24668,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             title_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -24303,8 +24735,8 @@ public Builder setDescription(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             description_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
           }
@@ -24320,8 +24752,8 @@ public Builder setDescription(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearDescription() {
-
             description_ = getDefaultInstance().getDescription();
+            bitField0_ = (bitField0_ & ~0x00000004);
             onChanged();
             return this;
           }
@@ -24342,8 +24774,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             description_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
           }
@@ -24368,7 +24800,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
            * @return Whether the image field is set.
            */
           public boolean hasImage() {
-            return imageBuilder_ != null || image_ != null;
+            return ((bitField0_ & 0x00000008) != 0);
           }
           /**
            *
@@ -24409,11 +24841,11 @@ public Builder setImage(com.google.cloud.dialogflow.v2.Intent.Message.Image valu
                 throw new NullPointerException();
               }
               image_ = value;
-              onChanged();
             } else {
               imageBuilder_.setMessage(value);
             }
-
+            bitField0_ |= 0x00000008;
+            onChanged();
             return this;
           }
           /**
@@ -24431,11 +24863,11 @@ public Builder setImage(
               com.google.cloud.dialogflow.v2.Intent.Message.Image.Builder builderForValue) {
             if (imageBuilder_ == null) {
               image_ = builderForValue.build();
-              onChanged();
             } else {
               imageBuilder_.setMessage(builderForValue.build());
             }
-
+            bitField0_ |= 0x00000008;
+            onChanged();
             return this;
           }
           /**
@@ -24451,19 +24883,19 @@ public Builder setImage(
            */
           public Builder mergeImage(com.google.cloud.dialogflow.v2.Intent.Message.Image value) {
             if (imageBuilder_ == null) {
-              if (image_ != null) {
-                image_ =
-                    com.google.cloud.dialogflow.v2.Intent.Message.Image.newBuilder(image_)
-                        .mergeFrom(value)
-                        .buildPartial();
+              if (((bitField0_ & 0x00000008) != 0)
+                  && image_ != null
+                  && image_
+                      != com.google.cloud.dialogflow.v2.Intent.Message.Image.getDefaultInstance()) {
+                getImageBuilder().mergeFrom(value);
               } else {
                 image_ = value;
               }
-              onChanged();
             } else {
               imageBuilder_.mergeFrom(value);
             }
-
+            bitField0_ |= 0x00000008;
+            onChanged();
             return this;
           }
           /**
@@ -24478,14 +24910,13 @@ public Builder mergeImage(com.google.cloud.dialogflow.v2.Intent.Message.Image va
            * </code>
            */
           public Builder clearImage() {
-            if (imageBuilder_ == null) {
-              image_ = null;
-              onChanged();
-            } else {
-              image_ = null;
+            bitField0_ = (bitField0_ & ~0x00000008);
+            image_ = null;
+            if (imageBuilder_ != null) {
+              imageBuilder_.dispose();
               imageBuilder_ = null;
             }
-
+            onChanged();
             return this;
           }
           /**
@@ -24500,7 +24931,7 @@ public Builder clearImage() {
            * </code>
            */
           public com.google.cloud.dialogflow.v2.Intent.Message.Image.Builder getImageBuilder() {
-
+            bitField0_ |= 0x00000008;
             onChanged();
             return getImageFieldBuilder().getBuilder();
           }
@@ -24621,6 +25052,8 @@ public com.google.protobuf.Parser<Item> getParserForType() {
       }
 
       public static final int ITEMS_FIELD_NUMBER = 1;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect.Item>
           items_;
       /**
@@ -24905,6 +25338,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           if (itemsBuilder_ == null) {
             items_ = java.util.Collections.emptyList();
           } else {
@@ -24940,7 +25374,16 @@ public com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect build() {
         public com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect result =
               new com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect(this);
-          int from_bitField0_ = bitField0_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect result) {
           if (itemsBuilder_ == null) {
             if (((bitField0_ & 0x00000001) != 0)) {
               items_ = java.util.Collections.unmodifiableList(items_);
@@ -24950,8 +25393,11 @@ public com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect buildPartial
           } else {
             result.items_ = itemsBuilder_.build();
           }
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect result) {
+          int from_bitField0_ = bitField0_;
         }
 
         @java.lang.Override
@@ -25709,7 +26155,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int KEY_FIELD_NUMBER = 1;
-      private volatile java.lang.Object key_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object key_ = "";
       /**
        *
        *
@@ -25760,6 +26208,8 @@ public com.google.protobuf.ByteString getKeyBytes() {
       }
 
       public static final int SYNONYMS_FIELD_NUMBER = 2;
+
+      @SuppressWarnings("serial")
       private com.google.protobuf.LazyStringList synonyms_;
       /**
        *
@@ -26041,10 +26491,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           key_ = "";
-
           synonyms_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
@@ -26073,17 +26523,31 @@ public com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo build() {
         public com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo result =
               new com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo(this);
-          int from_bitField0_ = bitField0_;
-          result.key_ = key_;
-          if (((bitField0_ & 0x00000001) != 0)) {
-            synonyms_ = synonyms_.getUnmodifiableView();
-            bitField0_ = (bitField0_ & ~0x00000001);
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
           }
-          result.synonyms_ = synonyms_;
           onBuilt();
           return result;
         }
 
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo result) {
+          if (((bitField0_ & 0x00000002) != 0)) {
+            synonyms_ = synonyms_.getUnmodifiableView();
+            bitField0_ = (bitField0_ & ~0x00000002);
+          }
+          result.synonyms_ = synonyms_;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.key_ = key_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -26136,12 +26600,13 @@ public Builder mergeFrom(
             return this;
           if (!other.getKey().isEmpty()) {
             key_ = other.key_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (!other.synonyms_.isEmpty()) {
             if (synonyms_.isEmpty()) {
               synonyms_ = other.synonyms_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
             } else {
               ensureSynonymsIsMutable();
               synonyms_.addAll(other.synonyms_);
@@ -26177,7 +26642,7 @@ public Builder mergeFrom(
                 case 10:
                   {
                     key_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
@@ -26270,8 +26735,8 @@ public Builder setKey(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           key_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -26288,8 +26753,8 @@ public Builder setKey(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearKey() {
-
           key_ = getDefaultInstance().getKey();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -26311,8 +26776,8 @@ public Builder setKeyBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           key_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -26321,9 +26786,9 @@ public Builder setKeyBytes(com.google.protobuf.ByteString value) {
             com.google.protobuf.LazyStringArrayList.EMPTY;
 
         private void ensureSynonymsIsMutable() {
-          if (!((bitField0_ & 0x00000001) != 0)) {
+          if (!((bitField0_ & 0x00000002) != 0)) {
             synonyms_ = new com.google.protobuf.LazyStringArrayList(synonyms_);
-            bitField0_ |= 0x00000001;
+            bitField0_ |= 0x00000002;
           }
         }
         /**
@@ -26466,7 +26931,7 @@ public Builder addAllSynonyms(java.lang.Iterable<java.lang.String> values) {
          */
         public Builder clearSynonyms() {
           synonyms_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -27123,7 +27588,9 @@ public ImageCase getImageCase() {
         }
 
         public static final int NAME_FIELD_NUMBER = 1;
-        private volatile java.lang.Object name_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object name_ = "";
         /**
          *
          *
@@ -27172,7 +27639,9 @@ public com.google.protobuf.ByteString getNameBytes() {
         }
 
         public static final int DESCRIPTION_FIELD_NUMBER = 2;
-        private volatile java.lang.Object description_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object description_ = "";
         /**
          *
          *
@@ -27336,7 +27805,9 @@ public com.google.cloud.dialogflow.v2.Intent.Message.ImageOrBuilder getIconOrBui
         }
 
         public static final int CONTENT_URL_FIELD_NUMBER = 5;
-        private volatile java.lang.Object contentUrl_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object contentUrl_ = "";
         /**
          *
          *
@@ -27660,10 +28131,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           @java.lang.Override
           public Builder clear() {
             super.clear();
+            bitField0_ = 0;
             name_ = "";
-
             description_ = "";
-
             if (largeImageBuilder_ != null) {
               largeImageBuilder_.clear();
             }
@@ -27671,7 +28141,6 @@ public Builder clear() {
               iconBuilder_.clear();
             }
             contentUrl_ = "";
-
             imageCase_ = 0;
             image_ = null;
             return this;
@@ -27707,28 +28176,42 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
             com.google.cloud.dialogflow.v2.Intent.Message.MediaContent.ResponseMediaObject result =
                 new com.google.cloud.dialogflow.v2.Intent.Message.MediaContent.ResponseMediaObject(
                     this);
-            result.name_ = name_;
-            result.description_ = description_;
-            if (imageCase_ == 3) {
-              if (largeImageBuilder_ == null) {
-                result.image_ = image_;
-              } else {
-                result.image_ = largeImageBuilder_.build();
-              }
+            if (bitField0_ != 0) {
+              buildPartial0(result);
             }
-            if (imageCase_ == 4) {
-              if (iconBuilder_ == null) {
-                result.image_ = image_;
-              } else {
-                result.image_ = iconBuilder_.build();
-              }
-            }
-            result.contentUrl_ = contentUrl_;
-            result.imageCase_ = imageCase_;
+            buildPartialOneofs(result);
             onBuilt();
             return result;
           }
 
+          private void buildPartial0(
+              com.google.cloud.dialogflow.v2.Intent.Message.MediaContent.ResponseMediaObject
+                  result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+              result.name_ = name_;
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+              result.description_ = description_;
+            }
+            if (((from_bitField0_ & 0x00000010) != 0)) {
+              result.contentUrl_ = contentUrl_;
+            }
+          }
+
+          private void buildPartialOneofs(
+              com.google.cloud.dialogflow.v2.Intent.Message.MediaContent.ResponseMediaObject
+                  result) {
+            result.imageCase_ = imageCase_;
+            result.image_ = this.image_;
+            if (imageCase_ == 3 && largeImageBuilder_ != null) {
+              result.image_ = largeImageBuilder_.build();
+            }
+            if (imageCase_ == 4 && iconBuilder_ != null) {
+              result.image_ = iconBuilder_.build();
+            }
+          }
+
           @java.lang.Override
           public Builder clone() {
             return super.clone();
@@ -27786,14 +28269,17 @@ public Builder mergeFrom(
                     .getDefaultInstance()) return this;
             if (!other.getName().isEmpty()) {
               name_ = other.name_;
+              bitField0_ |= 0x00000001;
               onChanged();
             }
             if (!other.getDescription().isEmpty()) {
               description_ = other.description_;
+              bitField0_ |= 0x00000002;
               onChanged();
             }
             if (!other.getContentUrl().isEmpty()) {
               contentUrl_ = other.contentUrl_;
+              bitField0_ |= 0x00000010;
               onChanged();
             }
             switch (other.getImageCase()) {
@@ -27841,13 +28327,13 @@ public Builder mergeFrom(
                   case 10:
                     {
                       name_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000001;
                       break;
                     } // case 10
                   case 18:
                     {
                       description_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000002;
                       break;
                     } // case 18
                   case 26:
@@ -27866,7 +28352,7 @@ public Builder mergeFrom(
                   case 42:
                     {
                       contentUrl_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000010;
                       break;
                     } // case 42
                   default:
@@ -27900,6 +28386,8 @@ public Builder clearImage() {
             return this;
           }
 
+          private int bitField0_;
+
           private java.lang.Object name_ = "";
           /**
            *
@@ -27961,8 +28449,8 @@ public Builder setName(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             name_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
           }
@@ -27978,8 +28466,8 @@ public Builder setName(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearName() {
-
             name_ = getDefaultInstance().getName();
+            bitField0_ = (bitField0_ & ~0x00000001);
             onChanged();
             return this;
           }
@@ -28000,8 +28488,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             name_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
           }
@@ -28067,8 +28555,8 @@ public Builder setDescription(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             description_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -28084,8 +28572,8 @@ public Builder setDescription(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearDescription() {
-
             description_ = getDefaultInstance().getDescription();
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
             return this;
           }
@@ -28106,8 +28594,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             description_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -28340,7 +28828,6 @@ public Builder clearLargeImage() {
             }
             imageCase_ = 3;
             onChanged();
-            ;
             return largeImageBuilder_;
           }
 
@@ -28569,7 +29056,6 @@ public com.google.cloud.dialogflow.v2.Intent.Message.ImageOrBuilder getIconOrBui
             }
             imageCase_ = 4;
             onChanged();
-            ;
             return iconBuilder_;
           }
 
@@ -28634,8 +29120,8 @@ public Builder setContentUrl(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             contentUrl_ = value;
+            bitField0_ |= 0x00000010;
             onChanged();
             return this;
           }
@@ -28651,8 +29137,8 @@ public Builder setContentUrl(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearContentUrl() {
-
             contentUrl_ = getDefaultInstance().getContentUrl();
+            bitField0_ = (bitField0_ & ~0x00000010);
             onChanged();
             return this;
           }
@@ -28673,8 +29159,8 @@ public Builder setContentUrlBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             contentUrl_ = value;
+            bitField0_ |= 0x00000010;
             onChanged();
             return this;
           }
@@ -28749,7 +29235,7 @@ public com.google.protobuf.Parser<ResponseMediaObject> getParserForType() {
       }
 
       public static final int MEDIA_TYPE_FIELD_NUMBER = 1;
-      private int mediaType_;
+      private int mediaType_ = 0;
       /**
        *
        *
@@ -28783,9 +29269,8 @@ public int getMediaTypeValue() {
       @java.lang.Override
       public com.google.cloud.dialogflow.v2.Intent.Message.MediaContent.ResponseMediaType
           getMediaType() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.dialogflow.v2.Intent.Message.MediaContent.ResponseMediaType result =
-            com.google.cloud.dialogflow.v2.Intent.Message.MediaContent.ResponseMediaType.valueOf(
+            com.google.cloud.dialogflow.v2.Intent.Message.MediaContent.ResponseMediaType.forNumber(
                 mediaType_);
         return result == null
             ? com.google.cloud.dialogflow.v2.Intent.Message.MediaContent.ResponseMediaType
@@ -28794,6 +29279,8 @@ public int getMediaTypeValue() {
       }
 
       public static final int MEDIA_OBJECTS_FIELD_NUMBER = 2;
+
+      @SuppressWarnings("serial")
       private java.util.List<
               com.google.cloud.dialogflow.v2.Intent.Message.MediaContent.ResponseMediaObject>
           mediaObjects_;
@@ -29098,15 +29585,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           mediaType_ = 0;
-
           if (mediaObjectsBuilder_ == null) {
             mediaObjects_ = java.util.Collections.emptyList();
           } else {
             mediaObjects_ = null;
             mediaObjectsBuilder_.clear();
           }
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
@@ -29135,19 +29622,33 @@ public com.google.cloud.dialogflow.v2.Intent.Message.MediaContent build() {
         public com.google.cloud.dialogflow.v2.Intent.Message.MediaContent buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.MediaContent result =
               new com.google.cloud.dialogflow.v2.Intent.Message.MediaContent(this);
-          int from_bitField0_ = bitField0_;
-          result.mediaType_ = mediaType_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2.Intent.Message.MediaContent result) {
           if (mediaObjectsBuilder_ == null) {
-            if (((bitField0_ & 0x00000001) != 0)) {
+            if (((bitField0_ & 0x00000002) != 0)) {
               mediaObjects_ = java.util.Collections.unmodifiableList(mediaObjects_);
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
             }
             result.mediaObjects_ = mediaObjects_;
           } else {
             result.mediaObjects_ = mediaObjectsBuilder_.build();
           }
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2.Intent.Message.MediaContent result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.mediaType_ = mediaType_;
+          }
         }
 
         @java.lang.Override
@@ -29206,7 +29707,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.MediaCont
             if (!other.mediaObjects_.isEmpty()) {
               if (mediaObjects_.isEmpty()) {
                 mediaObjects_ = other.mediaObjects_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000002);
               } else {
                 ensureMediaObjectsIsMutable();
                 mediaObjects_.addAll(other.mediaObjects_);
@@ -29219,7 +29720,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.MediaCont
                 mediaObjectsBuilder_.dispose();
                 mediaObjectsBuilder_ = null;
                 mediaObjects_ = other.mediaObjects_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000002);
                 mediaObjectsBuilder_ =
                     com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                         ? getMediaObjectsFieldBuilder()
@@ -29258,7 +29759,7 @@ public Builder mergeFrom(
                 case 8:
                   {
                     mediaType_ = input.readEnum();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 8
                 case 18:
@@ -29329,8 +29830,8 @@ public int getMediaTypeValue() {
          * @return This builder for chaining.
          */
         public Builder setMediaTypeValue(int value) {
-
           mediaType_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -29350,10 +29851,9 @@ public Builder setMediaTypeValue(int value) {
         @java.lang.Override
         public com.google.cloud.dialogflow.v2.Intent.Message.MediaContent.ResponseMediaType
             getMediaType() {
-          @SuppressWarnings("deprecation")
           com.google.cloud.dialogflow.v2.Intent.Message.MediaContent.ResponseMediaType result =
-              com.google.cloud.dialogflow.v2.Intent.Message.MediaContent.ResponseMediaType.valueOf(
-                  mediaType_);
+              com.google.cloud.dialogflow.v2.Intent.Message.MediaContent.ResponseMediaType
+                  .forNumber(mediaType_);
           return result == null
               ? com.google.cloud.dialogflow.v2.Intent.Message.MediaContent.ResponseMediaType
                   .UNRECOGNIZED
@@ -29378,7 +29878,7 @@ public Builder setMediaType(
           if (value == null) {
             throw new NullPointerException();
           }
-
+          bitField0_ |= 0x00000001;
           mediaType_ = value.getNumber();
           onChanged();
           return this;
@@ -29397,7 +29897,7 @@ public Builder setMediaType(
          * @return This builder for chaining.
          */
         public Builder clearMediaType() {
-
+          bitField0_ = (bitField0_ & ~0x00000001);
           mediaType_ = 0;
           onChanged();
           return this;
@@ -29408,12 +29908,12 @@ public Builder clearMediaType() {
             mediaObjects_ = java.util.Collections.emptyList();
 
         private void ensureMediaObjectsIsMutable() {
-          if (!((bitField0_ & 0x00000001) != 0)) {
+          if (!((bitField0_ & 0x00000002) != 0)) {
             mediaObjects_ =
                 new java.util.ArrayList<
                     com.google.cloud.dialogflow.v2.Intent.Message.MediaContent.ResponseMediaObject>(
                     mediaObjects_);
-            bitField0_ |= 0x00000001;
+            bitField0_ |= 0x00000002;
           }
         }
 
@@ -29670,7 +30170,7 @@ public Builder addAllMediaObjects(
         public Builder clearMediaObjects() {
           if (mediaObjectsBuilder_ == null) {
             mediaObjects_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
           } else {
             mediaObjectsBuilder_.clear();
@@ -29829,7 +30329,7 @@ public Builder removeMediaObjects(int index) {
                     com.google.cloud.dialogflow.v2.Intent.Message.MediaContent
                         .ResponseMediaObjectOrBuilder>(
                     mediaObjects_,
-                    ((bitField0_ & 0x00000001) != 0),
+                    ((bitField0_ & 0x00000002) != 0),
                     getParentForChildren(),
                     isClean());
             mediaObjects_ = null;
@@ -30805,7 +31305,9 @@ private UrlTypeHint(int value) {
           }
 
           public static final int URL_FIELD_NUMBER = 1;
-          private volatile java.lang.Object url_;
+
+          @SuppressWarnings("serial")
+          private volatile java.lang.Object url_ = "";
           /**
            *
            *
@@ -30854,7 +31356,7 @@ public com.google.protobuf.ByteString getUrlBytes() {
           }
 
           public static final int URL_TYPE_HINT_FIELD_NUMBER = 3;
-          private int urlTypeHint_;
+          private int urlTypeHint_ = 0;
           /**
            *
            *
@@ -30891,12 +31393,11 @@ public int getUrlTypeHintValue() {
           public com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard
                   .BrowseCarouselCardItem.OpenUrlAction.UrlTypeHint
               getUrlTypeHint() {
-            @SuppressWarnings("deprecation")
             com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard.BrowseCarouselCardItem
                     .OpenUrlAction.UrlTypeHint
                 result =
                     com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard
-                        .BrowseCarouselCardItem.OpenUrlAction.UrlTypeHint.valueOf(urlTypeHint_);
+                        .BrowseCarouselCardItem.OpenUrlAction.UrlTypeHint.forNumber(urlTypeHint_);
             return result == null
                 ? com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard
                     .BrowseCarouselCardItem.OpenUrlAction.UrlTypeHint.UNRECOGNIZED
@@ -31155,10 +31656,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
             @java.lang.Override
             public Builder clear() {
               super.clear();
+              bitField0_ = 0;
               url_ = "";
-
               urlTypeHint_ = 0;
-
               return this;
             }
 
@@ -31198,12 +31698,26 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
                   result =
                       new com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard
                           .BrowseCarouselCardItem.OpenUrlAction(this);
-              result.url_ = url_;
-              result.urlTypeHint_ = urlTypeHint_;
+              if (bitField0_ != 0) {
+                buildPartial0(result);
+              }
               onBuilt();
               return result;
             }
 
+            private void buildPartial0(
+                com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard
+                        .BrowseCarouselCardItem.OpenUrlAction
+                    result) {
+              int from_bitField0_ = bitField0_;
+              if (((from_bitField0_ & 0x00000001) != 0)) {
+                result.url_ = url_;
+              }
+              if (((from_bitField0_ & 0x00000002) != 0)) {
+                result.urlTypeHint_ = urlTypeHint_;
+              }
+            }
+
             @java.lang.Override
             public Builder clone() {
               return super.clone();
@@ -31264,6 +31778,7 @@ public Builder mergeFrom(
                       .BrowseCarouselCardItem.OpenUrlAction.getDefaultInstance()) return this;
               if (!other.getUrl().isEmpty()) {
                 url_ = other.url_;
+                bitField0_ |= 0x00000001;
                 onChanged();
               }
               if (other.urlTypeHint_ != 0) {
@@ -31298,13 +31813,13 @@ public Builder mergeFrom(
                     case 10:
                       {
                         url_ = input.readStringRequireUtf8();
-
+                        bitField0_ |= 0x00000001;
                         break;
                       } // case 10
                     case 24:
                       {
                         urlTypeHint_ = input.readEnum();
-
+                        bitField0_ |= 0x00000002;
                         break;
                       } // case 24
                     default:
@@ -31324,6 +31839,8 @@ public Builder mergeFrom(
               return this;
             }
 
+            private int bitField0_;
+
             private java.lang.Object url_ = "";
             /**
              *
@@ -31385,8 +31902,8 @@ public Builder setUrl(java.lang.String value) {
               if (value == null) {
                 throw new NullPointerException();
               }
-
               url_ = value;
+              bitField0_ |= 0x00000001;
               onChanged();
               return this;
             }
@@ -31402,8 +31919,8 @@ public Builder setUrl(java.lang.String value) {
              * @return This builder for chaining.
              */
             public Builder clearUrl() {
-
               url_ = getDefaultInstance().getUrl();
+              bitField0_ = (bitField0_ & ~0x00000001);
               onChanged();
               return this;
             }
@@ -31424,8 +31941,8 @@ public Builder setUrlBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
               }
               checkByteStringIsUtf8(value);
-
               url_ = value;
+              bitField0_ |= 0x00000001;
               onChanged();
               return this;
             }
@@ -31465,8 +31982,8 @@ public int getUrlTypeHintValue() {
              * @return This builder for chaining.
              */
             public Builder setUrlTypeHintValue(int value) {
-
               urlTypeHint_ = value;
+              bitField0_ |= 0x00000002;
               onChanged();
               return this;
             }
@@ -31488,12 +32005,11 @@ public Builder setUrlTypeHintValue(int value) {
             public com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard
                     .BrowseCarouselCardItem.OpenUrlAction.UrlTypeHint
                 getUrlTypeHint() {
-              @SuppressWarnings("deprecation")
               com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard
                       .BrowseCarouselCardItem.OpenUrlAction.UrlTypeHint
                   result =
                       com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard
-                          .BrowseCarouselCardItem.OpenUrlAction.UrlTypeHint.valueOf(urlTypeHint_);
+                          .BrowseCarouselCardItem.OpenUrlAction.UrlTypeHint.forNumber(urlTypeHint_);
               return result == null
                   ? com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard
                       .BrowseCarouselCardItem.OpenUrlAction.UrlTypeHint.UNRECOGNIZED
@@ -31521,7 +32037,7 @@ public Builder setUrlTypeHint(
               if (value == null) {
                 throw new NullPointerException();
               }
-
+              bitField0_ |= 0x00000002;
               urlTypeHint_ = value.getNumber();
               onChanged();
               return this;
@@ -31541,7 +32057,7 @@ public Builder setUrlTypeHint(
              * @return This builder for chaining.
              */
             public Builder clearUrlTypeHint() {
-
+              bitField0_ = (bitField0_ & ~0x00000002);
               urlTypeHint_ = 0;
               onChanged();
               return this;
@@ -31677,11 +32193,16 @@ public boolean hasOpenUriAction() {
         public com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard
                 .BrowseCarouselCardItem.OpenUrlActionOrBuilder
             getOpenUriActionOrBuilder() {
-          return getOpenUriAction();
+          return openUriAction_ == null
+              ? com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard
+                  .BrowseCarouselCardItem.OpenUrlAction.getDefaultInstance()
+              : openUriAction_;
         }
 
         public static final int TITLE_FIELD_NUMBER = 2;
-        private volatile java.lang.Object title_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object title_ = "";
         /**
          *
          *
@@ -31730,7 +32251,9 @@ public com.google.protobuf.ByteString getTitleBytes() {
         }
 
         public static final int DESCRIPTION_FIELD_NUMBER = 3;
-        private volatile java.lang.Object description_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object description_ = "";
         /**
          *
          *
@@ -31831,11 +32354,15 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Image getImage() {
          */
         @java.lang.Override
         public com.google.cloud.dialogflow.v2.Intent.Message.ImageOrBuilder getImageOrBuilder() {
-          return getImage();
+          return image_ == null
+              ? com.google.cloud.dialogflow.v2.Intent.Message.Image.getDefaultInstance()
+              : image_;
         }
 
         public static final int FOOTER_FIELD_NUMBER = 5;
-        private volatile java.lang.Object footer_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object footer_ = "";
         /**
          *
          *
@@ -32166,24 +32693,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           @java.lang.Override
           public Builder clear() {
             super.clear();
-            if (openUriActionBuilder_ == null) {
-              openUriAction_ = null;
-            } else {
-              openUriAction_ = null;
+            bitField0_ = 0;
+            openUriAction_ = null;
+            if (openUriActionBuilder_ != null) {
+              openUriActionBuilder_.dispose();
               openUriActionBuilder_ = null;
             }
             title_ = "";
-
             description_ = "";
-
-            if (imageBuilder_ == null) {
-              image_ = null;
-            } else {
-              image_ = null;
+            image_ = null;
+            if (imageBuilder_ != null) {
+              imageBuilder_.dispose();
               imageBuilder_ = null;
             }
             footer_ = "";
-
             return this;
           }
 
@@ -32221,23 +32744,36 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
                 result =
                     new com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard
                         .BrowseCarouselCardItem(this);
-            if (openUriActionBuilder_ == null) {
-              result.openUriAction_ = openUriAction_;
-            } else {
-              result.openUriAction_ = openUriActionBuilder_.build();
-            }
-            result.title_ = title_;
-            result.description_ = description_;
-            if (imageBuilder_ == null) {
-              result.image_ = image_;
-            } else {
-              result.image_ = imageBuilder_.build();
+            if (bitField0_ != 0) {
+              buildPartial0(result);
             }
-            result.footer_ = footer_;
             onBuilt();
             return result;
           }
 
+          private void buildPartial0(
+              com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard
+                      .BrowseCarouselCardItem
+                  result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+              result.openUriAction_ =
+                  openUriActionBuilder_ == null ? openUriAction_ : openUriActionBuilder_.build();
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+              result.title_ = title_;
+            }
+            if (((from_bitField0_ & 0x00000004) != 0)) {
+              result.description_ = description_;
+            }
+            if (((from_bitField0_ & 0x00000008) != 0)) {
+              result.image_ = imageBuilder_ == null ? image_ : imageBuilder_.build();
+            }
+            if (((from_bitField0_ & 0x00000010) != 0)) {
+              result.footer_ = footer_;
+            }
+          }
+
           @java.lang.Override
           public Builder clone() {
             return super.clone();
@@ -32301,10 +32837,12 @@ public Builder mergeFrom(
             }
             if (!other.getTitle().isEmpty()) {
               title_ = other.title_;
+              bitField0_ |= 0x00000002;
               onChanged();
             }
             if (!other.getDescription().isEmpty()) {
               description_ = other.description_;
+              bitField0_ |= 0x00000004;
               onChanged();
             }
             if (other.hasImage()) {
@@ -32312,6 +32850,7 @@ public Builder mergeFrom(
             }
             if (!other.getFooter().isEmpty()) {
               footer_ = other.footer_;
+              bitField0_ |= 0x00000010;
               onChanged();
             }
             this.mergeUnknownFields(other.getUnknownFields());
@@ -32344,31 +32883,31 @@ public Builder mergeFrom(
                     {
                       input.readMessage(
                           getOpenUriActionFieldBuilder().getBuilder(), extensionRegistry);
-
+                      bitField0_ |= 0x00000001;
                       break;
                     } // case 10
                   case 18:
                     {
                       title_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000002;
                       break;
                     } // case 18
                   case 26:
                     {
                       description_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000004;
                       break;
                     } // case 26
                   case 34:
                     {
                       input.readMessage(getImageFieldBuilder().getBuilder(), extensionRegistry);
-
+                      bitField0_ |= 0x00000008;
                       break;
                     } // case 34
                   case 42:
                     {
                       footer_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000010;
                       break;
                     } // case 42
                   default:
@@ -32388,6 +32927,8 @@ public Builder mergeFrom(
             return this;
           }
 
+          private int bitField0_;
+
           private com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard
                   .BrowseCarouselCardItem.OpenUrlAction
               openUriAction_;
@@ -32413,7 +32954,7 @@ public Builder mergeFrom(
            * @return Whether the openUriAction field is set.
            */
           public boolean hasOpenUriAction() {
-            return openUriActionBuilder_ != null || openUriAction_ != null;
+            return ((bitField0_ & 0x00000001) != 0);
           }
           /**
            *
@@ -32460,11 +33001,11 @@ public Builder setOpenUriAction(
                 throw new NullPointerException();
               }
               openUriAction_ = value;
-              onChanged();
             } else {
               openUriActionBuilder_.setMessage(value);
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
           }
           /**
@@ -32484,11 +33025,11 @@ public Builder setOpenUriAction(
                   builderForValue) {
             if (openUriActionBuilder_ == null) {
               openUriAction_ = builderForValue.build();
-              onChanged();
             } else {
               openUriActionBuilder_.setMessage(builderForValue.build());
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
           }
           /**
@@ -32507,20 +33048,20 @@ public Builder mergeOpenUriAction(
                       .BrowseCarouselCardItem.OpenUrlAction
                   value) {
             if (openUriActionBuilder_ == null) {
-              if (openUriAction_ != null) {
-                openUriAction_ =
-                    com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard
-                        .BrowseCarouselCardItem.OpenUrlAction.newBuilder(openUriAction_)
-                        .mergeFrom(value)
-                        .buildPartial();
+              if (((bitField0_ & 0x00000001) != 0)
+                  && openUriAction_ != null
+                  && openUriAction_
+                      != com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard
+                          .BrowseCarouselCardItem.OpenUrlAction.getDefaultInstance()) {
+                getOpenUriActionBuilder().mergeFrom(value);
               } else {
                 openUriAction_ = value;
               }
-              onChanged();
             } else {
               openUriActionBuilder_.mergeFrom(value);
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
           }
           /**
@@ -32535,14 +33076,13 @@ public Builder mergeOpenUriAction(
            * </code>
            */
           public Builder clearOpenUriAction() {
-            if (openUriActionBuilder_ == null) {
-              openUriAction_ = null;
-              onChanged();
-            } else {
-              openUriAction_ = null;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            openUriAction_ = null;
+            if (openUriActionBuilder_ != null) {
+              openUriActionBuilder_.dispose();
               openUriActionBuilder_ = null;
             }
-
+            onChanged();
             return this;
           }
           /**
@@ -32559,7 +33099,7 @@ public Builder clearOpenUriAction() {
           public com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard
                   .BrowseCarouselCardItem.OpenUrlAction.Builder
               getOpenUriActionBuilder() {
-
+            bitField0_ |= 0x00000001;
             onChanged();
             return getOpenUriActionFieldBuilder().getBuilder();
           }
@@ -32681,8 +33221,8 @@ public Builder setTitle(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             title_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -32698,8 +33238,8 @@ public Builder setTitle(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearTitle() {
-
             title_ = getDefaultInstance().getTitle();
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
             return this;
           }
@@ -32720,8 +33260,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             title_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -32790,8 +33330,8 @@ public Builder setDescription(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             description_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
           }
@@ -32808,8 +33348,8 @@ public Builder setDescription(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearDescription() {
-
             description_ = getDefaultInstance().getDescription();
+            bitField0_ = (bitField0_ & ~0x00000004);
             onChanged();
             return this;
           }
@@ -32831,8 +33371,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             description_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
           }
@@ -32857,7 +33397,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
            * @return Whether the image field is set.
            */
           public boolean hasImage() {
-            return imageBuilder_ != null || image_ != null;
+            return ((bitField0_ & 0x00000008) != 0);
           }
           /**
            *
@@ -32898,11 +33438,11 @@ public Builder setImage(com.google.cloud.dialogflow.v2.Intent.Message.Image valu
                 throw new NullPointerException();
               }
               image_ = value;
-              onChanged();
             } else {
               imageBuilder_.setMessage(value);
             }
-
+            bitField0_ |= 0x00000008;
+            onChanged();
             return this;
           }
           /**
@@ -32920,11 +33460,11 @@ public Builder setImage(
               com.google.cloud.dialogflow.v2.Intent.Message.Image.Builder builderForValue) {
             if (imageBuilder_ == null) {
               image_ = builderForValue.build();
-              onChanged();
             } else {
               imageBuilder_.setMessage(builderForValue.build());
             }
-
+            bitField0_ |= 0x00000008;
+            onChanged();
             return this;
           }
           /**
@@ -32940,19 +33480,19 @@ public Builder setImage(
            */
           public Builder mergeImage(com.google.cloud.dialogflow.v2.Intent.Message.Image value) {
             if (imageBuilder_ == null) {
-              if (image_ != null) {
-                image_ =
-                    com.google.cloud.dialogflow.v2.Intent.Message.Image.newBuilder(image_)
-                        .mergeFrom(value)
-                        .buildPartial();
+              if (((bitField0_ & 0x00000008) != 0)
+                  && image_ != null
+                  && image_
+                      != com.google.cloud.dialogflow.v2.Intent.Message.Image.getDefaultInstance()) {
+                getImageBuilder().mergeFrom(value);
               } else {
                 image_ = value;
               }
-              onChanged();
             } else {
               imageBuilder_.mergeFrom(value);
             }
-
+            bitField0_ |= 0x00000008;
+            onChanged();
             return this;
           }
           /**
@@ -32967,14 +33507,13 @@ public Builder mergeImage(com.google.cloud.dialogflow.v2.Intent.Message.Image va
            * </code>
            */
           public Builder clearImage() {
-            if (imageBuilder_ == null) {
-              image_ = null;
-              onChanged();
-            } else {
-              image_ = null;
+            bitField0_ = (bitField0_ & ~0x00000008);
+            image_ = null;
+            if (imageBuilder_ != null) {
+              imageBuilder_.dispose();
               imageBuilder_ = null;
             }
-
+            onChanged();
             return this;
           }
           /**
@@ -32989,7 +33528,7 @@ public Builder clearImage() {
            * </code>
            */
           public com.google.cloud.dialogflow.v2.Intent.Message.Image.Builder getImageBuilder() {
-
+            bitField0_ |= 0x00000008;
             onChanged();
             return getImageFieldBuilder().getBuilder();
           }
@@ -33105,8 +33644,8 @@ public Builder setFooter(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             footer_ = value;
+            bitField0_ |= 0x00000010;
             onChanged();
             return this;
           }
@@ -33123,8 +33662,8 @@ public Builder setFooter(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearFooter() {
-
             footer_ = getDefaultInstance().getFooter();
+            bitField0_ = (bitField0_ & ~0x00000010);
             onChanged();
             return this;
           }
@@ -33146,8 +33685,8 @@ public Builder setFooterBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             footer_ = value;
+            bitField0_ |= 0x00000010;
             onChanged();
             return this;
           }
@@ -33225,6 +33764,8 @@ public com.google.protobuf.Parser<BrowseCarouselCardItem> getParserForType() {
       }
 
       public static final int ITEMS_FIELD_NUMBER = 1;
+
+      @SuppressWarnings("serial")
       private java.util.List<
               com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard
                   .BrowseCarouselCardItem>
@@ -33321,7 +33862,7 @@ public int getItemsCount() {
       }
 
       public static final int IMAGE_DISPLAY_OPTIONS_FIELD_NUMBER = 2;
-      private int imageDisplayOptions_;
+      private int imageDisplayOptions_ = 0;
       /**
        *
        *
@@ -33357,11 +33898,10 @@ public int getImageDisplayOptionsValue() {
       @java.lang.Override
       public com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard.ImageDisplayOptions
           getImageDisplayOptions() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard.ImageDisplayOptions
             result =
                 com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard.ImageDisplayOptions
-                    .valueOf(imageDisplayOptions_);
+                    .forNumber(imageDisplayOptions_);
         return result == null
             ? com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard.ImageDisplayOptions
                 .UNRECOGNIZED
@@ -33589,6 +34129,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           if (itemsBuilder_ == null) {
             items_ = java.util.Collections.emptyList();
           } else {
@@ -33597,7 +34138,6 @@ public Builder clear() {
           }
           bitField0_ = (bitField0_ & ~0x00000001);
           imageDisplayOptions_ = 0;
-
           return this;
         }
 
@@ -33627,7 +34167,16 @@ public com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard build()
         public com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard result =
               new com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard(this);
-          int from_bitField0_ = bitField0_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard result) {
           if (itemsBuilder_ == null) {
             if (((bitField0_ & 0x00000001) != 0)) {
               items_ = java.util.Collections.unmodifiableList(items_);
@@ -33637,9 +34186,14 @@ public com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard buildPar
           } else {
             result.items_ = itemsBuilder_.build();
           }
-          result.imageDisplayOptions_ = imageDisplayOptions_;
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.imageDisplayOptions_ = imageDisplayOptions_;
+          }
         }
 
         @java.lang.Override
@@ -33769,7 +34323,7 @@ public Builder mergeFrom(
                 case 16:
                   {
                     imageDisplayOptions_ = input.readEnum();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 16
                 default:
@@ -34287,8 +34841,8 @@ public int getImageDisplayOptionsValue() {
          * @return This builder for chaining.
          */
         public Builder setImageDisplayOptionsValue(int value) {
-
           imageDisplayOptions_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -34309,11 +34863,10 @@ public Builder setImageDisplayOptionsValue(int value) {
         @java.lang.Override
         public com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard.ImageDisplayOptions
             getImageDisplayOptions() {
-          @SuppressWarnings("deprecation")
           com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard.ImageDisplayOptions
               result =
                   com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard
-                      .ImageDisplayOptions.valueOf(imageDisplayOptions_);
+                      .ImageDisplayOptions.forNumber(imageDisplayOptions_);
           return result == null
               ? com.google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard.ImageDisplayOptions
                   .UNRECOGNIZED
@@ -34340,7 +34893,7 @@ public Builder setImageDisplayOptions(
           if (value == null) {
             throw new NullPointerException();
           }
-
+          bitField0_ |= 0x00000002;
           imageDisplayOptions_ = value.getNumber();
           onChanged();
           return this;
@@ -34360,7 +34913,7 @@ public Builder setImageDisplayOptions(
          * @return This builder for chaining.
          */
         public Builder clearImageDisplayOptions() {
-
+          bitField0_ = (bitField0_ & ~0x00000002);
           imageDisplayOptions_ = 0;
           onChanged();
           return this;
@@ -34776,7 +35329,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int TITLE_FIELD_NUMBER = 1;
-      private volatile java.lang.Object title_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object title_ = "";
       /**
        *
        *
@@ -34825,7 +35380,9 @@ public com.google.protobuf.ByteString getTitleBytes() {
       }
 
       public static final int SUBTITLE_FIELD_NUMBER = 2;
-      private volatile java.lang.Object subtitle_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object subtitle_ = "";
       /**
        *
        *
@@ -34924,10 +35481,14 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Image getImage() {
        */
       @java.lang.Override
       public com.google.cloud.dialogflow.v2.Intent.Message.ImageOrBuilder getImageOrBuilder() {
-        return getImage();
+        return image_ == null
+            ? com.google.cloud.dialogflow.v2.Intent.Message.Image.getDefaultInstance()
+            : image_;
       }
 
       public static final int COLUMN_PROPERTIES_FIELD_NUMBER = 4;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2.Intent.Message.ColumnProperties>
           columnProperties_;
       /**
@@ -35012,6 +35573,8 @@ public com.google.cloud.dialogflow.v2.Intent.Message.ColumnProperties getColumnP
       }
 
       public static final int ROWS_FIELD_NUMBER = 5;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2.Intent.Message.TableCardRow> rows_;
       /**
        *
@@ -35094,6 +35657,8 @@ public com.google.cloud.dialogflow.v2.Intent.Message.TableCardRowOrBuilder getRo
       }
 
       public static final int BUTTONS_FIELD_NUMBER = 6;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button>
           buttons_;
       /**
@@ -35433,14 +35998,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           title_ = "";
-
           subtitle_ = "";
-
-          if (imageBuilder_ == null) {
-            image_ = null;
-          } else {
-            image_ = null;
+          image_ = null;
+          if (imageBuilder_ != null) {
+            imageBuilder_.dispose();
             imageBuilder_ = null;
           }
           if (columnPropertiesBuilder_ == null) {
@@ -35449,21 +36012,21 @@ public Builder clear() {
             columnProperties_ = null;
             columnPropertiesBuilder_.clear();
           }
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000008);
           if (rowsBuilder_ == null) {
             rows_ = java.util.Collections.emptyList();
           } else {
             rows_ = null;
             rowsBuilder_.clear();
           }
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000010);
           if (buttonsBuilder_ == null) {
             buttons_ = java.util.Collections.emptyList();
           } else {
             buttons_ = null;
             buttonsBuilder_.clear();
           }
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000020);
           return this;
         }
 
@@ -35491,43 +36054,56 @@ public com.google.cloud.dialogflow.v2.Intent.Message.TableCard build() {
         public com.google.cloud.dialogflow.v2.Intent.Message.TableCard buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.TableCard result =
               new com.google.cloud.dialogflow.v2.Intent.Message.TableCard(this);
-          int from_bitField0_ = bitField0_;
-          result.title_ = title_;
-          result.subtitle_ = subtitle_;
-          if (imageBuilder_ == null) {
-            result.image_ = image_;
-          } else {
-            result.image_ = imageBuilder_.build();
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
           }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2.Intent.Message.TableCard result) {
           if (columnPropertiesBuilder_ == null) {
-            if (((bitField0_ & 0x00000001) != 0)) {
+            if (((bitField0_ & 0x00000008) != 0)) {
               columnProperties_ = java.util.Collections.unmodifiableList(columnProperties_);
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000008);
             }
             result.columnProperties_ = columnProperties_;
           } else {
             result.columnProperties_ = columnPropertiesBuilder_.build();
           }
           if (rowsBuilder_ == null) {
-            if (((bitField0_ & 0x00000002) != 0)) {
+            if (((bitField0_ & 0x00000010) != 0)) {
               rows_ = java.util.Collections.unmodifiableList(rows_);
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000010);
             }
             result.rows_ = rows_;
           } else {
             result.rows_ = rowsBuilder_.build();
           }
           if (buttonsBuilder_ == null) {
-            if (((bitField0_ & 0x00000004) != 0)) {
+            if (((bitField0_ & 0x00000020) != 0)) {
               buttons_ = java.util.Collections.unmodifiableList(buttons_);
-              bitField0_ = (bitField0_ & ~0x00000004);
+              bitField0_ = (bitField0_ & ~0x00000020);
             }
             result.buttons_ = buttons_;
           } else {
             result.buttons_ = buttonsBuilder_.build();
           }
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(com.google.cloud.dialogflow.v2.Intent.Message.TableCard result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.title_ = title_;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.subtitle_ = subtitle_;
+          }
+          if (((from_bitField0_ & 0x00000004) != 0)) {
+            result.image_ = imageBuilder_ == null ? image_ : imageBuilder_.build();
+          }
         }
 
         @java.lang.Override
@@ -35580,10 +36156,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.TableCard
             return this;
           if (!other.getTitle().isEmpty()) {
             title_ = other.title_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (!other.getSubtitle().isEmpty()) {
             subtitle_ = other.subtitle_;
+            bitField0_ |= 0x00000002;
             onChanged();
           }
           if (other.hasImage()) {
@@ -35593,7 +36171,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.TableCard
             if (!other.columnProperties_.isEmpty()) {
               if (columnProperties_.isEmpty()) {
                 columnProperties_ = other.columnProperties_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000008);
               } else {
                 ensureColumnPropertiesIsMutable();
                 columnProperties_.addAll(other.columnProperties_);
@@ -35606,7 +36184,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.TableCard
                 columnPropertiesBuilder_.dispose();
                 columnPropertiesBuilder_ = null;
                 columnProperties_ = other.columnProperties_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000008);
                 columnPropertiesBuilder_ =
                     com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                         ? getColumnPropertiesFieldBuilder()
@@ -35620,7 +36198,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.TableCard
             if (!other.rows_.isEmpty()) {
               if (rows_.isEmpty()) {
                 rows_ = other.rows_;
-                bitField0_ = (bitField0_ & ~0x00000002);
+                bitField0_ = (bitField0_ & ~0x00000010);
               } else {
                 ensureRowsIsMutable();
                 rows_.addAll(other.rows_);
@@ -35633,7 +36211,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.TableCard
                 rowsBuilder_.dispose();
                 rowsBuilder_ = null;
                 rows_ = other.rows_;
-                bitField0_ = (bitField0_ & ~0x00000002);
+                bitField0_ = (bitField0_ & ~0x00000010);
                 rowsBuilder_ =
                     com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                         ? getRowsFieldBuilder()
@@ -35647,7 +36225,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.TableCard
             if (!other.buttons_.isEmpty()) {
               if (buttons_.isEmpty()) {
                 buttons_ = other.buttons_;
-                bitField0_ = (bitField0_ & ~0x00000004);
+                bitField0_ = (bitField0_ & ~0x00000020);
               } else {
                 ensureButtonsIsMutable();
                 buttons_.addAll(other.buttons_);
@@ -35660,7 +36238,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.TableCard
                 buttonsBuilder_.dispose();
                 buttonsBuilder_ = null;
                 buttons_ = other.buttons_;
-                bitField0_ = (bitField0_ & ~0x00000004);
+                bitField0_ = (bitField0_ & ~0x00000020);
                 buttonsBuilder_ =
                     com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                         ? getButtonsFieldBuilder()
@@ -35699,19 +36277,19 @@ public Builder mergeFrom(
                 case 10:
                   {
                     title_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
                   {
                     subtitle_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 18
                 case 26:
                   {
                     input.readMessage(getImageFieldBuilder().getBuilder(), extensionRegistry);
-
+                    bitField0_ |= 0x00000004;
                     break;
                   } // case 26
                 case 34:
@@ -35836,8 +36414,8 @@ public Builder setTitle(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -35853,8 +36431,8 @@ public Builder setTitle(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearTitle() {
-
           title_ = getDefaultInstance().getTitle();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -35875,8 +36453,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -35942,8 +36520,8 @@ public Builder setSubtitle(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           subtitle_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -35959,8 +36537,8 @@ public Builder setSubtitle(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearSubtitle() {
-
           subtitle_ = getDefaultInstance().getSubtitle();
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -35981,8 +36559,8 @@ public Builder setSubtitleBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           subtitle_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -36007,7 +36585,7 @@ public Builder setSubtitleBytes(com.google.protobuf.ByteString value) {
          * @return Whether the image field is set.
          */
         public boolean hasImage() {
-          return imageBuilder_ != null || image_ != null;
+          return ((bitField0_ & 0x00000004) != 0);
         }
         /**
          *
@@ -36048,11 +36626,11 @@ public Builder setImage(com.google.cloud.dialogflow.v2.Intent.Message.Image valu
               throw new NullPointerException();
             }
             image_ = value;
-            onChanged();
           } else {
             imageBuilder_.setMessage(value);
           }
-
+          bitField0_ |= 0x00000004;
+          onChanged();
           return this;
         }
         /**
@@ -36070,11 +36648,11 @@ public Builder setImage(
             com.google.cloud.dialogflow.v2.Intent.Message.Image.Builder builderForValue) {
           if (imageBuilder_ == null) {
             image_ = builderForValue.build();
-            onChanged();
           } else {
             imageBuilder_.setMessage(builderForValue.build());
           }
-
+          bitField0_ |= 0x00000004;
+          onChanged();
           return this;
         }
         /**
@@ -36090,19 +36668,19 @@ public Builder setImage(
          */
         public Builder mergeImage(com.google.cloud.dialogflow.v2.Intent.Message.Image value) {
           if (imageBuilder_ == null) {
-            if (image_ != null) {
-              image_ =
-                  com.google.cloud.dialogflow.v2.Intent.Message.Image.newBuilder(image_)
-                      .mergeFrom(value)
-                      .buildPartial();
+            if (((bitField0_ & 0x00000004) != 0)
+                && image_ != null
+                && image_
+                    != com.google.cloud.dialogflow.v2.Intent.Message.Image.getDefaultInstance()) {
+              getImageBuilder().mergeFrom(value);
             } else {
               image_ = value;
             }
-            onChanged();
           } else {
             imageBuilder_.mergeFrom(value);
           }
-
+          bitField0_ |= 0x00000004;
+          onChanged();
           return this;
         }
         /**
@@ -36117,14 +36695,13 @@ public Builder mergeImage(com.google.cloud.dialogflow.v2.Intent.Message.Image va
          * </code>
          */
         public Builder clearImage() {
-          if (imageBuilder_ == null) {
-            image_ = null;
-            onChanged();
-          } else {
-            image_ = null;
+          bitField0_ = (bitField0_ & ~0x00000004);
+          image_ = null;
+          if (imageBuilder_ != null) {
+            imageBuilder_.dispose();
             imageBuilder_ = null;
           }
-
+          onChanged();
           return this;
         }
         /**
@@ -36139,7 +36716,7 @@ public Builder clearImage() {
          * </code>
          */
         public com.google.cloud.dialogflow.v2.Intent.Message.Image.Builder getImageBuilder() {
-
+          bitField0_ |= 0x00000004;
           onChanged();
           return getImageFieldBuilder().getBuilder();
         }
@@ -36195,12 +36772,12 @@ public com.google.cloud.dialogflow.v2.Intent.Message.ImageOrBuilder getImageOrBu
             columnProperties_ = java.util.Collections.emptyList();
 
         private void ensureColumnPropertiesIsMutable() {
-          if (!((bitField0_ & 0x00000001) != 0)) {
+          if (!((bitField0_ & 0x00000008) != 0)) {
             columnProperties_ =
                 new java.util.ArrayList<
                     com.google.cloud.dialogflow.v2.Intent.Message.ColumnProperties>(
                     columnProperties_);
-            bitField0_ |= 0x00000001;
+            bitField0_ |= 0x00000008;
           }
         }
 
@@ -36450,7 +37027,7 @@ public Builder addAllColumnProperties(
         public Builder clearColumnProperties() {
           if (columnPropertiesBuilder_ == null) {
             columnProperties_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000008);
             onChanged();
           } else {
             columnPropertiesBuilder_.clear();
@@ -36598,7 +37175,7 @@ public Builder removeColumnProperties(int index) {
                     com.google.cloud.dialogflow.v2.Intent.Message.ColumnProperties.Builder,
                     com.google.cloud.dialogflow.v2.Intent.Message.ColumnPropertiesOrBuilder>(
                     columnProperties_,
-                    ((bitField0_ & 0x00000001) != 0),
+                    ((bitField0_ & 0x00000008) != 0),
                     getParentForChildren(),
                     isClean());
             columnProperties_ = null;
@@ -36610,11 +37187,11 @@ public Builder removeColumnProperties(int index) {
             java.util.Collections.emptyList();
 
         private void ensureRowsIsMutable() {
-          if (!((bitField0_ & 0x00000002) != 0)) {
+          if (!((bitField0_ & 0x00000010) != 0)) {
             rows_ =
                 new java.util.ArrayList<com.google.cloud.dialogflow.v2.Intent.Message.TableCardRow>(
                     rows_);
-            bitField0_ |= 0x00000002;
+            bitField0_ |= 0x00000010;
           }
         }
 
@@ -36858,7 +37435,7 @@ public Builder addAllRows(
         public Builder clearRows() {
           if (rowsBuilder_ == null) {
             rows_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000010);
             onChanged();
           } else {
             rowsBuilder_.clear();
@@ -37001,7 +37578,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.TableCardRow.Builder addRow
                     com.google.cloud.dialogflow.v2.Intent.Message.TableCardRow,
                     com.google.cloud.dialogflow.v2.Intent.Message.TableCardRow.Builder,
                     com.google.cloud.dialogflow.v2.Intent.Message.TableCardRowOrBuilder>(
-                    rows_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                    rows_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
             rows_ = null;
           }
           return rowsBuilder_;
@@ -37011,11 +37588,11 @@ public com.google.cloud.dialogflow.v2.Intent.Message.TableCardRow.Builder addRow
             buttons_ = java.util.Collections.emptyList();
 
         private void ensureButtonsIsMutable() {
-          if (!((bitField0_ & 0x00000004) != 0)) {
+          if (!((bitField0_ & 0x00000020) != 0)) {
             buttons_ =
                 new java.util.ArrayList<
                     com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button>(buttons_);
-            bitField0_ |= 0x00000004;
+            bitField0_ |= 0x00000020;
           }
         }
 
@@ -37265,7 +37842,7 @@ public Builder addAllButtons(
         public Builder clearButtons() {
           if (buttonsBuilder_ == null) {
             buttons_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000020);
             onChanged();
           } else {
             buttonsBuilder_.clear();
@@ -37412,7 +37989,7 @@ public Builder removeButtons(int index) {
                     com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button,
                     com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button.Builder,
                     com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.ButtonOrBuilder>(
-                    buttons_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
+                    buttons_, ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean());
             buttons_ = null;
           }
           return buttonsBuilder_;
@@ -37546,7 +38123,8 @@ public interface ColumnPropertiesOrBuilder
      *
      *
      * <pre>
-     * Column properties for [TableCard][google.cloud.dialogflow.v2.Intent.Message.TableCard].
+     * Column properties for
+     * [TableCard][google.cloud.dialogflow.v2.Intent.Message.TableCard].
      * </pre>
      *
      * Protobuf type {@code google.cloud.dialogflow.v2.Intent.Message.ColumnProperties}
@@ -37779,7 +38357,9 @@ private HorizontalAlignment(int value) {
       }
 
       public static final int HEADER_FIELD_NUMBER = 1;
-      private volatile java.lang.Object header_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object header_ = "";
       /**
        *
        *
@@ -37828,7 +38408,7 @@ public com.google.protobuf.ByteString getHeaderBytes() {
       }
 
       public static final int HORIZONTAL_ALIGNMENT_FIELD_NUMBER = 2;
-      private int horizontalAlignment_;
+      private int horizontalAlignment_ = 0;
       /**
        *
        *
@@ -37862,10 +38442,9 @@ public int getHorizontalAlignmentValue() {
       @java.lang.Override
       public com.google.cloud.dialogflow.v2.Intent.Message.ColumnProperties.HorizontalAlignment
           getHorizontalAlignment() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.dialogflow.v2.Intent.Message.ColumnProperties.HorizontalAlignment result =
             com.google.cloud.dialogflow.v2.Intent.Message.ColumnProperties.HorizontalAlignment
-                .valueOf(horizontalAlignment_);
+                .forNumber(horizontalAlignment_);
         return result == null
             ? com.google.cloud.dialogflow.v2.Intent.Message.ColumnProperties.HorizontalAlignment
                 .UNRECOGNIZED
@@ -38054,7 +38633,8 @@ protected Builder newBuilderForType(
        *
        *
        * <pre>
-       * Column properties for [TableCard][google.cloud.dialogflow.v2.Intent.Message.TableCard].
+       * Column properties for
+       * [TableCard][google.cloud.dialogflow.v2.Intent.Message.TableCard].
        * </pre>
        *
        * Protobuf type {@code google.cloud.dialogflow.v2.Intent.Message.ColumnProperties}
@@ -38090,10 +38670,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           header_ = "";
-
           horizontalAlignment_ = 0;
-
           return this;
         }
 
@@ -38123,12 +38702,24 @@ public com.google.cloud.dialogflow.v2.Intent.Message.ColumnProperties build() {
         public com.google.cloud.dialogflow.v2.Intent.Message.ColumnProperties buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.ColumnProperties result =
               new com.google.cloud.dialogflow.v2.Intent.Message.ColumnProperties(this);
-          result.header_ = header_;
-          result.horizontalAlignment_ = horizontalAlignment_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2.Intent.Message.ColumnProperties result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.header_ = header_;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.horizontalAlignment_ = horizontalAlignment_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -38182,6 +38773,7 @@ public Builder mergeFrom(
                   .getDefaultInstance()) return this;
           if (!other.getHeader().isEmpty()) {
             header_ = other.header_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (other.horizontalAlignment_ != 0) {
@@ -38216,13 +38808,13 @@ public Builder mergeFrom(
                 case 10:
                   {
                     header_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 16:
                   {
                     horizontalAlignment_ = input.readEnum();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 16
                 default:
@@ -38242,6 +38834,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object header_ = "";
         /**
          *
@@ -38303,8 +38897,8 @@ public Builder setHeader(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           header_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -38320,8 +38914,8 @@ public Builder setHeader(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearHeader() {
-
           header_ = getDefaultInstance().getHeader();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -38342,8 +38936,8 @@ public Builder setHeaderBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           header_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -38381,8 +38975,8 @@ public int getHorizontalAlignmentValue() {
          * @return This builder for chaining.
          */
         public Builder setHorizontalAlignmentValue(int value) {
-
           horizontalAlignment_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -38402,11 +38996,10 @@ public Builder setHorizontalAlignmentValue(int value) {
         @java.lang.Override
         public com.google.cloud.dialogflow.v2.Intent.Message.ColumnProperties.HorizontalAlignment
             getHorizontalAlignment() {
-          @SuppressWarnings("deprecation")
           com.google.cloud.dialogflow.v2.Intent.Message.ColumnProperties.HorizontalAlignment
               result =
                   com.google.cloud.dialogflow.v2.Intent.Message.ColumnProperties.HorizontalAlignment
-                      .valueOf(horizontalAlignment_);
+                      .forNumber(horizontalAlignment_);
           return result == null
               ? com.google.cloud.dialogflow.v2.Intent.Message.ColumnProperties.HorizontalAlignment
                   .UNRECOGNIZED
@@ -38432,7 +39025,7 @@ public Builder setHorizontalAlignment(
           if (value == null) {
             throw new NullPointerException();
           }
-
+          bitField0_ |= 0x00000002;
           horizontalAlignment_ = value.getNumber();
           onChanged();
           return this;
@@ -38451,7 +39044,7 @@ public Builder setHorizontalAlignment(
          * @return This builder for chaining.
          */
         public Builder clearHorizontalAlignment() {
-
+          bitField0_ = (bitField0_ & ~0x00000002);
           horizontalAlignment_ = 0;
           onChanged();
           return this;
@@ -38655,6 +39248,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int CELLS_FIELD_NUMBER = 1;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2.Intent.Message.TableCardCell> cells_;
       /**
        *
@@ -38737,7 +39332,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.TableCardCellOrBuilder getC
       }
 
       public static final int DIVIDER_AFTER_FIELD_NUMBER = 2;
-      private boolean dividerAfter_;
+      private boolean dividerAfter_ = false;
       /**
        *
        *
@@ -38965,6 +39560,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           if (cellsBuilder_ == null) {
             cells_ = java.util.Collections.emptyList();
           } else {
@@ -38973,7 +39569,6 @@ public Builder clear() {
           }
           bitField0_ = (bitField0_ & ~0x00000001);
           dividerAfter_ = false;
-
           return this;
         }
 
@@ -39002,7 +39597,16 @@ public com.google.cloud.dialogflow.v2.Intent.Message.TableCardRow build() {
         public com.google.cloud.dialogflow.v2.Intent.Message.TableCardRow buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.TableCardRow result =
               new com.google.cloud.dialogflow.v2.Intent.Message.TableCardRow(this);
-          int from_bitField0_ = bitField0_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2.Intent.Message.TableCardRow result) {
           if (cellsBuilder_ == null) {
             if (((bitField0_ & 0x00000001) != 0)) {
               cells_ = java.util.Collections.unmodifiableList(cells_);
@@ -39012,9 +39616,14 @@ public com.google.cloud.dialogflow.v2.Intent.Message.TableCardRow buildPartial()
           } else {
             result.cells_ = cellsBuilder_.build();
           }
-          result.dividerAfter_ = dividerAfter_;
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2.Intent.Message.TableCardRow result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.dividerAfter_ = dividerAfter_;
+          }
         }
 
         @java.lang.Override
@@ -39139,7 +39748,7 @@ public Builder mergeFrom(
                 case 16:
                   {
                     dividerAfter_ = input.readBool();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 16
                 default:
@@ -39595,6 +40204,7 @@ public boolean getDividerAfter() {
         public Builder setDividerAfter(boolean value) {
 
           dividerAfter_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -39610,7 +40220,7 @@ public Builder setDividerAfter(boolean value) {
          * @return This builder for chaining.
          */
         public Builder clearDividerAfter() {
-
+          bitField0_ = (bitField0_ & ~0x00000002);
           dividerAfter_ = false;
           onChanged();
           return this;
@@ -39717,7 +40327,8 @@ public interface TableCardCellOrBuilder
      *
      *
      * <pre>
-     * Cell of [TableCardRow][google.cloud.dialogflow.v2.Intent.Message.TableCardRow].
+     * Cell of
+     * [TableCardRow][google.cloud.dialogflow.v2.Intent.Message.TableCardRow].
      * </pre>
      *
      * Protobuf type {@code google.cloud.dialogflow.v2.Intent.Message.TableCardCell}
@@ -39763,7 +40374,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int TEXT_FIELD_NUMBER = 1;
-      private volatile java.lang.Object text_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object text_ = "";
       /**
        *
        *
@@ -39976,7 +40589,8 @@ protected Builder newBuilderForType(
        *
        *
        * <pre>
-       * Cell of [TableCardRow][google.cloud.dialogflow.v2.Intent.Message.TableCardRow].
+       * Cell of
+       * [TableCardRow][google.cloud.dialogflow.v2.Intent.Message.TableCardRow].
        * </pre>
        *
        * Protobuf type {@code google.cloud.dialogflow.v2.Intent.Message.TableCardCell}
@@ -40011,8 +40625,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           text_ = "";
-
           return this;
         }
 
@@ -40041,11 +40655,21 @@ public com.google.cloud.dialogflow.v2.Intent.Message.TableCardCell build() {
         public com.google.cloud.dialogflow.v2.Intent.Message.TableCardCell buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.TableCardCell result =
               new com.google.cloud.dialogflow.v2.Intent.Message.TableCardCell(this);
-          result.text_ = text_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2.Intent.Message.TableCardCell result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.text_ = text_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -40098,6 +40722,7 @@ public Builder mergeFrom(
             return this;
           if (!other.getText().isEmpty()) {
             text_ = other.text_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           this.mergeUnknownFields(other.getUnknownFields());
@@ -40129,7 +40754,7 @@ public Builder mergeFrom(
                 case 10:
                   {
                     text_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 default:
@@ -40149,6 +40774,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object text_ = "";
         /**
          *
@@ -40210,8 +40837,8 @@ public Builder setText(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           text_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -40227,8 +40854,8 @@ public Builder setText(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearText() {
-
           text_ = getDefaultInstance().getText();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -40249,8 +40876,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           text_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -41140,7 +41767,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.MediaContent getMediaConten
     }
 
     public static final int PLATFORM_FIELD_NUMBER = 6;
-    private int platform_;
+    private int platform_ = 0;
     /**
      *
      *
@@ -41173,9 +41800,8 @@ public int getPlatformValue() {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.Intent.Message.Platform getPlatform() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.Intent.Message.Platform result =
-          com.google.cloud.dialogflow.v2.Intent.Message.Platform.valueOf(platform_);
+          com.google.cloud.dialogflow.v2.Intent.Message.Platform.forNumber(platform_);
       return result == null
           ? com.google.cloud.dialogflow.v2.Intent.Message.Platform.UNRECOGNIZED
           : result;
@@ -41615,6 +42241,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (textBuilder_ != null) {
           textBuilder_.clear();
         }
@@ -41658,7 +42285,6 @@ public Builder clear() {
           mediaContentBuilder_.clear();
         }
         platform_ = 0;
-
         messageCase_ = 0;
         message_ = null;
         return this;
@@ -41688,108 +42314,66 @@ public com.google.cloud.dialogflow.v2.Intent.Message build() {
       public com.google.cloud.dialogflow.v2.Intent.Message buildPartial() {
         com.google.cloud.dialogflow.v2.Intent.Message result =
             new com.google.cloud.dialogflow.v2.Intent.Message(this);
-        if (messageCase_ == 1) {
-          if (textBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = textBuilder_.build();
-          }
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
-        if (messageCase_ == 2) {
-          if (imageBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = imageBuilder_.build();
-          }
+        buildPartialOneofs(result);
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(com.google.cloud.dialogflow.v2.Intent.Message result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00004000) != 0)) {
+          result.platform_ = platform_;
         }
-        if (messageCase_ == 3) {
-          if (quickRepliesBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = quickRepliesBuilder_.build();
-          }
+      }
+
+      private void buildPartialOneofs(com.google.cloud.dialogflow.v2.Intent.Message result) {
+        result.messageCase_ = messageCase_;
+        result.message_ = this.message_;
+        if (messageCase_ == 1 && textBuilder_ != null) {
+          result.message_ = textBuilder_.build();
         }
-        if (messageCase_ == 4) {
-          if (cardBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = cardBuilder_.build();
-          }
+        if (messageCase_ == 2 && imageBuilder_ != null) {
+          result.message_ = imageBuilder_.build();
         }
-        if (messageCase_ == 5) {
-          if (payloadBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = payloadBuilder_.build();
-          }
+        if (messageCase_ == 3 && quickRepliesBuilder_ != null) {
+          result.message_ = quickRepliesBuilder_.build();
         }
-        if (messageCase_ == 7) {
-          if (simpleResponsesBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = simpleResponsesBuilder_.build();
-          }
+        if (messageCase_ == 4 && cardBuilder_ != null) {
+          result.message_ = cardBuilder_.build();
         }
-        if (messageCase_ == 8) {
-          if (basicCardBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = basicCardBuilder_.build();
-          }
+        if (messageCase_ == 5 && payloadBuilder_ != null) {
+          result.message_ = payloadBuilder_.build();
         }
-        if (messageCase_ == 9) {
-          if (suggestionsBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = suggestionsBuilder_.build();
-          }
+        if (messageCase_ == 7 && simpleResponsesBuilder_ != null) {
+          result.message_ = simpleResponsesBuilder_.build();
         }
-        if (messageCase_ == 10) {
-          if (linkOutSuggestionBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = linkOutSuggestionBuilder_.build();
-          }
+        if (messageCase_ == 8 && basicCardBuilder_ != null) {
+          result.message_ = basicCardBuilder_.build();
         }
-        if (messageCase_ == 11) {
-          if (listSelectBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = listSelectBuilder_.build();
-          }
+        if (messageCase_ == 9 && suggestionsBuilder_ != null) {
+          result.message_ = suggestionsBuilder_.build();
         }
-        if (messageCase_ == 12) {
-          if (carouselSelectBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = carouselSelectBuilder_.build();
-          }
+        if (messageCase_ == 10 && linkOutSuggestionBuilder_ != null) {
+          result.message_ = linkOutSuggestionBuilder_.build();
         }
-        if (messageCase_ == 22) {
-          if (browseCarouselCardBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = browseCarouselCardBuilder_.build();
-          }
+        if (messageCase_ == 11 && listSelectBuilder_ != null) {
+          result.message_ = listSelectBuilder_.build();
         }
-        if (messageCase_ == 23) {
-          if (tableCardBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = tableCardBuilder_.build();
-          }
+        if (messageCase_ == 12 && carouselSelectBuilder_ != null) {
+          result.message_ = carouselSelectBuilder_.build();
         }
-        if (messageCase_ == 24) {
-          if (mediaContentBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = mediaContentBuilder_.build();
-          }
+        if (messageCase_ == 22 && browseCarouselCardBuilder_ != null) {
+          result.message_ = browseCarouselCardBuilder_.build();
+        }
+        if (messageCase_ == 23 && tableCardBuilder_ != null) {
+          result.message_ = tableCardBuilder_.build();
+        }
+        if (messageCase_ == 24 && mediaContentBuilder_ != null) {
+          result.message_ = mediaContentBuilder_.build();
         }
-        result.platform_ = platform_;
-        result.messageCase_ = messageCase_;
-        onBuilt();
-        return result;
       }
 
       @java.lang.Override
@@ -41978,7 +42562,7 @@ public Builder mergeFrom(
               case 48:
                 {
                   platform_ = input.readEnum();
-
+                  bitField0_ |= 0x00004000;
                   break;
                 } // case 48
               case 58:
@@ -42070,6 +42654,8 @@ public Builder clearMessage() {
         return this;
       }
 
+      private int bitField0_;
+
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.cloud.dialogflow.v2.Intent.Message.Text,
               com.google.cloud.dialogflow.v2.Intent.Message.Text.Builder,
@@ -42277,7 +42863,6 @@ public com.google.cloud.dialogflow.v2.Intent.Message.TextOrBuilder getTextOrBuil
         }
         messageCase_ = 1;
         onChanged();
-        ;
         return textBuilder_;
       }
 
@@ -42488,7 +43073,6 @@ public com.google.cloud.dialogflow.v2.Intent.Message.ImageOrBuilder getImageOrBu
         }
         messageCase_ = 2;
         onChanged();
-        ;
         return imageBuilder_;
       }
 
@@ -42705,7 +43289,6 @@ public Builder clearQuickReplies() {
         }
         messageCase_ = 3;
         onChanged();
-        ;
         return quickRepliesBuilder_;
       }
 
@@ -42916,7 +43499,6 @@ public com.google.cloud.dialogflow.v2.Intent.Message.CardOrBuilder getCardOrBuil
         }
         messageCase_ = 4;
         onChanged();
-        ;
         return cardBuilder_;
       }
 
@@ -43121,7 +43703,6 @@ public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() {
         }
         messageCase_ = 5;
         onChanged();
-        ;
         return payloadBuilder_;
       }
 
@@ -43347,7 +43928,6 @@ public Builder clearSimpleResponses() {
         }
         messageCase_ = 7;
         onChanged();
-        ;
         return simpleResponsesBuilder_;
       }
 
@@ -43559,7 +44139,6 @@ public com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Builder getBasicC
         }
         messageCase_ = 8;
         onChanged();
-        ;
         return basicCardBuilder_;
       }
 
@@ -43776,7 +44355,6 @@ public Builder clearSuggestions() {
         }
         messageCase_ = 9;
         onChanged();
-        ;
         return suggestionsBuilder_;
       }
 
@@ -44016,7 +44594,6 @@ public Builder clearLinkOutSuggestion() {
         }
         messageCase_ = 10;
         onChanged();
-        ;
         return linkOutSuggestionBuilder_;
       }
 
@@ -44232,7 +44809,6 @@ public Builder clearListSelect() {
         }
         messageCase_ = 11;
         onChanged();
-        ;
         return listSelectBuilder_;
       }
 
@@ -44458,7 +45034,6 @@ public Builder clearCarouselSelect() {
         }
         messageCase_ = 12;
         onChanged();
-        ;
         return carouselSelectBuilder_;
       }
 
@@ -44699,7 +45274,6 @@ public Builder clearBrowseCarouselCard() {
         }
         messageCase_ = 22;
         onChanged();
-        ;
         return browseCarouselCardBuilder_;
       }
 
@@ -44911,7 +45485,6 @@ public com.google.cloud.dialogflow.v2.Intent.Message.TableCard.Builder getTableC
         }
         messageCase_ = 23;
         onChanged();
-        ;
         return tableCardBuilder_;
       }
 
@@ -45128,7 +45701,6 @@ public Builder clearMediaContent() {
         }
         messageCase_ = 24;
         onChanged();
-        ;
         return mediaContentBuilder_;
       }
 
@@ -45165,8 +45737,8 @@ public int getPlatformValue() {
        * @return This builder for chaining.
        */
       public Builder setPlatformValue(int value) {
-
         platform_ = value;
+        bitField0_ |= 0x00004000;
         onChanged();
         return this;
       }
@@ -45185,9 +45757,8 @@ public Builder setPlatformValue(int value) {
        */
       @java.lang.Override
       public com.google.cloud.dialogflow.v2.Intent.Message.Platform getPlatform() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.dialogflow.v2.Intent.Message.Platform result =
-            com.google.cloud.dialogflow.v2.Intent.Message.Platform.valueOf(platform_);
+            com.google.cloud.dialogflow.v2.Intent.Message.Platform.forNumber(platform_);
         return result == null
             ? com.google.cloud.dialogflow.v2.Intent.Message.Platform.UNRECOGNIZED
             : result;
@@ -45210,7 +45781,7 @@ public Builder setPlatform(com.google.cloud.dialogflow.v2.Intent.Message.Platfor
         if (value == null) {
           throw new NullPointerException();
         }
-
+        bitField0_ |= 0x00004000;
         platform_ = value.getNumber();
         onChanged();
         return this;
@@ -45229,7 +45800,7 @@ public Builder setPlatform(com.google.cloud.dialogflow.v2.Intent.Message.Platfor
        * @return This builder for chaining.
        */
       public Builder clearPlatform() {
-
+        bitField0_ = (bitField0_ & ~0x00004000);
         platform_ = 0;
         onChanged();
         return this;
@@ -45409,7 +45980,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int FOLLOWUP_INTENT_NAME_FIELD_NUMBER = 1;
-    private volatile java.lang.Object followupIntentName_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object followupIntentName_ = "";
     /**
      *
      *
@@ -45460,7 +46033,9 @@ public com.google.protobuf.ByteString getFollowupIntentNameBytes() {
     }
 
     public static final int PARENT_FOLLOWUP_INTENT_NAME_FIELD_NUMBER = 2;
-    private volatile java.lang.Object parentFollowupIntentName_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object parentFollowupIntentName_ = "";
     /**
      *
      *
@@ -45720,10 +46295,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         followupIntentName_ = "";
-
         parentFollowupIntentName_ = "";
-
         return this;
       }
 
@@ -45751,12 +46325,23 @@ public com.google.cloud.dialogflow.v2.Intent.FollowupIntentInfo build() {
       public com.google.cloud.dialogflow.v2.Intent.FollowupIntentInfo buildPartial() {
         com.google.cloud.dialogflow.v2.Intent.FollowupIntentInfo result =
             new com.google.cloud.dialogflow.v2.Intent.FollowupIntentInfo(this);
-        result.followupIntentName_ = followupIntentName_;
-        result.parentFollowupIntentName_ = parentFollowupIntentName_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(com.google.cloud.dialogflow.v2.Intent.FollowupIntentInfo result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.followupIntentName_ = followupIntentName_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.parentFollowupIntentName_ = parentFollowupIntentName_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -45807,10 +46392,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.FollowupIntentInf
           return this;
         if (!other.getFollowupIntentName().isEmpty()) {
           followupIntentName_ = other.followupIntentName_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getParentFollowupIntentName().isEmpty()) {
           parentFollowupIntentName_ = other.parentFollowupIntentName_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -45842,13 +46429,13 @@ public Builder mergeFrom(
               case 10:
                 {
                   followupIntentName_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
                 {
                   parentFollowupIntentName_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 18
               default:
@@ -45868,6 +46455,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object followupIntentName_ = "";
       /**
        *
@@ -45932,8 +46521,8 @@ public Builder setFollowupIntentName(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         followupIntentName_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -45950,8 +46539,8 @@ public Builder setFollowupIntentName(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearFollowupIntentName() {
-
         followupIntentName_ = getDefaultInstance().getFollowupIntentName();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -45973,8 +46562,8 @@ public Builder setFollowupIntentNameBytes(com.google.protobuf.ByteString value)
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         followupIntentName_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -46043,8 +46632,8 @@ public Builder setParentFollowupIntentName(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         parentFollowupIntentName_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -46061,8 +46650,8 @@ public Builder setParentFollowupIntentName(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearParentFollowupIntentName() {
-
         parentFollowupIntentName_ = getDefaultInstance().getParentFollowupIntentName();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -46084,8 +46673,8 @@ public Builder setParentFollowupIntentNameBytes(com.google.protobuf.ByteString v
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         parentFollowupIntentName_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -46155,13 +46744,17 @@ public com.google.cloud.dialogflow.v2.Intent.FollowupIntentInfo getDefaultInstan
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
    * <pre>
    * Optional. The unique identifier of this intent.
-   * Required for [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent] and [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents]
+   * Required for
+   * [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent] and
+   * [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents]
    * methods.
    * Format: `projects/&lt;Project ID&gt;/agent/intents/&lt;Intent ID&gt;`.
    * </pre>
@@ -46187,7 +46780,9 @@ public java.lang.String getName() {
    *
    * <pre>
    * Optional. The unique identifier of this intent.
-   * Required for [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent] and [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents]
+   * Required for
+   * [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent] and
+   * [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents]
    * methods.
    * Format: `projects/&lt;Project ID&gt;/agent/intents/&lt;Intent ID&gt;`.
    * </pre>
@@ -46210,7 +46805,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
@@ -46259,7 +46856,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
   }
 
   public static final int WEBHOOK_STATE_FIELD_NUMBER = 6;
-  private int webhookState_;
+  private int webhookState_ = 0;
   /**
    *
    *
@@ -46292,16 +46889,15 @@ public int getWebhookStateValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.Intent.WebhookState getWebhookState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.Intent.WebhookState result =
-        com.google.cloud.dialogflow.v2.Intent.WebhookState.valueOf(webhookState_);
+        com.google.cloud.dialogflow.v2.Intent.WebhookState.forNumber(webhookState_);
     return result == null
         ? com.google.cloud.dialogflow.v2.Intent.WebhookState.UNRECOGNIZED
         : result;
   }
 
   public static final int PRIORITY_FIELD_NUMBER = 3;
-  private int priority_;
+  private int priority_ = 0;
   /**
    *
    *
@@ -46325,7 +46921,7 @@ public int getPriority() {
   }
 
   public static final int IS_FALLBACK_FIELD_NUMBER = 4;
-  private boolean isFallback_;
+  private boolean isFallback_ = false;
   /**
    *
    *
@@ -46343,7 +46939,7 @@ public boolean getIsFallback() {
   }
 
   public static final int ML_DISABLED_FIELD_NUMBER = 19;
-  private boolean mlDisabled_;
+  private boolean mlDisabled_ = false;
   /**
    *
    *
@@ -46364,7 +46960,7 @@ public boolean getMlDisabled() {
   }
 
   public static final int LIVE_AGENT_HANDOFF_FIELD_NUMBER = 20;
-  private boolean liveAgentHandoff_;
+  private boolean liveAgentHandoff_ = false;
   /**
    *
    *
@@ -46385,7 +46981,7 @@ public boolean getLiveAgentHandoff() {
   }
 
   public static final int END_INTERACTION_FIELD_NUMBER = 21;
-  private boolean endInteraction_;
+  private boolean endInteraction_ = false;
   /**
    *
    *
@@ -46405,6 +47001,8 @@ public boolean getEndInteraction() {
   }
 
   public static final int INPUT_CONTEXT_NAMES_FIELD_NUMBER = 7;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList inputContextNames_;
   /**
    *
@@ -46474,6 +47072,8 @@ public com.google.protobuf.ByteString getInputContextNamesBytes(int index) {
   }
 
   public static final int EVENTS_FIELD_NUMBER = 8;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList events_;
   /**
    *
@@ -46547,6 +47147,8 @@ public com.google.protobuf.ByteString getEventsBytes(int index) {
   }
 
   public static final int TRAINING_PHRASES_FIELD_NUMBER = 9;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Intent.TrainingPhrase> trainingPhrases_;
   /**
    *
@@ -46633,7 +47235,9 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhraseOrBuilder getTraining
   }
 
   public static final int ACTION_FIELD_NUMBER = 10;
-  private volatile java.lang.Object action_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object action_ = "";
   /**
    *
    *
@@ -46684,6 +47288,8 @@ public com.google.protobuf.ByteString getActionBytes() {
   }
 
   public static final int OUTPUT_CONTEXTS_FIELD_NUMBER = 11;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Context> outputContexts_;
   /**
    *
@@ -46783,7 +47389,7 @@ public com.google.cloud.dialogflow.v2.ContextOrBuilder getOutputContextsOrBuilde
   }
 
   public static final int RESET_CONTEXTS_FIELD_NUMBER = 12;
-  private boolean resetContexts_;
+  private boolean resetContexts_ = false;
   /**
    *
    *
@@ -46802,6 +47408,8 @@ public boolean getResetContexts() {
   }
 
   public static final int PARAMETERS_FIELD_NUMBER = 13;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Intent.Parameter> parameters_;
   /**
    *
@@ -46882,6 +47490,8 @@ public com.google.cloud.dialogflow.v2.Intent.ParameterOrBuilder getParametersOrB
   }
 
   public static final int MESSAGES_FIELD_NUMBER = 14;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Intent.Message> messages_;
   /**
    *
@@ -46966,7 +47576,10 @@ public com.google.cloud.dialogflow.v2.Intent.MessageOrBuilder getMessagesOrBuild
   }
 
   public static final int DEFAULT_RESPONSE_PLATFORMS_FIELD_NUMBER = 15;
+
+  @SuppressWarnings("serial")
   private java.util.List<java.lang.Integer> defaultResponsePlatforms_;
+
   private static final com.google.protobuf.Internal.ListAdapter.Converter<
           java.lang.Integer, com.google.cloud.dialogflow.v2.Intent.Message.Platform>
       defaultResponsePlatforms_converter_ =
@@ -46974,9 +47587,8 @@ public com.google.cloud.dialogflow.v2.Intent.MessageOrBuilder getMessagesOrBuild
               java.lang.Integer, com.google.cloud.dialogflow.v2.Intent.Message.Platform>() {
             public com.google.cloud.dialogflow.v2.Intent.Message.Platform convert(
                 java.lang.Integer from) {
-              @SuppressWarnings("deprecation")
               com.google.cloud.dialogflow.v2.Intent.Message.Platform result =
-                  com.google.cloud.dialogflow.v2.Intent.Message.Platform.valueOf(from);
+                  com.google.cloud.dialogflow.v2.Intent.Message.Platform.forNumber(from);
               return result == null
                   ? com.google.cloud.dialogflow.v2.Intent.Message.Platform.UNRECOGNIZED
                   : result;
@@ -47082,7 +47694,9 @@ public int getDefaultResponsePlatformsValue(int index) {
   private int defaultResponsePlatformsMemoizedSerializedSize;
 
   public static final int ROOT_FOLLOWUP_INTENT_NAME_FIELD_NUMBER = 16;
-  private volatile java.lang.Object rootFollowupIntentName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object rootFollowupIntentName_ = "";
   /**
    *
    *
@@ -47141,16 +47755,19 @@ public com.google.protobuf.ByteString getRootFollowupIntentNameBytes() {
   }
 
   public static final int PARENT_FOLLOWUP_INTENT_NAME_FIELD_NUMBER = 17;
-  private volatile java.lang.Object parentFollowupIntentName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parentFollowupIntentName_ = "";
   /**
    *
    *
    * <pre>
    * Read-only after creation. The unique identifier of the parent intent in the
    * chain of followup intents. You can set this field when creating an intent,
-   * for example with [CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent] or
-   * [BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents], in order to make this
-   * intent a followup intent.
+   * for example with
+   * [CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent] or
+   * [BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents],
+   * in order to make this intent a followup intent.
    * It identifies the parent followup intent.
    * Format: `projects/&lt;Project ID&gt;/agent/intents/&lt;Intent ID&gt;`.
    * </pre>
@@ -47177,9 +47794,10 @@ public java.lang.String getParentFollowupIntentName() {
    * <pre>
    * Read-only after creation. The unique identifier of the parent intent in the
    * chain of followup intents. You can set this field when creating an intent,
-   * for example with [CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent] or
-   * [BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents], in order to make this
-   * intent a followup intent.
+   * for example with
+   * [CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent] or
+   * [BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents],
+   * in order to make this intent a followup intent.
    * It identifies the parent followup intent.
    * Format: `projects/&lt;Project ID&gt;/agent/intents/&lt;Intent ID&gt;`.
    * </pre>
@@ -47202,14 +47820,17 @@ public com.google.protobuf.ByteString getParentFollowupIntentNameBytes() {
   }
 
   public static final int FOLLOWUP_INTENT_INFO_FIELD_NUMBER = 18;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Intent.FollowupIntentInfo>
       followupIntentInfo_;
   /**
    *
    *
    * <pre>
-   * Output only. Read-only. Information about all followup intents that have this intent as
-   * a direct or indirect parent. We populate this field only in the output.
+   * Output only. Read-only. Information about all followup intents that have
+   * this intent as a direct or indirect parent. We populate this field only in
+   * the output.
    * </pre>
    *
    * <code>
@@ -47225,8 +47846,9 @@ public com.google.protobuf.ByteString getParentFollowupIntentNameBytes() {
    *
    *
    * <pre>
-   * Output only. Read-only. Information about all followup intents that have this intent as
-   * a direct or indirect parent. We populate this field only in the output.
+   * Output only. Read-only. Information about all followup intents that have
+   * this intent as a direct or indirect parent. We populate this field only in
+   * the output.
    * </pre>
    *
    * <code>
@@ -47242,8 +47864,9 @@ public com.google.protobuf.ByteString getParentFollowupIntentNameBytes() {
    *
    *
    * <pre>
-   * Output only. Read-only. Information about all followup intents that have this intent as
-   * a direct or indirect parent. We populate this field only in the output.
+   * Output only. Read-only. Information about all followup intents that have
+   * this intent as a direct or indirect parent. We populate this field only in
+   * the output.
    * </pre>
    *
    * <code>
@@ -47258,8 +47881,9 @@ public int getFollowupIntentInfoCount() {
    *
    *
    * <pre>
-   * Output only. Read-only. Information about all followup intents that have this intent as
-   * a direct or indirect parent. We populate this field only in the output.
+   * Output only. Read-only. Information about all followup intents that have
+   * this intent as a direct or indirect parent. We populate this field only in
+   * the output.
    * </pre>
    *
    * <code>
@@ -47274,8 +47898,9 @@ public com.google.cloud.dialogflow.v2.Intent.FollowupIntentInfo getFollowupInten
    *
    *
    * <pre>
-   * Output only. Read-only. Information about all followup intents that have this intent as
-   * a direct or indirect parent. We populate this field only in the output.
+   * Output only. Read-only. Information about all followup intents that have
+   * this intent as a direct or indirect parent. We populate this field only in
+   * the output.
    * </pre>
    *
    * <code>
@@ -47709,71 +48334,60 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       displayName_ = "";
-
       webhookState_ = 0;
-
       priority_ = 0;
-
       isFallback_ = false;
-
       mlDisabled_ = false;
-
       liveAgentHandoff_ = false;
-
       endInteraction_ = false;
-
       inputContextNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000100);
       events_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000200);
       if (trainingPhrasesBuilder_ == null) {
         trainingPhrases_ = java.util.Collections.emptyList();
       } else {
         trainingPhrases_ = null;
         trainingPhrasesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000004);
+      bitField0_ = (bitField0_ & ~0x00000400);
       action_ = "";
-
       if (outputContextsBuilder_ == null) {
         outputContexts_ = java.util.Collections.emptyList();
       } else {
         outputContexts_ = null;
         outputContextsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000008);
+      bitField0_ = (bitField0_ & ~0x00001000);
       resetContexts_ = false;
-
       if (parametersBuilder_ == null) {
         parameters_ = java.util.Collections.emptyList();
       } else {
         parameters_ = null;
         parametersBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000010);
+      bitField0_ = (bitField0_ & ~0x00004000);
       if (messagesBuilder_ == null) {
         messages_ = java.util.Collections.emptyList();
       } else {
         messages_ = null;
         messagesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000020);
+      bitField0_ = (bitField0_ & ~0x00008000);
       defaultResponsePlatforms_ = java.util.Collections.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000040);
+      bitField0_ = (bitField0_ & ~0x00010000);
       rootFollowupIntentName_ = "";
-
       parentFollowupIntentName_ = "";
-
       if (followupIntentInfoBuilder_ == null) {
         followupIntentInfo_ = java.util.Collections.emptyList();
       } else {
         followupIntentInfo_ = null;
         followupIntentInfoBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000080);
+      bitField0_ = (bitField0_ & ~0x00080000);
       return this;
     }
 
@@ -47801,82 +48415,116 @@ public com.google.cloud.dialogflow.v2.Intent build() {
     public com.google.cloud.dialogflow.v2.Intent buildPartial() {
       com.google.cloud.dialogflow.v2.Intent result =
           new com.google.cloud.dialogflow.v2.Intent(this);
-      int from_bitField0_ = bitField0_;
-      result.name_ = name_;
-      result.displayName_ = displayName_;
-      result.webhookState_ = webhookState_;
-      result.priority_ = priority_;
-      result.isFallback_ = isFallback_;
-      result.mlDisabled_ = mlDisabled_;
-      result.liveAgentHandoff_ = liveAgentHandoff_;
-      result.endInteraction_ = endInteraction_;
-      if (((bitField0_ & 0x00000001) != 0)) {
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.cloud.dialogflow.v2.Intent result) {
+      if (((bitField0_ & 0x00000100) != 0)) {
         inputContextNames_ = inputContextNames_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000100);
       }
       result.inputContextNames_ = inputContextNames_;
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (((bitField0_ & 0x00000200) != 0)) {
         events_ = events_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000200);
       }
       result.events_ = events_;
       if (trainingPhrasesBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)) {
+        if (((bitField0_ & 0x00000400) != 0)) {
           trainingPhrases_ = java.util.Collections.unmodifiableList(trainingPhrases_);
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000400);
         }
         result.trainingPhrases_ = trainingPhrases_;
       } else {
         result.trainingPhrases_ = trainingPhrasesBuilder_.build();
       }
-      result.action_ = action_;
       if (outputContextsBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)) {
+        if (((bitField0_ & 0x00001000) != 0)) {
           outputContexts_ = java.util.Collections.unmodifiableList(outputContexts_);
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00001000);
         }
         result.outputContexts_ = outputContexts_;
       } else {
         result.outputContexts_ = outputContextsBuilder_.build();
       }
-      result.resetContexts_ = resetContexts_;
       if (parametersBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)) {
+        if (((bitField0_ & 0x00004000) != 0)) {
           parameters_ = java.util.Collections.unmodifiableList(parameters_);
-          bitField0_ = (bitField0_ & ~0x00000010);
+          bitField0_ = (bitField0_ & ~0x00004000);
         }
         result.parameters_ = parameters_;
       } else {
         result.parameters_ = parametersBuilder_.build();
       }
       if (messagesBuilder_ == null) {
-        if (((bitField0_ & 0x00000020) != 0)) {
+        if (((bitField0_ & 0x00008000) != 0)) {
           messages_ = java.util.Collections.unmodifiableList(messages_);
-          bitField0_ = (bitField0_ & ~0x00000020);
+          bitField0_ = (bitField0_ & ~0x00008000);
         }
         result.messages_ = messages_;
       } else {
         result.messages_ = messagesBuilder_.build();
       }
-      if (((bitField0_ & 0x00000040) != 0)) {
+      if (((bitField0_ & 0x00010000) != 0)) {
         defaultResponsePlatforms_ =
             java.util.Collections.unmodifiableList(defaultResponsePlatforms_);
-        bitField0_ = (bitField0_ & ~0x00000040);
+        bitField0_ = (bitField0_ & ~0x00010000);
       }
       result.defaultResponsePlatforms_ = defaultResponsePlatforms_;
-      result.rootFollowupIntentName_ = rootFollowupIntentName_;
-      result.parentFollowupIntentName_ = parentFollowupIntentName_;
       if (followupIntentInfoBuilder_ == null) {
-        if (((bitField0_ & 0x00000080) != 0)) {
+        if (((bitField0_ & 0x00080000) != 0)) {
           followupIntentInfo_ = java.util.Collections.unmodifiableList(followupIntentInfo_);
-          bitField0_ = (bitField0_ & ~0x00000080);
+          bitField0_ = (bitField0_ & ~0x00080000);
         }
         result.followupIntentInfo_ = followupIntentInfo_;
       } else {
         result.followupIntentInfo_ = followupIntentInfoBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.Intent result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.displayName_ = displayName_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.webhookState_ = webhookState_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.priority_ = priority_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.isFallback_ = isFallback_;
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.mlDisabled_ = mlDisabled_;
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.liveAgentHandoff_ = liveAgentHandoff_;
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.endInteraction_ = endInteraction_;
+      }
+      if (((from_bitField0_ & 0x00000800) != 0)) {
+        result.action_ = action_;
+      }
+      if (((from_bitField0_ & 0x00002000) != 0)) {
+        result.resetContexts_ = resetContexts_;
+      }
+      if (((from_bitField0_ & 0x00020000) != 0)) {
+        result.rootFollowupIntentName_ = rootFollowupIntentName_;
+      }
+      if (((from_bitField0_ & 0x00040000) != 0)) {
+        result.parentFollowupIntentName_ = parentFollowupIntentName_;
+      }
     }
 
     @java.lang.Override
@@ -47926,10 +48574,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent other) {
       if (other == com.google.cloud.dialogflow.v2.Intent.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.webhookState_ != 0) {
@@ -47953,7 +48603,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent other) {
       if (!other.inputContextNames_.isEmpty()) {
         if (inputContextNames_.isEmpty()) {
           inputContextNames_ = other.inputContextNames_;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000100);
         } else {
           ensureInputContextNamesIsMutable();
           inputContextNames_.addAll(other.inputContextNames_);
@@ -47963,7 +48613,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent other) {
       if (!other.events_.isEmpty()) {
         if (events_.isEmpty()) {
           events_ = other.events_;
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000200);
         } else {
           ensureEventsIsMutable();
           events_.addAll(other.events_);
@@ -47974,7 +48624,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent other) {
         if (!other.trainingPhrases_.isEmpty()) {
           if (trainingPhrases_.isEmpty()) {
             trainingPhrases_ = other.trainingPhrases_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000400);
           } else {
             ensureTrainingPhrasesIsMutable();
             trainingPhrases_.addAll(other.trainingPhrases_);
@@ -47987,7 +48637,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent other) {
             trainingPhrasesBuilder_.dispose();
             trainingPhrasesBuilder_ = null;
             trainingPhrases_ = other.trainingPhrases_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000400);
             trainingPhrasesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getTrainingPhrasesFieldBuilder()
@@ -47999,13 +48649,14 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent other) {
       }
       if (!other.getAction().isEmpty()) {
         action_ = other.action_;
+        bitField0_ |= 0x00000800;
         onChanged();
       }
       if (outputContextsBuilder_ == null) {
         if (!other.outputContexts_.isEmpty()) {
           if (outputContexts_.isEmpty()) {
             outputContexts_ = other.outputContexts_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00001000);
           } else {
             ensureOutputContextsIsMutable();
             outputContexts_.addAll(other.outputContexts_);
@@ -48018,7 +48669,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent other) {
             outputContextsBuilder_.dispose();
             outputContextsBuilder_ = null;
             outputContexts_ = other.outputContexts_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00001000);
             outputContextsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getOutputContextsFieldBuilder()
@@ -48035,7 +48686,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent other) {
         if (!other.parameters_.isEmpty()) {
           if (parameters_.isEmpty()) {
             parameters_ = other.parameters_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            bitField0_ = (bitField0_ & ~0x00004000);
           } else {
             ensureParametersIsMutable();
             parameters_.addAll(other.parameters_);
@@ -48048,7 +48699,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent other) {
             parametersBuilder_.dispose();
             parametersBuilder_ = null;
             parameters_ = other.parameters_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            bitField0_ = (bitField0_ & ~0x00004000);
             parametersBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getParametersFieldBuilder()
@@ -48062,7 +48713,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent other) {
         if (!other.messages_.isEmpty()) {
           if (messages_.isEmpty()) {
             messages_ = other.messages_;
-            bitField0_ = (bitField0_ & ~0x00000020);
+            bitField0_ = (bitField0_ & ~0x00008000);
           } else {
             ensureMessagesIsMutable();
             messages_.addAll(other.messages_);
@@ -48075,7 +48726,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent other) {
             messagesBuilder_.dispose();
             messagesBuilder_ = null;
             messages_ = other.messages_;
-            bitField0_ = (bitField0_ & ~0x00000020);
+            bitField0_ = (bitField0_ & ~0x00008000);
             messagesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getMessagesFieldBuilder()
@@ -48088,7 +48739,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent other) {
       if (!other.defaultResponsePlatforms_.isEmpty()) {
         if (defaultResponsePlatforms_.isEmpty()) {
           defaultResponsePlatforms_ = other.defaultResponsePlatforms_;
-          bitField0_ = (bitField0_ & ~0x00000040);
+          bitField0_ = (bitField0_ & ~0x00010000);
         } else {
           ensureDefaultResponsePlatformsIsMutable();
           defaultResponsePlatforms_.addAll(other.defaultResponsePlatforms_);
@@ -48097,17 +48748,19 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent other) {
       }
       if (!other.getRootFollowupIntentName().isEmpty()) {
         rootFollowupIntentName_ = other.rootFollowupIntentName_;
+        bitField0_ |= 0x00020000;
         onChanged();
       }
       if (!other.getParentFollowupIntentName().isEmpty()) {
         parentFollowupIntentName_ = other.parentFollowupIntentName_;
+        bitField0_ |= 0x00040000;
         onChanged();
       }
       if (followupIntentInfoBuilder_ == null) {
         if (!other.followupIntentInfo_.isEmpty()) {
           if (followupIntentInfo_.isEmpty()) {
             followupIntentInfo_ = other.followupIntentInfo_;
-            bitField0_ = (bitField0_ & ~0x00000080);
+            bitField0_ = (bitField0_ & ~0x00080000);
           } else {
             ensureFollowupIntentInfoIsMutable();
             followupIntentInfo_.addAll(other.followupIntentInfo_);
@@ -48120,7 +48773,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent other) {
             followupIntentInfoBuilder_.dispose();
             followupIntentInfoBuilder_ = null;
             followupIntentInfo_ = other.followupIntentInfo_;
-            bitField0_ = (bitField0_ & ~0x00000080);
+            bitField0_ = (bitField0_ & ~0x00080000);
             followupIntentInfoBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getFollowupIntentInfoFieldBuilder()
@@ -48159,31 +48812,31 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 displayName_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 priority_ = input.readInt32();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 24
             case 32:
               {
                 isFallback_ = input.readBool();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 32
             case 48:
               {
                 webhookState_ = input.readEnum();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 48
             case 58:
@@ -48217,7 +48870,7 @@ public Builder mergeFrom(
             case 82:
               {
                 action_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000800;
                 break;
               } // case 82
             case 90:
@@ -48236,7 +48889,7 @@ public Builder mergeFrom(
             case 96:
               {
                 resetContexts_ = input.readBool();
-
+                bitField0_ |= 0x00002000;
                 break;
               } // case 96
             case 106:
@@ -48288,13 +48941,13 @@ public Builder mergeFrom(
             case 130:
               {
                 rootFollowupIntentName_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00020000;
                 break;
               } // case 130
             case 138:
               {
                 parentFollowupIntentName_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00040000;
                 break;
               } // case 138
             case 146:
@@ -48314,19 +48967,19 @@ public Builder mergeFrom(
             case 152:
               {
                 mlDisabled_ = input.readBool();
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 152
             case 160:
               {
                 liveAgentHandoff_ = input.readBool();
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 160
             case 168:
               {
                 endInteraction_ = input.readBool();
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 168
             default:
@@ -48354,7 +49007,9 @@ public Builder mergeFrom(
      *
      * <pre>
      * Optional. The unique identifier of this intent.
-     * Required for [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent] and [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents]
+     * Required for
+     * [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent] and
+     * [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents]
      * methods.
      * Format: `projects/&lt;Project ID&gt;/agent/intents/&lt;Intent ID&gt;`.
      * </pre>
@@ -48379,7 +49034,9 @@ public java.lang.String getName() {
      *
      * <pre>
      * Optional. The unique identifier of this intent.
-     * Required for [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent] and [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents]
+     * Required for
+     * [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent] and
+     * [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents]
      * methods.
      * Format: `projects/&lt;Project ID&gt;/agent/intents/&lt;Intent ID&gt;`.
      * </pre>
@@ -48404,7 +49061,9 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      * <pre>
      * Optional. The unique identifier of this intent.
-     * Required for [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent] and [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents]
+     * Required for
+     * [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent] and
+     * [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents]
      * methods.
      * Format: `projects/&lt;Project ID&gt;/agent/intents/&lt;Intent ID&gt;`.
      * </pre>
@@ -48418,8 +49077,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -48428,7 +49087,9 @@ public Builder setName(java.lang.String value) {
      *
      * <pre>
      * Optional. The unique identifier of this intent.
-     * Required for [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent] and [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents]
+     * Required for
+     * [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent] and
+     * [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents]
      * methods.
      * Format: `projects/&lt;Project ID&gt;/agent/intents/&lt;Intent ID&gt;`.
      * </pre>
@@ -48438,8 +49099,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -48448,7 +49109,9 @@ public Builder clearName() {
      *
      * <pre>
      * Optional. The unique identifier of this intent.
-     * Required for [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent] and [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents]
+     * Required for
+     * [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent] and
+     * [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents]
      * methods.
      * Format: `projects/&lt;Project ID&gt;/agent/intents/&lt;Intent ID&gt;`.
      * </pre>
@@ -48463,8 +49126,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -48530,8 +49193,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -48547,8 +49210,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
-
       displayName_ = getDefaultInstance().getDisplayName();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -48569,8 +49232,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -48608,8 +49271,8 @@ public int getWebhookStateValue() {
      * @return This builder for chaining.
      */
     public Builder setWebhookStateValue(int value) {
-
       webhookState_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -48628,9 +49291,8 @@ public Builder setWebhookStateValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.Intent.WebhookState getWebhookState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.Intent.WebhookState result =
-          com.google.cloud.dialogflow.v2.Intent.WebhookState.valueOf(webhookState_);
+          com.google.cloud.dialogflow.v2.Intent.WebhookState.forNumber(webhookState_);
       return result == null
           ? com.google.cloud.dialogflow.v2.Intent.WebhookState.UNRECOGNIZED
           : result;
@@ -48653,7 +49315,7 @@ public Builder setWebhookState(com.google.cloud.dialogflow.v2.Intent.WebhookStat
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000004;
       webhookState_ = value.getNumber();
       onChanged();
       return this;
@@ -48672,7 +49334,7 @@ public Builder setWebhookState(com.google.cloud.dialogflow.v2.Intent.WebhookStat
      * @return This builder for chaining.
      */
     public Builder clearWebhookState() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       webhookState_ = 0;
       onChanged();
       return this;
@@ -48721,6 +49383,7 @@ public int getPriority() {
     public Builder setPriority(int value) {
 
       priority_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -48742,7 +49405,7 @@ public Builder setPriority(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPriority() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       priority_ = 0;
       onChanged();
       return this;
@@ -48779,6 +49442,7 @@ public boolean getIsFallback() {
     public Builder setIsFallback(boolean value) {
 
       isFallback_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -48794,7 +49458,7 @@ public Builder setIsFallback(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearIsFallback() {
-
+      bitField0_ = (bitField0_ & ~0x00000010);
       isFallback_ = false;
       onChanged();
       return this;
@@ -48837,6 +49501,7 @@ public boolean getMlDisabled() {
     public Builder setMlDisabled(boolean value) {
 
       mlDisabled_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -48855,7 +49520,7 @@ public Builder setMlDisabled(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearMlDisabled() {
-
+      bitField0_ = (bitField0_ & ~0x00000020);
       mlDisabled_ = false;
       onChanged();
       return this;
@@ -48898,6 +49563,7 @@ public boolean getLiveAgentHandoff() {
     public Builder setLiveAgentHandoff(boolean value) {
 
       liveAgentHandoff_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -48916,7 +49582,7 @@ public Builder setLiveAgentHandoff(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearLiveAgentHandoff() {
-
+      bitField0_ = (bitField0_ & ~0x00000040);
       liveAgentHandoff_ = false;
       onChanged();
       return this;
@@ -48957,6 +49623,7 @@ public boolean getEndInteraction() {
     public Builder setEndInteraction(boolean value) {
 
       endInteraction_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -48974,7 +49641,7 @@ public Builder setEndInteraction(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearEndInteraction() {
-
+      bitField0_ = (bitField0_ & ~0x00000080);
       endInteraction_ = false;
       onChanged();
       return this;
@@ -48984,9 +49651,9 @@ public Builder clearEndInteraction() {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureInputContextNamesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000100) != 0)) {
         inputContextNames_ = new com.google.protobuf.LazyStringArrayList(inputContextNames_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000100;
       }
     }
     /**
@@ -49145,7 +49812,7 @@ public Builder addAllInputContextNames(java.lang.Iterable<java.lang.String> valu
      */
     public Builder clearInputContextNames() {
       inputContextNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000100);
       onChanged();
       return this;
     }
@@ -49179,9 +49846,9 @@ public Builder addInputContextNamesBytes(com.google.protobuf.ByteString value) {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureEventsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000200) != 0)) {
         events_ = new com.google.protobuf.LazyStringArrayList(events_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000200;
       }
     }
     /**
@@ -49340,7 +50007,7 @@ public Builder addAllEvents(java.lang.Iterable<java.lang.String> values) {
      */
     public Builder clearEvents() {
       events_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000200);
       onChanged();
       return this;
     }
@@ -49374,11 +50041,11 @@ public Builder addEventsBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureTrainingPhrasesIsMutable() {
-      if (!((bitField0_ & 0x00000004) != 0)) {
+      if (!((bitField0_ & 0x00000400) != 0)) {
         trainingPhrases_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.Intent.TrainingPhrase>(
                 trainingPhrases_);
-        bitField0_ |= 0x00000004;
+        bitField0_ |= 0x00000400;
       }
     }
 
@@ -49630,7 +50297,7 @@ public Builder addAllTrainingPhrases(
     public Builder clearTrainingPhrases() {
       if (trainingPhrasesBuilder_ == null) {
         trainingPhrases_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000400);
         onChanged();
       } else {
         trainingPhrasesBuilder_.clear();
@@ -49779,7 +50446,7 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Builder addTrainingP
                 com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Builder,
                 com.google.cloud.dialogflow.v2.Intent.TrainingPhraseOrBuilder>(
                 trainingPhrases_,
-                ((bitField0_ & 0x00000004) != 0),
+                ((bitField0_ & 0x00000400) != 0),
                 getParentForChildren(),
                 isClean());
         trainingPhrases_ = null;
@@ -49851,8 +50518,8 @@ public Builder setAction(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       action_ = value;
+      bitField0_ |= 0x00000800;
       onChanged();
       return this;
     }
@@ -49869,8 +50536,8 @@ public Builder setAction(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAction() {
-
       action_ = getDefaultInstance().getAction();
+      bitField0_ = (bitField0_ & ~0x00000800);
       onChanged();
       return this;
     }
@@ -49892,8 +50559,8 @@ public Builder setActionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       action_ = value;
+      bitField0_ |= 0x00000800;
       onChanged();
       return this;
     }
@@ -49902,10 +50569,10 @@ public Builder setActionBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureOutputContextsIsMutable() {
-      if (!((bitField0_ & 0x00000008) != 0)) {
+      if (!((bitField0_ & 0x00001000) != 0)) {
         outputContexts_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.Context>(outputContexts_);
-        bitField0_ |= 0x00000008;
+        bitField0_ |= 0x00001000;
       }
     }
 
@@ -50187,7 +50854,7 @@ public Builder addAllOutputContexts(
     public Builder clearOutputContexts() {
       if (outputContextsBuilder_ == null) {
         outputContexts_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00001000);
         onChanged();
       } else {
         outputContextsBuilder_.clear();
@@ -50352,7 +51019,7 @@ public com.google.cloud.dialogflow.v2.Context.Builder addOutputContextsBuilder(i
                 com.google.cloud.dialogflow.v2.Context.Builder,
                 com.google.cloud.dialogflow.v2.ContextOrBuilder>(
                 outputContexts_,
-                ((bitField0_ & 0x00000008) != 0),
+                ((bitField0_ & 0x00001000) != 0),
                 getParentForChildren(),
                 isClean());
         outputContexts_ = null;
@@ -50393,6 +51060,7 @@ public boolean getResetContexts() {
     public Builder setResetContexts(boolean value) {
 
       resetContexts_ = value;
+      bitField0_ |= 0x00002000;
       onChanged();
       return this;
     }
@@ -50409,7 +51077,7 @@ public Builder setResetContexts(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearResetContexts() {
-
+      bitField0_ = (bitField0_ & ~0x00002000);
       resetContexts_ = false;
       onChanged();
       return this;
@@ -50419,10 +51087,10 @@ public Builder clearResetContexts() {
         java.util.Collections.emptyList();
 
     private void ensureParametersIsMutable() {
-      if (!((bitField0_ & 0x00000010) != 0)) {
+      if (!((bitField0_ & 0x00004000) != 0)) {
         parameters_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.Intent.Parameter>(parameters_);
-        bitField0_ |= 0x00000010;
+        bitField0_ |= 0x00004000;
       }
     }
 
@@ -50660,7 +51328,7 @@ public Builder addAllParameters(
     public Builder clearParameters() {
       if (parametersBuilder_ == null) {
         parameters_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000010);
+        bitField0_ = (bitField0_ & ~0x00004000);
         onChanged();
       } else {
         parametersBuilder_.clear();
@@ -50797,7 +51465,7 @@ public com.google.cloud.dialogflow.v2.Intent.Parameter.Builder addParametersBuil
                 com.google.cloud.dialogflow.v2.Intent.Parameter,
                 com.google.cloud.dialogflow.v2.Intent.Parameter.Builder,
                 com.google.cloud.dialogflow.v2.Intent.ParameterOrBuilder>(
-                parameters_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
+                parameters_, ((bitField0_ & 0x00004000) != 0), getParentForChildren(), isClean());
         parameters_ = null;
       }
       return parametersBuilder_;
@@ -50807,10 +51475,10 @@ public com.google.cloud.dialogflow.v2.Intent.Parameter.Builder addParametersBuil
         java.util.Collections.emptyList();
 
     private void ensureMessagesIsMutable() {
-      if (!((bitField0_ & 0x00000020) != 0)) {
+      if (!((bitField0_ & 0x00008000) != 0)) {
         messages_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.Intent.Message>(messages_);
-        bitField0_ |= 0x00000020;
+        bitField0_ |= 0x00008000;
       }
     }
 
@@ -51059,7 +51727,7 @@ public Builder addAllMessages(
     public Builder clearMessages() {
       if (messagesBuilder_ == null) {
         messages_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000020);
+        bitField0_ = (bitField0_ & ~0x00008000);
         onChanged();
       } else {
         messagesBuilder_.clear();
@@ -51202,7 +51870,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Builder addMessagesBuilder(
                 com.google.cloud.dialogflow.v2.Intent.Message,
                 com.google.cloud.dialogflow.v2.Intent.Message.Builder,
                 com.google.cloud.dialogflow.v2.Intent.MessageOrBuilder>(
-                messages_, ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean());
+                messages_, ((bitField0_ & 0x00008000) != 0), getParentForChildren(), isClean());
         messages_ = null;
       }
       return messagesBuilder_;
@@ -51212,10 +51880,10 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Builder addMessagesBuilder(
         java.util.Collections.emptyList();
 
     private void ensureDefaultResponsePlatformsIsMutable() {
-      if (!((bitField0_ & 0x00000040) != 0)) {
+      if (!((bitField0_ & 0x00010000) != 0)) {
         defaultResponsePlatforms_ =
             new java.util.ArrayList<java.lang.Integer>(defaultResponsePlatforms_);
-        bitField0_ |= 0x00000040;
+        bitField0_ |= 0x00010000;
       }
     }
     /**
@@ -51366,7 +52034,7 @@ public Builder addAllDefaultResponsePlatforms(
      */
     public Builder clearDefaultResponsePlatforms() {
       defaultResponsePlatforms_ = java.util.Collections.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000040);
+      bitField0_ = (bitField0_ & ~0x00010000);
       onChanged();
       return this;
     }
@@ -51549,8 +52217,8 @@ public Builder setRootFollowupIntentName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       rootFollowupIntentName_ = value;
+      bitField0_ |= 0x00020000;
       onChanged();
       return this;
     }
@@ -51571,8 +52239,8 @@ public Builder setRootFollowupIntentName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearRootFollowupIntentName() {
-
       rootFollowupIntentName_ = getDefaultInstance().getRootFollowupIntentName();
+      bitField0_ = (bitField0_ & ~0x00020000);
       onChanged();
       return this;
     }
@@ -51598,8 +52266,8 @@ public Builder setRootFollowupIntentNameBytes(com.google.protobuf.ByteString val
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       rootFollowupIntentName_ = value;
+      bitField0_ |= 0x00020000;
       onChanged();
       return this;
     }
@@ -51611,9 +52279,10 @@ public Builder setRootFollowupIntentNameBytes(com.google.protobuf.ByteString val
      * <pre>
      * Read-only after creation. The unique identifier of the parent intent in the
      * chain of followup intents. You can set this field when creating an intent,
-     * for example with [CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent] or
-     * [BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents], in order to make this
-     * intent a followup intent.
+     * for example with
+     * [CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent] or
+     * [BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents],
+     * in order to make this intent a followup intent.
      * It identifies the parent followup intent.
      * Format: `projects/&lt;Project ID&gt;/agent/intents/&lt;Intent ID&gt;`.
      * </pre>
@@ -51639,9 +52308,10 @@ public java.lang.String getParentFollowupIntentName() {
      * <pre>
      * Read-only after creation. The unique identifier of the parent intent in the
      * chain of followup intents. You can set this field when creating an intent,
-     * for example with [CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent] or
-     * [BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents], in order to make this
-     * intent a followup intent.
+     * for example with
+     * [CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent] or
+     * [BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents],
+     * in order to make this intent a followup intent.
      * It identifies the parent followup intent.
      * Format: `projects/&lt;Project ID&gt;/agent/intents/&lt;Intent ID&gt;`.
      * </pre>
@@ -51667,9 +52337,10 @@ public com.google.protobuf.ByteString getParentFollowupIntentNameBytes() {
      * <pre>
      * Read-only after creation. The unique identifier of the parent intent in the
      * chain of followup intents. You can set this field when creating an intent,
-     * for example with [CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent] or
-     * [BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents], in order to make this
-     * intent a followup intent.
+     * for example with
+     * [CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent] or
+     * [BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents],
+     * in order to make this intent a followup intent.
      * It identifies the parent followup intent.
      * Format: `projects/&lt;Project ID&gt;/agent/intents/&lt;Intent ID&gt;`.
      * </pre>
@@ -51683,8 +52354,8 @@ public Builder setParentFollowupIntentName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parentFollowupIntentName_ = value;
+      bitField0_ |= 0x00040000;
       onChanged();
       return this;
     }
@@ -51694,9 +52365,10 @@ public Builder setParentFollowupIntentName(java.lang.String value) {
      * <pre>
      * Read-only after creation. The unique identifier of the parent intent in the
      * chain of followup intents. You can set this field when creating an intent,
-     * for example with [CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent] or
-     * [BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents], in order to make this
-     * intent a followup intent.
+     * for example with
+     * [CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent] or
+     * [BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents],
+     * in order to make this intent a followup intent.
      * It identifies the parent followup intent.
      * Format: `projects/&lt;Project ID&gt;/agent/intents/&lt;Intent ID&gt;`.
      * </pre>
@@ -51706,8 +52378,8 @@ public Builder setParentFollowupIntentName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParentFollowupIntentName() {
-
       parentFollowupIntentName_ = getDefaultInstance().getParentFollowupIntentName();
+      bitField0_ = (bitField0_ & ~0x00040000);
       onChanged();
       return this;
     }
@@ -51717,9 +52389,10 @@ public Builder clearParentFollowupIntentName() {
      * <pre>
      * Read-only after creation. The unique identifier of the parent intent in the
      * chain of followup intents. You can set this field when creating an intent,
-     * for example with [CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent] or
-     * [BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents], in order to make this
-     * intent a followup intent.
+     * for example with
+     * [CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent] or
+     * [BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents],
+     * in order to make this intent a followup intent.
      * It identifies the parent followup intent.
      * Format: `projects/&lt;Project ID&gt;/agent/intents/&lt;Intent ID&gt;`.
      * </pre>
@@ -51734,8 +52407,8 @@ public Builder setParentFollowupIntentNameBytes(com.google.protobuf.ByteString v
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parentFollowupIntentName_ = value;
+      bitField0_ |= 0x00040000;
       onChanged();
       return this;
     }
@@ -51744,11 +52417,11 @@ public Builder setParentFollowupIntentNameBytes(com.google.protobuf.ByteString v
         followupIntentInfo_ = java.util.Collections.emptyList();
 
     private void ensureFollowupIntentInfoIsMutable() {
-      if (!((bitField0_ & 0x00000080) != 0)) {
+      if (!((bitField0_ & 0x00080000) != 0)) {
         followupIntentInfo_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.Intent.FollowupIntentInfo>(
                 followupIntentInfo_);
-        bitField0_ |= 0x00000080;
+        bitField0_ |= 0x00080000;
       }
     }
 
@@ -51762,8 +52435,9 @@ private void ensureFollowupIntentInfoIsMutable() {
      *
      *
      * <pre>
-     * Output only. Read-only. Information about all followup intents that have this intent as
-     * a direct or indirect parent. We populate this field only in the output.
+     * Output only. Read-only. Information about all followup intents that have
+     * this intent as a direct or indirect parent. We populate this field only in
+     * the output.
      * </pre>
      *
      * <code>
@@ -51782,8 +52456,9 @@ private void ensureFollowupIntentInfoIsMutable() {
      *
      *
      * <pre>
-     * Output only. Read-only. Information about all followup intents that have this intent as
-     * a direct or indirect parent. We populate this field only in the output.
+     * Output only. Read-only. Information about all followup intents that have
+     * this intent as a direct or indirect parent. We populate this field only in
+     * the output.
      * </pre>
      *
      * <code>
@@ -51801,8 +52476,9 @@ public int getFollowupIntentInfoCount() {
      *
      *
      * <pre>
-     * Output only. Read-only. Information about all followup intents that have this intent as
-     * a direct or indirect parent. We populate this field only in the output.
+     * Output only. Read-only. Information about all followup intents that have
+     * this intent as a direct or indirect parent. We populate this field only in
+     * the output.
      * </pre>
      *
      * <code>
@@ -51821,8 +52497,9 @@ public com.google.cloud.dialogflow.v2.Intent.FollowupIntentInfo getFollowupInten
      *
      *
      * <pre>
-     * Output only. Read-only. Information about all followup intents that have this intent as
-     * a direct or indirect parent. We populate this field only in the output.
+     * Output only. Read-only. Information about all followup intents that have
+     * this intent as a direct or indirect parent. We populate this field only in
+     * the output.
      * </pre>
      *
      * <code>
@@ -51847,8 +52524,9 @@ public Builder setFollowupIntentInfo(
      *
      *
      * <pre>
-     * Output only. Read-only. Information about all followup intents that have this intent as
-     * a direct or indirect parent. We populate this field only in the output.
+     * Output only. Read-only. Information about all followup intents that have
+     * this intent as a direct or indirect parent. We populate this field only in
+     * the output.
      * </pre>
      *
      * <code>
@@ -51871,8 +52549,9 @@ public Builder setFollowupIntentInfo(
      *
      *
      * <pre>
-     * Output only. Read-only. Information about all followup intents that have this intent as
-     * a direct or indirect parent. We populate this field only in the output.
+     * Output only. Read-only. Information about all followup intents that have
+     * this intent as a direct or indirect parent. We populate this field only in
+     * the output.
      * </pre>
      *
      * <code>
@@ -51897,8 +52576,9 @@ public Builder addFollowupIntentInfo(
      *
      *
      * <pre>
-     * Output only. Read-only. Information about all followup intents that have this intent as
-     * a direct or indirect parent. We populate this field only in the output.
+     * Output only. Read-only. Information about all followup intents that have
+     * this intent as a direct or indirect parent. We populate this field only in
+     * the output.
      * </pre>
      *
      * <code>
@@ -51923,8 +52603,9 @@ public Builder addFollowupIntentInfo(
      *
      *
      * <pre>
-     * Output only. Read-only. Information about all followup intents that have this intent as
-     * a direct or indirect parent. We populate this field only in the output.
+     * Output only. Read-only. Information about all followup intents that have
+     * this intent as a direct or indirect parent. We populate this field only in
+     * the output.
      * </pre>
      *
      * <code>
@@ -51946,8 +52627,9 @@ public Builder addFollowupIntentInfo(
      *
      *
      * <pre>
-     * Output only. Read-only. Information about all followup intents that have this intent as
-     * a direct or indirect parent. We populate this field only in the output.
+     * Output only. Read-only. Information about all followup intents that have
+     * this intent as a direct or indirect parent. We populate this field only in
+     * the output.
      * </pre>
      *
      * <code>
@@ -51970,8 +52652,9 @@ public Builder addFollowupIntentInfo(
      *
      *
      * <pre>
-     * Output only. Read-only. Information about all followup intents that have this intent as
-     * a direct or indirect parent. We populate this field only in the output.
+     * Output only. Read-only. Information about all followup intents that have
+     * this intent as a direct or indirect parent. We populate this field only in
+     * the output.
      * </pre>
      *
      * <code>
@@ -51994,8 +52677,9 @@ public Builder addAllFollowupIntentInfo(
      *
      *
      * <pre>
-     * Output only. Read-only. Information about all followup intents that have this intent as
-     * a direct or indirect parent. We populate this field only in the output.
+     * Output only. Read-only. Information about all followup intents that have
+     * this intent as a direct or indirect parent. We populate this field only in
+     * the output.
      * </pre>
      *
      * <code>
@@ -52005,7 +52689,7 @@ public Builder addAllFollowupIntentInfo(
     public Builder clearFollowupIntentInfo() {
       if (followupIntentInfoBuilder_ == null) {
         followupIntentInfo_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000080);
+        bitField0_ = (bitField0_ & ~0x00080000);
         onChanged();
       } else {
         followupIntentInfoBuilder_.clear();
@@ -52016,8 +52700,9 @@ public Builder clearFollowupIntentInfo() {
      *
      *
      * <pre>
-     * Output only. Read-only. Information about all followup intents that have this intent as
-     * a direct or indirect parent. We populate this field only in the output.
+     * Output only. Read-only. Information about all followup intents that have
+     * this intent as a direct or indirect parent. We populate this field only in
+     * the output.
      * </pre>
      *
      * <code>
@@ -52038,8 +52723,9 @@ public Builder removeFollowupIntentInfo(int index) {
      *
      *
      * <pre>
-     * Output only. Read-only. Information about all followup intents that have this intent as
-     * a direct or indirect parent. We populate this field only in the output.
+     * Output only. Read-only. Information about all followup intents that have
+     * this intent as a direct or indirect parent. We populate this field only in
+     * the output.
      * </pre>
      *
      * <code>
@@ -52054,8 +52740,9 @@ public Builder removeFollowupIntentInfo(int index) {
      *
      *
      * <pre>
-     * Output only. Read-only. Information about all followup intents that have this intent as
-     * a direct or indirect parent. We populate this field only in the output.
+     * Output only. Read-only. Information about all followup intents that have
+     * this intent as a direct or indirect parent. We populate this field only in
+     * the output.
      * </pre>
      *
      * <code>
@@ -52074,8 +52761,9 @@ public Builder removeFollowupIntentInfo(int index) {
      *
      *
      * <pre>
-     * Output only. Read-only. Information about all followup intents that have this intent as
-     * a direct or indirect parent. We populate this field only in the output.
+     * Output only. Read-only. Information about all followup intents that have
+     * this intent as a direct or indirect parent. We populate this field only in
+     * the output.
      * </pre>
      *
      * <code>
@@ -52095,8 +52783,9 @@ public Builder removeFollowupIntentInfo(int index) {
      *
      *
      * <pre>
-     * Output only. Read-only. Information about all followup intents that have this intent as
-     * a direct or indirect parent. We populate this field only in the output.
+     * Output only. Read-only. Information about all followup intents that have
+     * this intent as a direct or indirect parent. We populate this field only in
+     * the output.
      * </pre>
      *
      * <code>
@@ -52113,8 +52802,9 @@ public Builder removeFollowupIntentInfo(int index) {
      *
      *
      * <pre>
-     * Output only. Read-only. Information about all followup intents that have this intent as
-     * a direct or indirect parent. We populate this field only in the output.
+     * Output only. Read-only. Information about all followup intents that have
+     * this intent as a direct or indirect parent. We populate this field only in
+     * the output.
      * </pre>
      *
      * <code>
@@ -52131,8 +52821,9 @@ public Builder removeFollowupIntentInfo(int index) {
      *
      *
      * <pre>
-     * Output only. Read-only. Information about all followup intents that have this intent as
-     * a direct or indirect parent. We populate this field only in the output.
+     * Output only. Read-only. Information about all followup intents that have
+     * this intent as a direct or indirect parent. We populate this field only in
+     * the output.
      * </pre>
      *
      * <code>
@@ -52156,7 +52847,7 @@ public Builder removeFollowupIntentInfo(int index) {
                 com.google.cloud.dialogflow.v2.Intent.FollowupIntentInfo.Builder,
                 com.google.cloud.dialogflow.v2.Intent.FollowupIntentInfoOrBuilder>(
                 followupIntentInfo_,
-                ((bitField0_ & 0x00000080) != 0),
+                ((bitField0_ & 0x00080000) != 0),
                 getParentForChildren(),
                 isClean());
         followupIntentInfo_ = null;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentBatch.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentBatch.java
index a2eda3507743..0c3309220516 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentBatch.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentBatch.java
@@ -68,6 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int INTENTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Intent> intents_;
   /**
    *
@@ -335,6 +337,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (intentsBuilder_ == null) {
         intents_ = java.util.Collections.emptyList();
       } else {
@@ -369,7 +372,15 @@ public com.google.cloud.dialogflow.v2.IntentBatch build() {
     public com.google.cloud.dialogflow.v2.IntentBatch buildPartial() {
       com.google.cloud.dialogflow.v2.IntentBatch result =
           new com.google.cloud.dialogflow.v2.IntentBatch(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.cloud.dialogflow.v2.IntentBatch result) {
       if (intentsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           intents_ = java.util.Collections.unmodifiableList(intents_);
@@ -379,8 +390,10 @@ public com.google.cloud.dialogflow.v2.IntentBatch buildPartial() {
       } else {
         result.intents_ = intentsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.IntentBatch result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentOrBuilder.java
index 24e43a068b17..fa00df9dbf4b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentOrBuilder.java
@@ -28,7 +28,9 @@ public interface IntentOrBuilder
    *
    * <pre>
    * Optional. The unique identifier of this intent.
-   * Required for [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent] and [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents]
+   * Required for
+   * [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent] and
+   * [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents]
    * methods.
    * Format: `projects/&lt;Project ID&gt;/agent/intents/&lt;Intent ID&gt;`.
    * </pre>
@@ -43,7 +45,9 @@ public interface IntentOrBuilder
    *
    * <pre>
    * Optional. The unique identifier of this intent.
-   * Required for [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent] and [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents]
+   * Required for
+   * [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent] and
+   * [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents]
    * methods.
    * Format: `projects/&lt;Project ID&gt;/agent/intents/&lt;Intent ID&gt;`.
    * </pre>
@@ -749,9 +753,10 @@ com.google.cloud.dialogflow.v2.Intent.TrainingPhraseOrBuilder getTrainingPhrases
    * <pre>
    * Read-only after creation. The unique identifier of the parent intent in the
    * chain of followup intents. You can set this field when creating an intent,
-   * for example with [CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent] or
-   * [BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents], in order to make this
-   * intent a followup intent.
+   * for example with
+   * [CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent] or
+   * [BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents],
+   * in order to make this intent a followup intent.
    * It identifies the parent followup intent.
    * Format: `projects/&lt;Project ID&gt;/agent/intents/&lt;Intent ID&gt;`.
    * </pre>
@@ -767,9 +772,10 @@ com.google.cloud.dialogflow.v2.Intent.TrainingPhraseOrBuilder getTrainingPhrases
    * <pre>
    * Read-only after creation. The unique identifier of the parent intent in the
    * chain of followup intents. You can set this field when creating an intent,
-   * for example with [CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent] or
-   * [BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents], in order to make this
-   * intent a followup intent.
+   * for example with
+   * [CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent] or
+   * [BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents],
+   * in order to make this intent a followup intent.
    * It identifies the parent followup intent.
    * Format: `projects/&lt;Project ID&gt;/agent/intents/&lt;Intent ID&gt;`.
    * </pre>
@@ -784,8 +790,9 @@ com.google.cloud.dialogflow.v2.Intent.TrainingPhraseOrBuilder getTrainingPhrases
    *
    *
    * <pre>
-   * Output only. Read-only. Information about all followup intents that have this intent as
-   * a direct or indirect parent. We populate this field only in the output.
+   * Output only. Read-only. Information about all followup intents that have
+   * this intent as a direct or indirect parent. We populate this field only in
+   * the output.
    * </pre>
    *
    * <code>
@@ -798,8 +805,9 @@ com.google.cloud.dialogflow.v2.Intent.TrainingPhraseOrBuilder getTrainingPhrases
    *
    *
    * <pre>
-   * Output only. Read-only. Information about all followup intents that have this intent as
-   * a direct or indirect parent. We populate this field only in the output.
+   * Output only. Read-only. Information about all followup intents that have
+   * this intent as a direct or indirect parent. We populate this field only in
+   * the output.
    * </pre>
    *
    * <code>
@@ -811,8 +819,9 @@ com.google.cloud.dialogflow.v2.Intent.TrainingPhraseOrBuilder getTrainingPhrases
    *
    *
    * <pre>
-   * Output only. Read-only. Information about all followup intents that have this intent as
-   * a direct or indirect parent. We populate this field only in the output.
+   * Output only. Read-only. Information about all followup intents that have
+   * this intent as a direct or indirect parent. We populate this field only in
+   * the output.
    * </pre>
    *
    * <code>
@@ -824,8 +833,9 @@ com.google.cloud.dialogflow.v2.Intent.TrainingPhraseOrBuilder getTrainingPhrases
    *
    *
    * <pre>
-   * Output only. Read-only. Information about all followup intents that have this intent as
-   * a direct or indirect parent. We populate this field only in the output.
+   * Output only. Read-only. Information about all followup intents that have
+   * this intent as a direct or indirect parent. We populate this field only in
+   * the output.
    * </pre>
    *
    * <code>
@@ -838,8 +848,9 @@ com.google.cloud.dialogflow.v2.Intent.TrainingPhraseOrBuilder getTrainingPhrases
    *
    *
    * <pre>
-   * Output only. Read-only. Information about all followup intents that have this intent as
-   * a direct or indirect parent. We populate this field only in the output.
+   * Output only. Read-only. Information about all followup intents that have
+   * this intent as a direct or indirect parent. We populate this field only in
+   * the output.
    * </pre>
    *
    * <code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentProto.java
index ec63c6d54f80..6fa687e5e930 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentProto.java
@@ -496,11 +496,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "uf.Struct\032x\312A\031dialogflow.googleapis.com\322"
           + "AYhttps://www.googleapis.com/auth/cloud-"
           + "platform,https://www.googleapis.com/auth"
-          + "/dialogflowB\232\001\n\036com.google.cloud.dialogf"
-          + "low.v2B\013IntentProtoP\001ZDgoogle.golang.org"
-          + "/genproto/googleapis/cloud/dialogflow/v2"
-          + ";dialogflow\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dialo"
-          + "gflow.V2b\006proto3"
+          + "/dialogflowB\224\001\n\036com.google.cloud.dialogf"
+          + "low.v2B\013IntentProtoP\001Z>cloud.google.com/"
+          + "go/dialogflow/apiv2/dialogflowpb;dialogf"
+          + "lowpb\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dialogflow."
+          + "V2b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/KnowledgeBase.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/KnowledgeBase.java
index e2a54ae6e8ce..366f7217e58b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/KnowledgeBase.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/KnowledgeBase.java
@@ -77,7 +77,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -132,7 +134,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
@@ -183,7 +187,9 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 4;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -457,12 +463,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       displayName_ = "";
-
       languageCode_ = "";
-
       return this;
     }
 
@@ -490,13 +494,26 @@ public com.google.cloud.dialogflow.v2.KnowledgeBase build() {
     public com.google.cloud.dialogflow.v2.KnowledgeBase buildPartial() {
       com.google.cloud.dialogflow.v2.KnowledgeBase result =
           new com.google.cloud.dialogflow.v2.KnowledgeBase(this);
-      result.name_ = name_;
-      result.displayName_ = displayName_;
-      result.languageCode_ = languageCode_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.KnowledgeBase result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.displayName_ = displayName_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -544,14 +561,17 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.KnowledgeBase other) {
       if (other == com.google.cloud.dialogflow.v2.KnowledgeBase.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -583,19 +603,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 displayName_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 34:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 34
             default:
@@ -615,6 +635,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -685,8 +707,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -705,8 +727,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -730,8 +752,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -800,8 +822,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -818,8 +840,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
-
       displayName_ = getDefaultInstance().getDisplayName();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -841,8 +863,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -914,8 +936,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -933,8 +955,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -957,8 +979,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/KnowledgeBaseProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/KnowledgeBaseProto.java
index a41a62cea86a..6aefe1556ad0 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/KnowledgeBaseProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/KnowledgeBaseProto.java
@@ -139,12 +139,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "A\032knowledge_base,update_mask\032x\312A\031dialogf"
           + "low.googleapis.com\322AYhttps://www.googlea"
           + "pis.com/auth/cloud-platform,https://www."
-          + "googleapis.com/auth/dialogflowB\241\001\n\036com.g"
+          + "googleapis.com/auth/dialogflowB\233\001\n\036com.g"
           + "oogle.cloud.dialogflow.v2B\022KnowledgeBase"
-          + "ProtoP\001ZDgoogle.golang.org/genproto/goog"
-          + "leapis/cloud/dialogflow/v2;dialogflow\370\001\001"
-          + "\242\002\002DF\252\002\032Google.Cloud.Dialogflow.V2b\006prot"
-          + "o3"
+          + "ProtoP\001Z>cloud.google.com/go/dialogflow/"
+          + "apiv2/dialogflowpb;dialogflowpb\370\001\001\242\002\002DF\252"
+          + "\002\032Google.Cloud.Dialogflow.V2b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/KnowledgeOperationMetadata.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/KnowledgeOperationMetadata.java
index 6808f1de754b..a256165986d0 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/KnowledgeOperationMetadata.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/KnowledgeOperationMetadata.java
@@ -294,7 +294,7 @@ public OperationMetadataCase getOperationMetadataCase() {
   }
 
   public static final int STATE_FIELD_NUMBER = 1;
-  private int state_;
+  private int state_ = 0;
   /**
    *
    *
@@ -327,16 +327,17 @@ public int getStateValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.KnowledgeOperationMetadata.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.KnowledgeOperationMetadata.State result =
-        com.google.cloud.dialogflow.v2.KnowledgeOperationMetadata.State.valueOf(state_);
+        com.google.cloud.dialogflow.v2.KnowledgeOperationMetadata.State.forNumber(state_);
     return result == null
         ? com.google.cloud.dialogflow.v2.KnowledgeOperationMetadata.State.UNRECOGNIZED
         : result;
   }
 
   public static final int KNOWLEDGE_BASE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object knowledgeBase_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object knowledgeBase_ = "";
   /**
    *
    *
@@ -672,10 +673,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       state_ = 0;
-
       knowledgeBase_ = "";
-
       if (exportOperationMetadataBuilder_ != null) {
         exportOperationMetadataBuilder_.clear();
       }
@@ -708,20 +708,33 @@ public com.google.cloud.dialogflow.v2.KnowledgeOperationMetadata build() {
     public com.google.cloud.dialogflow.v2.KnowledgeOperationMetadata buildPartial() {
       com.google.cloud.dialogflow.v2.KnowledgeOperationMetadata result =
           new com.google.cloud.dialogflow.v2.KnowledgeOperationMetadata(this);
-      result.state_ = state_;
-      result.knowledgeBase_ = knowledgeBase_;
-      if (operationMetadataCase_ == 4) {
-        if (exportOperationMetadataBuilder_ == null) {
-          result.operationMetadata_ = operationMetadata_;
-        } else {
-          result.operationMetadata_ = exportOperationMetadataBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.operationMetadataCase_ = operationMetadataCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.KnowledgeOperationMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.state_ = state_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.knowledgeBase_ = knowledgeBase_;
+      }
+    }
+
+    private void buildPartialOneofs(
+        com.google.cloud.dialogflow.v2.KnowledgeOperationMetadata result) {
+      result.operationMetadataCase_ = operationMetadataCase_;
+      result.operationMetadata_ = this.operationMetadata_;
+      if (operationMetadataCase_ == 4 && exportOperationMetadataBuilder_ != null) {
+        result.operationMetadata_ = exportOperationMetadataBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -773,6 +786,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.KnowledgeOperationMetada
       }
       if (!other.getKnowledgeBase().isEmpty()) {
         knowledgeBase_ = other.knowledgeBase_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       switch (other.getOperationMetadataCase()) {
@@ -815,13 +829,13 @@ public Builder mergeFrom(
             case 8:
               {
                 state_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 26:
               {
                 knowledgeBase_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 26
             case 34:
@@ -862,6 +876,8 @@ public Builder clearOperationMetadata() {
       return this;
     }
 
+    private int bitField0_;
+
     private int state_ = 0;
     /**
      *
@@ -895,8 +911,8 @@ public int getStateValue() {
      * @return This builder for chaining.
      */
     public Builder setStateValue(int value) {
-
       state_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -915,9 +931,8 @@ public Builder setStateValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.KnowledgeOperationMetadata.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.KnowledgeOperationMetadata.State result =
-          com.google.cloud.dialogflow.v2.KnowledgeOperationMetadata.State.valueOf(state_);
+          com.google.cloud.dialogflow.v2.KnowledgeOperationMetadata.State.forNumber(state_);
       return result == null
           ? com.google.cloud.dialogflow.v2.KnowledgeOperationMetadata.State.UNRECOGNIZED
           : result;
@@ -940,7 +955,7 @@ public Builder setState(com.google.cloud.dialogflow.v2.KnowledgeOperationMetadat
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       state_ = value.getNumber();
       onChanged();
       return this;
@@ -959,7 +974,7 @@ public Builder setState(com.google.cloud.dialogflow.v2.KnowledgeOperationMetadat
      * @return This builder for chaining.
      */
     public Builder clearState() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       state_ = 0;
       onChanged();
       return this;
@@ -1026,8 +1041,8 @@ public Builder setKnowledgeBase(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       knowledgeBase_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1043,8 +1058,8 @@ public Builder setKnowledgeBase(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearKnowledgeBase() {
-
       knowledgeBase_ = getDefaultInstance().getKnowledgeBase();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1065,8 +1080,8 @@ public Builder setKnowledgeBaseBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       knowledgeBase_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1292,7 +1307,6 @@ public Builder clearExportOperationMetadata() {
       }
       operationMetadataCase_ = 4;
       onChanged();
-      ;
       return exportOperationMetadataBuilder_;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListAnswerRecordsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListAnswerRecordsRequest.java
index 2c05d374e8bb..4414551be262 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListAnswerRecordsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListAnswerRecordsRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * Request message for [AnswerRecords.ListAnswerRecords][google.cloud.dialogflow.v2.AnswerRecords.ListAnswerRecords].
+ * Request message for
+ * [AnswerRecords.ListAnswerRecords][google.cloud.dialogflow.v2.AnswerRecords.ListAnswerRecords].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListAnswerRecordsRequest}
@@ -70,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -127,7 +130,9 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int FILTER_FIELD_NUMBER = 2;
-  private volatile java.lang.Object filter_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object filter_ = "";
   /**
    *
    *
@@ -141,7 +146,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    * <code>string filter = 2 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];</code>
    *
    * @deprecated google.cloud.dialogflow.v2.ListAnswerRecordsRequest.filter is deprecated. See
-   *     google/cloud/dialogflow/v2/answer_record.proto;l=135
+   *     google/cloud/dialogflow/v2/answer_record.proto;l=141
    * @return The filter.
    */
   @java.lang.Override
@@ -170,7 +175,7 @@ public java.lang.String getFilter() {
    * <code>string filter = 2 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];</code>
    *
    * @deprecated google.cloud.dialogflow.v2.ListAnswerRecordsRequest.filter is deprecated. See
-   *     google/cloud/dialogflow/v2/answer_record.proto;l=135
+   *     google/cloud/dialogflow/v2/answer_record.proto;l=141
    * @return The bytes for filter.
    */
   @java.lang.Override
@@ -188,7 +193,7 @@ public com.google.protobuf.ByteString getFilterBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 3;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -208,7 +213,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 4;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -453,7 +460,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Request message for [AnswerRecords.ListAnswerRecords][google.cloud.dialogflow.v2.AnswerRecords.ListAnswerRecords].
+   * Request message for
+   * [AnswerRecords.ListAnswerRecords][google.cloud.dialogflow.v2.AnswerRecords.ListAnswerRecords].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListAnswerRecordsRequest}
@@ -487,14 +495,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       filter_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -522,14 +527,29 @@ public com.google.cloud.dialogflow.v2.ListAnswerRecordsRequest build() {
     public com.google.cloud.dialogflow.v2.ListAnswerRecordsRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ListAnswerRecordsRequest result =
           new com.google.cloud.dialogflow.v2.ListAnswerRecordsRequest(this);
-      result.parent_ = parent_;
-      result.filter_ = filter_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListAnswerRecordsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.filter_ = filter_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -578,10 +598,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListAnswerRecordsRequest
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getFilter().isEmpty()) {
         filter_ = other.filter_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -589,6 +611,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListAnswerRecordsRequest
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -620,25 +643,25 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 filter_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 34:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -658,6 +681,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -731,8 +756,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -752,8 +777,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -778,8 +803,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -798,7 +823,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * <code>string filter = 2 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];</code>
      *
      * @deprecated google.cloud.dialogflow.v2.ListAnswerRecordsRequest.filter is deprecated. See
-     *     google/cloud/dialogflow/v2/answer_record.proto;l=135
+     *     google/cloud/dialogflow/v2/answer_record.proto;l=141
      * @return The filter.
      */
     @java.lang.Deprecated
@@ -826,7 +851,7 @@ public java.lang.String getFilter() {
      * <code>string filter = 2 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];</code>
      *
      * @deprecated google.cloud.dialogflow.v2.ListAnswerRecordsRequest.filter is deprecated. See
-     *     google/cloud/dialogflow/v2/answer_record.proto;l=135
+     *     google/cloud/dialogflow/v2/answer_record.proto;l=141
      * @return The bytes for filter.
      */
     @java.lang.Deprecated
@@ -854,7 +879,7 @@ public com.google.protobuf.ByteString getFilterBytes() {
      * <code>string filter = 2 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];</code>
      *
      * @deprecated google.cloud.dialogflow.v2.ListAnswerRecordsRequest.filter is deprecated. See
-     *     google/cloud/dialogflow/v2/answer_record.proto;l=135
+     *     google/cloud/dialogflow/v2/answer_record.proto;l=141
      * @param value The filter to set.
      * @return This builder for chaining.
      */
@@ -863,8 +888,8 @@ public Builder setFilter(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       filter_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -881,13 +906,13 @@ public Builder setFilter(java.lang.String value) {
      * <code>string filter = 2 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];</code>
      *
      * @deprecated google.cloud.dialogflow.v2.ListAnswerRecordsRequest.filter is deprecated. See
-     *     google/cloud/dialogflow/v2/answer_record.proto;l=135
+     *     google/cloud/dialogflow/v2/answer_record.proto;l=141
      * @return This builder for chaining.
      */
     @java.lang.Deprecated
     public Builder clearFilter() {
-
       filter_ = getDefaultInstance().getFilter();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -904,7 +929,7 @@ public Builder clearFilter() {
      * <code>string filter = 2 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];</code>
      *
      * @deprecated google.cloud.dialogflow.v2.ListAnswerRecordsRequest.filter is deprecated. See
-     *     google/cloud/dialogflow/v2/answer_record.proto;l=135
+     *     google/cloud/dialogflow/v2/answer_record.proto;l=141
      * @param value The bytes for filter to set.
      * @return This builder for chaining.
      */
@@ -914,8 +939,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       filter_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -955,6 +980,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -972,7 +998,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -1048,8 +1074,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1068,8 +1094,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1093,8 +1119,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListAnswerRecordsRequestOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListAnswerRecordsRequestOrBuilder.java
index 6216049ed7bf..67c067fddbb3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListAnswerRecordsRequestOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListAnswerRecordsRequestOrBuilder.java
@@ -69,7 +69,7 @@ public interface ListAnswerRecordsRequestOrBuilder
    * <code>string filter = 2 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];</code>
    *
    * @deprecated google.cloud.dialogflow.v2.ListAnswerRecordsRequest.filter is deprecated. See
-   *     google/cloud/dialogflow/v2/answer_record.proto;l=135
+   *     google/cloud/dialogflow/v2/answer_record.proto;l=141
    * @return The filter.
    */
   @java.lang.Deprecated
@@ -87,7 +87,7 @@ public interface ListAnswerRecordsRequestOrBuilder
    * <code>string filter = 2 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];</code>
    *
    * @deprecated google.cloud.dialogflow.v2.ListAnswerRecordsRequest.filter is deprecated. See
-   *     google/cloud/dialogflow/v2/answer_record.proto;l=135
+   *     google/cloud/dialogflow/v2/answer_record.proto;l=141
    * @return The bytes for filter.
    */
   @java.lang.Deprecated
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListAnswerRecordsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListAnswerRecordsResponse.java
index e1e18c6801a0..d2b699d2d5b1 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListAnswerRecordsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListAnswerRecordsResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * Response message for [AnswerRecords.ListAnswerRecords][google.cloud.dialogflow.v2.AnswerRecords.ListAnswerRecords].
+ * Response message for
+ * [AnswerRecords.ListAnswerRecords][google.cloud.dialogflow.v2.AnswerRecords.ListAnswerRecords].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListAnswerRecordsResponse}
@@ -69,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ANSWER_RECORDS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.AnswerRecord> answerRecords_;
   /**
    *
@@ -138,7 +141,9 @@ public com.google.cloud.dialogflow.v2.AnswerRecordOrBuilder getAnswerRecordsOrBu
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -371,7 +376,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Response message for [AnswerRecords.ListAnswerRecords][google.cloud.dialogflow.v2.AnswerRecords.ListAnswerRecords].
+   * Response message for
+   * [AnswerRecords.ListAnswerRecords][google.cloud.dialogflow.v2.AnswerRecords.ListAnswerRecords].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListAnswerRecordsResponse}
@@ -405,6 +411,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (answerRecordsBuilder_ == null) {
         answerRecords_ = java.util.Collections.emptyList();
       } else {
@@ -413,7 +420,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -441,7 +447,16 @@ public com.google.cloud.dialogflow.v2.ListAnswerRecordsResponse build() {
     public com.google.cloud.dialogflow.v2.ListAnswerRecordsResponse buildPartial() {
       com.google.cloud.dialogflow.v2.ListAnswerRecordsResponse result =
           new com.google.cloud.dialogflow.v2.ListAnswerRecordsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.ListAnswerRecordsResponse result) {
       if (answerRecordsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           answerRecords_ = java.util.Collections.unmodifiableList(answerRecords_);
@@ -451,9 +466,13 @@ public com.google.cloud.dialogflow.v2.ListAnswerRecordsResponse buildPartial() {
       } else {
         result.answerRecords_ = answerRecordsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListAnswerRecordsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -531,6 +550,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListAnswerRecordsRespons
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -575,7 +595,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1028,8 +1048,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1050,8 +1070,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1077,8 +1097,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsRequest.java
index f2c13e3b7164..bdb01eb8dc42 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Contexts.ListContexts][google.cloud.dialogflow.v2.Contexts.ListContexts].
+ * The request message for
+ * [Contexts.ListContexts][google.cloud.dialogflow.v2.Contexts.ListContexts].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListContextsRequest}
@@ -69,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -132,7 +135,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -151,7 +154,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -380,7 +385,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Contexts.ListContexts][google.cloud.dialogflow.v2.Contexts.ListContexts].
+   * The request message for
+   * [Contexts.ListContexts][google.cloud.dialogflow.v2.Contexts.ListContexts].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListContextsRequest}
@@ -414,12 +420,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -447,13 +451,26 @@ public com.google.cloud.dialogflow.v2.ListContextsRequest build() {
     public com.google.cloud.dialogflow.v2.ListContextsRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ListContextsRequest result =
           new com.google.cloud.dialogflow.v2.ListContextsRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListContextsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -502,6 +519,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListContextsRequest othe
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -509,6 +527,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListContextsRequest othe
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -540,19 +559,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -572,6 +591,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -654,8 +675,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -678,8 +699,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -707,8 +728,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -746,6 +767,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -762,7 +784,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -829,8 +851,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -846,8 +868,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -868,8 +890,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsResponse.java
index 77190139df88..5e4a32174710 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The response message for [Contexts.ListContexts][google.cloud.dialogflow.v2.Contexts.ListContexts].
+ * The response message for
+ * [Contexts.ListContexts][google.cloud.dialogflow.v2.Contexts.ListContexts].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListContextsResponse}
@@ -69,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONTEXTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Context> contexts_;
   /**
    *
@@ -143,7 +146,9 @@ public com.google.cloud.dialogflow.v2.ContextOrBuilder getContextsOrBuilder(int
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -367,7 +372,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The response message for [Contexts.ListContexts][google.cloud.dialogflow.v2.Contexts.ListContexts].
+   * The response message for
+   * [Contexts.ListContexts][google.cloud.dialogflow.v2.Contexts.ListContexts].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListContextsResponse}
@@ -401,6 +407,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (contextsBuilder_ == null) {
         contexts_ = java.util.Collections.emptyList();
       } else {
@@ -409,7 +416,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -437,7 +443,16 @@ public com.google.cloud.dialogflow.v2.ListContextsResponse build() {
     public com.google.cloud.dialogflow.v2.ListContextsResponse buildPartial() {
       com.google.cloud.dialogflow.v2.ListContextsResponse result =
           new com.google.cloud.dialogflow.v2.ListContextsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.ListContextsResponse result) {
       if (contextsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           contexts_ = java.util.Collections.unmodifiableList(contexts_);
@@ -447,9 +462,13 @@ public com.google.cloud.dialogflow.v2.ListContextsResponse buildPartial() {
       } else {
         result.contexts_ = contextsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListContextsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -527,6 +546,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListContextsResponse oth
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -571,7 +591,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1023,8 +1043,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1041,8 +1061,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1064,8 +1084,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationDatasetsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationDatasetsRequest.java
index 756124ed644f..d4fefa0cd328 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationDatasetsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationDatasetsRequest.java
@@ -71,13 +71,15 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
    * <pre>
-   * Required. The project and location name to list all conversation datasets for.
-   * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location ID&gt;`
+   * Required. The project and location name to list all conversation datasets
+   * for. Format: `projects/&lt;Project ID&gt;/locations/&lt;Location ID&gt;`
    * </pre>
    *
    * <code>
@@ -102,8 +104,8 @@ public java.lang.String getParent() {
    *
    *
    * <pre>
-   * Required. The project and location name to list all conversation datasets for.
-   * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location ID&gt;`
+   * Required. The project and location name to list all conversation datasets
+   * for. Format: `projects/&lt;Project ID&gt;/locations/&lt;Location ID&gt;`
    * </pre>
    *
    * <code>
@@ -126,7 +128,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -145,7 +147,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -410,12 +414,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -444,13 +446,27 @@ public com.google.cloud.dialogflow.v2.ListConversationDatasetsRequest build() {
     public com.google.cloud.dialogflow.v2.ListConversationDatasetsRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ListConversationDatasetsRequest result =
           new com.google.cloud.dialogflow.v2.ListConversationDatasetsRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.ListConversationDatasetsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -500,6 +516,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListConversationDatasets
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -507,6 +524,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListConversationDatasets
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -538,19 +556,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -570,13 +588,15 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
      *
      * <pre>
-     * Required. The project and location name to list all conversation datasets for.
-     * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location ID&gt;`
+     * Required. The project and location name to list all conversation datasets
+     * for. Format: `projects/&lt;Project ID&gt;/locations/&lt;Location ID&gt;`
      * </pre>
      *
      * <code>
@@ -600,8 +620,8 @@ public java.lang.String getParent() {
      *
      *
      * <pre>
-     * Required. The project and location name to list all conversation datasets for.
-     * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location ID&gt;`
+     * Required. The project and location name to list all conversation datasets
+     * for. Format: `projects/&lt;Project ID&gt;/locations/&lt;Location ID&gt;`
      * </pre>
      *
      * <code>
@@ -625,8 +645,8 @@ public com.google.protobuf.ByteString getParentBytes() {
      *
      *
      * <pre>
-     * Required. The project and location name to list all conversation datasets for.
-     * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location ID&gt;`
+     * Required. The project and location name to list all conversation datasets
+     * for. Format: `projects/&lt;Project ID&gt;/locations/&lt;Location ID&gt;`
      * </pre>
      *
      * <code>
@@ -640,8 +660,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -649,8 +669,8 @@ public Builder setParent(java.lang.String value) {
      *
      *
      * <pre>
-     * Required. The project and location name to list all conversation datasets for.
-     * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location ID&gt;`
+     * Required. The project and location name to list all conversation datasets
+     * for. Format: `projects/&lt;Project ID&gt;/locations/&lt;Location ID&gt;`
      * </pre>
      *
      * <code>
@@ -660,8 +680,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -669,8 +689,8 @@ public Builder clearParent() {
      *
      *
      * <pre>
-     * Required. The project and location name to list all conversation datasets for.
-     * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location ID&gt;`
+     * Required. The project and location name to list all conversation datasets
+     * for. Format: `projects/&lt;Project ID&gt;/locations/&lt;Location ID&gt;`
      * </pre>
      *
      * <code>
@@ -685,8 +705,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -724,6 +744,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -740,7 +761,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -807,8 +828,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -824,8 +845,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -846,8 +867,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationDatasetsRequestOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationDatasetsRequestOrBuilder.java
index 7678e879d5cf..5029f0e89091 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationDatasetsRequestOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationDatasetsRequestOrBuilder.java
@@ -27,8 +27,8 @@ public interface ListConversationDatasetsRequestOrBuilder
    *
    *
    * <pre>
-   * Required. The project and location name to list all conversation datasets for.
-   * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location ID&gt;`
+   * Required. The project and location name to list all conversation datasets
+   * for. Format: `projects/&lt;Project ID&gt;/locations/&lt;Location ID&gt;`
    * </pre>
    *
    * <code>
@@ -42,8 +42,8 @@ public interface ListConversationDatasetsRequestOrBuilder
    *
    *
    * <pre>
-   * Required. The project and location name to list all conversation datasets for.
-   * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location ID&gt;`
+   * Required. The project and location name to list all conversation datasets
+   * for. Format: `projects/&lt;Project ID&gt;/locations/&lt;Location ID&gt;`
    * </pre>
    *
    * <code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationDatasetsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationDatasetsResponse.java
index 32d4543690f7..ebe0264da56d 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationDatasetsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationDatasetsResponse.java
@@ -71,6 +71,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_DATASETS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.ConversationDataset> conversationDatasets_;
   /**
    *
@@ -147,7 +149,9 @@ public com.google.cloud.dialogflow.v2.ConversationDataset getConversationDataset
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -408,6 +412,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (conversationDatasetsBuilder_ == null) {
         conversationDatasets_ = java.util.Collections.emptyList();
       } else {
@@ -416,7 +421,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -445,7 +449,16 @@ public com.google.cloud.dialogflow.v2.ListConversationDatasetsResponse build() {
     public com.google.cloud.dialogflow.v2.ListConversationDatasetsResponse buildPartial() {
       com.google.cloud.dialogflow.v2.ListConversationDatasetsResponse result =
           new com.google.cloud.dialogflow.v2.ListConversationDatasetsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.ListConversationDatasetsResponse result) {
       if (conversationDatasetsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           conversationDatasets_ = java.util.Collections.unmodifiableList(conversationDatasets_);
@@ -455,9 +468,14 @@ public com.google.cloud.dialogflow.v2.ListConversationDatasetsResponse buildPart
       } else {
         result.conversationDatasets_ = conversationDatasetsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.ListConversationDatasetsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -537,6 +555,7 @@ public Builder mergeFrom(
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -582,7 +601,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1050,8 +1069,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1068,8 +1087,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1091,8 +1110,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationModelEvaluationsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationModelEvaluationsRequest.java
index e6c489b047ef..b7da5481199e 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationModelEvaluationsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationModelEvaluationsRequest.java
@@ -72,7 +72,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -123,7 +125,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -142,7 +144,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -409,12 +413,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -445,13 +447,27 @@ public com.google.cloud.dialogflow.v2.ListConversationModelEvaluationsRequest bu
     public com.google.cloud.dialogflow.v2.ListConversationModelEvaluationsRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ListConversationModelEvaluationsRequest result =
           new com.google.cloud.dialogflow.v2.ListConversationModelEvaluationsRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.ListConversationModelEvaluationsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -503,6 +519,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -510,6 +527,7 @@ public Builder mergeFrom(
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -541,19 +559,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -573,6 +591,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -637,8 +657,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -655,8 +675,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -678,8 +698,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -717,6 +737,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -733,7 +754,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -800,8 +821,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -817,8 +838,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -839,8 +860,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationModelEvaluationsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationModelEvaluationsResponse.java
index 8df27378370f..2484cc5bcf1f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationModelEvaluationsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationModelEvaluationsResponse.java
@@ -72,6 +72,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_MODEL_EVALUATIONS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.ConversationModelEvaluation>
       conversationModelEvaluations_;
   /**
@@ -156,7 +158,9 @@ public com.google.cloud.dialogflow.v2.ConversationModelEvaluation getConversatio
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -422,6 +426,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (conversationModelEvaluationsBuilder_ == null) {
         conversationModelEvaluations_ = java.util.Collections.emptyList();
       } else {
@@ -430,7 +435,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -461,7 +465,16 @@ public com.google.cloud.dialogflow.v2.ListConversationModelEvaluationsResponse b
     public com.google.cloud.dialogflow.v2.ListConversationModelEvaluationsResponse buildPartial() {
       com.google.cloud.dialogflow.v2.ListConversationModelEvaluationsResponse result =
           new com.google.cloud.dialogflow.v2.ListConversationModelEvaluationsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.ListConversationModelEvaluationsResponse result) {
       if (conversationModelEvaluationsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           conversationModelEvaluations_ =
@@ -472,9 +485,14 @@ public com.google.cloud.dialogflow.v2.ListConversationModelEvaluationsResponse b
       } else {
         result.conversationModelEvaluations_ = conversationModelEvaluationsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.ListConversationModelEvaluationsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -557,6 +575,7 @@ public Builder mergeFrom(
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -602,7 +621,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1096,8 +1115,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1114,8 +1133,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1137,8 +1156,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationModelsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationModelsRequest.java
index 1b1630679d38..bb61526b122f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationModelsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationModelsRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -121,7 +123,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -140,7 +142,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -405,12 +409,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -439,13 +441,27 @@ public com.google.cloud.dialogflow.v2.ListConversationModelsRequest build() {
     public com.google.cloud.dialogflow.v2.ListConversationModelsRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ListConversationModelsRequest result =
           new com.google.cloud.dialogflow.v2.ListConversationModelsRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.ListConversationModelsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -495,6 +511,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListConversationModelsRe
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -502,6 +519,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListConversationModelsRe
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -533,19 +551,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -565,6 +583,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -629,8 +649,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -647,8 +667,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -670,8 +690,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -709,6 +729,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -725,7 +746,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -792,8 +813,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -809,8 +830,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -831,8 +852,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationModelsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationModelsResponse.java
index 2e43cac5019c..9ebf3097011e 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationModelsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationModelsResponse.java
@@ -71,6 +71,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_MODELS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.ConversationModel> conversationModels_;
   /**
    *
@@ -142,7 +144,9 @@ public com.google.cloud.dialogflow.v2.ConversationModelOrBuilder getConversation
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -403,6 +407,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (conversationModelsBuilder_ == null) {
         conversationModels_ = java.util.Collections.emptyList();
       } else {
@@ -411,7 +416,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -440,7 +444,16 @@ public com.google.cloud.dialogflow.v2.ListConversationModelsResponse build() {
     public com.google.cloud.dialogflow.v2.ListConversationModelsResponse buildPartial() {
       com.google.cloud.dialogflow.v2.ListConversationModelsResponse result =
           new com.google.cloud.dialogflow.v2.ListConversationModelsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.ListConversationModelsResponse result) {
       if (conversationModelsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           conversationModels_ = java.util.Collections.unmodifiableList(conversationModels_);
@@ -450,9 +463,14 @@ public com.google.cloud.dialogflow.v2.ListConversationModelsResponse buildPartia
       } else {
         result.conversationModels_ = conversationModelsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.ListConversationModelsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -531,6 +549,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListConversationModelsRe
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -576,7 +595,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1023,8 +1042,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1041,8 +1060,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1064,8 +1083,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationProfilesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationProfilesRequest.java
index 769c9b085977..b6df409cf304 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationProfilesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationProfilesRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [ConversationProfiles.ListConversationProfiles][google.cloud.dialogflow.v2.ConversationProfiles.ListConversationProfiles].
+ * The request message for
+ * [ConversationProfiles.ListConversationProfiles][google.cloud.dialogflow.v2.ConversationProfiles.ListConversationProfiles].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListConversationProfilesRequest}
@@ -70,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -125,7 +128,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -144,7 +147,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -374,7 +379,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [ConversationProfiles.ListConversationProfiles][google.cloud.dialogflow.v2.ConversationProfiles.ListConversationProfiles].
+   * The request message for
+   * [ConversationProfiles.ListConversationProfiles][google.cloud.dialogflow.v2.ConversationProfiles.ListConversationProfiles].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListConversationProfilesRequest}
@@ -408,12 +414,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -442,13 +446,27 @@ public com.google.cloud.dialogflow.v2.ListConversationProfilesRequest build() {
     public com.google.cloud.dialogflow.v2.ListConversationProfilesRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ListConversationProfilesRequest result =
           new com.google.cloud.dialogflow.v2.ListConversationProfilesRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.ListConversationProfilesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -498,6 +516,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListConversationProfiles
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -505,6 +524,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListConversationProfiles
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -536,19 +556,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -568,6 +588,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -638,8 +660,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -658,8 +680,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -683,8 +705,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -722,6 +744,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -738,7 +761,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -805,8 +828,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -822,8 +845,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -844,8 +867,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationProfilesResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationProfilesResponse.java
index e885920f8380..85ac683b91c4 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationProfilesResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationProfilesResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The response message for [ConversationProfiles.ListConversationProfiles][google.cloud.dialogflow.v2.ConversationProfiles.ListConversationProfiles].
+ * The response message for
+ * [ConversationProfiles.ListConversationProfiles][google.cloud.dialogflow.v2.ConversationProfiles.ListConversationProfiles].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListConversationProfilesResponse}
@@ -70,6 +71,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_PROFILES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.ConversationProfile> conversationProfiles_;
   /**
    *
@@ -151,7 +154,9 @@ public com.google.cloud.dialogflow.v2.ConversationProfile getConversationProfile
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -377,7 +382,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The response message for [ConversationProfiles.ListConversationProfiles][google.cloud.dialogflow.v2.ConversationProfiles.ListConversationProfiles].
+   * The response message for
+   * [ConversationProfiles.ListConversationProfiles][google.cloud.dialogflow.v2.ConversationProfiles.ListConversationProfiles].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListConversationProfilesResponse}
@@ -411,6 +417,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (conversationProfilesBuilder_ == null) {
         conversationProfiles_ = java.util.Collections.emptyList();
       } else {
@@ -419,7 +426,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -448,7 +454,16 @@ public com.google.cloud.dialogflow.v2.ListConversationProfilesResponse build() {
     public com.google.cloud.dialogflow.v2.ListConversationProfilesResponse buildPartial() {
       com.google.cloud.dialogflow.v2.ListConversationProfilesResponse result =
           new com.google.cloud.dialogflow.v2.ListConversationProfilesResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.ListConversationProfilesResponse result) {
       if (conversationProfilesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           conversationProfiles_ = java.util.Collections.unmodifiableList(conversationProfiles_);
@@ -458,9 +473,14 @@ public com.google.cloud.dialogflow.v2.ListConversationProfilesResponse buildPart
       } else {
         result.conversationProfiles_ = conversationProfilesBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.ListConversationProfilesResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -540,6 +560,7 @@ public Builder mergeFrom(
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -585,7 +606,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1071,8 +1092,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1089,8 +1110,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1112,8 +1133,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationsRequest.java
index 00e4e42e1408..3ef5b9459562 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationsRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Conversations.ListConversations][google.cloud.dialogflow.v2.Conversations.ListConversations].
+ * The request message for
+ * [Conversations.ListConversations][google.cloud.dialogflow.v2.Conversations.ListConversations].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListConversationsRequest}
@@ -70,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -125,7 +128,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -144,7 +147,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -193,7 +198,9 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
   }
 
   public static final int FILTER_FIELD_NUMBER = 4;
-  private volatile java.lang.Object filter_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object filter_ = "";
   /**
    *
    *
@@ -460,7 +467,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Conversations.ListConversations][google.cloud.dialogflow.v2.Conversations.ListConversations].
+   * The request message for
+   * [Conversations.ListConversations][google.cloud.dialogflow.v2.Conversations.ListConversations].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListConversationsRequest}
@@ -494,14 +502,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       filter_ = "";
-
       return this;
     }
 
@@ -529,14 +534,29 @@ public com.google.cloud.dialogflow.v2.ListConversationsRequest build() {
     public com.google.cloud.dialogflow.v2.ListConversationsRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ListConversationsRequest result =
           new com.google.cloud.dialogflow.v2.ListConversationsRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
-      result.filter_ = filter_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListConversationsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.filter_ = filter_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -585,6 +605,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListConversationsRequest
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -592,10 +613,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListConversationsRequest
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getFilter().isEmpty()) {
         filter_ = other.filter_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -627,25 +650,25 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 filter_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -665,6 +688,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -735,8 +760,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -755,8 +780,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -780,8 +805,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -819,6 +844,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -835,7 +861,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -902,8 +928,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -919,8 +945,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -941,8 +967,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1050,8 +1076,8 @@ public Builder setFilter(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       filter_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1081,8 +1107,8 @@ public Builder setFilter(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFilter() {
-
       filter_ = getDefaultInstance().getFilter();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1117,8 +1143,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       filter_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationsResponse.java
index ac4d10760a29..7276876eefaf 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListConversationsResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The response message for [Conversations.ListConversations][google.cloud.dialogflow.v2.Conversations.ListConversations].
+ * The response message for
+ * [Conversations.ListConversations][google.cloud.dialogflow.v2.Conversations.ListConversations].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListConversationsResponse}
@@ -69,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATIONS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Conversation> conversations_;
   /**
    *
@@ -143,7 +146,9 @@ public com.google.cloud.dialogflow.v2.ConversationOrBuilder getConversationsOrBu
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -368,7 +373,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The response message for [Conversations.ListConversations][google.cloud.dialogflow.v2.Conversations.ListConversations].
+   * The response message for
+   * [Conversations.ListConversations][google.cloud.dialogflow.v2.Conversations.ListConversations].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListConversationsResponse}
@@ -402,6 +408,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (conversationsBuilder_ == null) {
         conversations_ = java.util.Collections.emptyList();
       } else {
@@ -410,7 +417,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -438,7 +444,16 @@ public com.google.cloud.dialogflow.v2.ListConversationsResponse build() {
     public com.google.cloud.dialogflow.v2.ListConversationsResponse buildPartial() {
       com.google.cloud.dialogflow.v2.ListConversationsResponse result =
           new com.google.cloud.dialogflow.v2.ListConversationsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.ListConversationsResponse result) {
       if (conversationsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           conversations_ = java.util.Collections.unmodifiableList(conversations_);
@@ -448,9 +463,13 @@ public com.google.cloud.dialogflow.v2.ListConversationsResponse buildPartial() {
       } else {
         result.conversations_ = conversationsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListConversationsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -528,6 +547,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListConversationsRespons
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -572,7 +592,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1031,8 +1051,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1049,8 +1069,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1072,8 +1092,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListDocumentsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListDocumentsRequest.java
index 2c4e8743852a..0731d014f80b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListDocumentsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListDocumentsRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * Request message for [Documents.ListDocuments][google.cloud.dialogflow.v2.Documents.ListDocuments].
+ * Request message for
+ * [Documents.ListDocuments][google.cloud.dialogflow.v2.Documents.ListDocuments].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListDocumentsRequest}
@@ -70,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -127,7 +130,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -146,7 +149,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -195,7 +200,9 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
   }
 
   public static final int FILTER_FIELD_NUMBER = 4;
-  private volatile java.lang.Object filter_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object filter_ = "";
   /**
    *
    *
@@ -461,7 +468,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Request message for [Documents.ListDocuments][google.cloud.dialogflow.v2.Documents.ListDocuments].
+   * Request message for
+   * [Documents.ListDocuments][google.cloud.dialogflow.v2.Documents.ListDocuments].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListDocumentsRequest}
@@ -495,14 +503,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       filter_ = "";
-
       return this;
     }
 
@@ -530,14 +535,29 @@ public com.google.cloud.dialogflow.v2.ListDocumentsRequest build() {
     public com.google.cloud.dialogflow.v2.ListDocumentsRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ListDocumentsRequest result =
           new com.google.cloud.dialogflow.v2.ListDocumentsRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
-      result.filter_ = filter_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListDocumentsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.filter_ = filter_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -586,6 +606,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListDocumentsRequest oth
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -593,10 +614,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListDocumentsRequest oth
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getFilter().isEmpty()) {
         filter_ = other.filter_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -628,25 +651,25 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 filter_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -666,6 +689,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -739,8 +764,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -760,8 +785,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -786,8 +811,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -825,6 +850,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -841,7 +867,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -908,8 +934,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -925,8 +951,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -947,8 +973,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1056,8 +1082,8 @@ public Builder setFilter(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       filter_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1087,8 +1113,8 @@ public Builder setFilter(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFilter() {
-
       filter_ = getDefaultInstance().getFilter();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1123,8 +1149,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       filter_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListDocumentsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListDocumentsResponse.java
index d9a2820e5ac2..2d2003adf158 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListDocumentsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListDocumentsResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * Response message for [Documents.ListDocuments][google.cloud.dialogflow.v2.Documents.ListDocuments].
+ * Response message for
+ * [Documents.ListDocuments][google.cloud.dialogflow.v2.Documents.ListDocuments].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListDocumentsResponse}
@@ -69,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int DOCUMENTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Document> documents_;
   /**
    *
@@ -138,7 +141,9 @@ public com.google.cloud.dialogflow.v2.DocumentOrBuilder getDocumentsOrBuilder(in
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -362,7 +367,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Response message for [Documents.ListDocuments][google.cloud.dialogflow.v2.Documents.ListDocuments].
+   * Response message for
+   * [Documents.ListDocuments][google.cloud.dialogflow.v2.Documents.ListDocuments].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListDocumentsResponse}
@@ -396,6 +402,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (documentsBuilder_ == null) {
         documents_ = java.util.Collections.emptyList();
       } else {
@@ -404,7 +411,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -432,7 +438,16 @@ public com.google.cloud.dialogflow.v2.ListDocumentsResponse build() {
     public com.google.cloud.dialogflow.v2.ListDocumentsResponse buildPartial() {
       com.google.cloud.dialogflow.v2.ListDocumentsResponse result =
           new com.google.cloud.dialogflow.v2.ListDocumentsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.ListDocumentsResponse result) {
       if (documentsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           documents_ = java.util.Collections.unmodifiableList(documents_);
@@ -442,9 +457,13 @@ public com.google.cloud.dialogflow.v2.ListDocumentsResponse buildPartial() {
       } else {
         result.documents_ = documentsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListDocumentsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -522,6 +541,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListDocumentsResponse ot
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -566,7 +586,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1001,8 +1021,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1019,8 +1039,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1042,8 +1062,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesRequest.java
index 5a45bdc9583f..3ac6eacb452c 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [EntityTypes.ListEntityTypes][google.cloud.dialogflow.v2.EntityTypes.ListEntityTypes].
+ * The request message for
+ * [EntityTypes.ListEntityTypes][google.cloud.dialogflow.v2.EntityTypes.ListEntityTypes].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListEntityTypesRequest}
@@ -70,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -125,7 +128,9 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -182,7 +187,7 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 3;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -201,7 +206,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 4;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -440,7 +447,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [EntityTypes.ListEntityTypes][google.cloud.dialogflow.v2.EntityTypes.ListEntityTypes].
+   * The request message for
+   * [EntityTypes.ListEntityTypes][google.cloud.dialogflow.v2.EntityTypes.ListEntityTypes].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListEntityTypesRequest}
@@ -474,14 +482,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       languageCode_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -509,14 +514,29 @@ public com.google.cloud.dialogflow.v2.ListEntityTypesRequest build() {
     public com.google.cloud.dialogflow.v2.ListEntityTypesRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ListEntityTypesRequest result =
           new com.google.cloud.dialogflow.v2.ListEntityTypesRequest(this);
-      result.parent_ = parent_;
-      result.languageCode_ = languageCode_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListEntityTypesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -565,10 +585,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListEntityTypesRequest o
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -576,6 +598,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListEntityTypesRequest o
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -607,25 +630,25 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 34:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -645,6 +668,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -715,8 +740,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -735,8 +760,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -760,8 +785,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -839,8 +864,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -860,8 +885,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -886,8 +911,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -925,6 +950,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -941,7 +967,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -1008,8 +1034,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1025,8 +1051,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1047,8 +1073,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesResponse.java
index 8ad994f52372..b7af70098c3c 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The response message for [EntityTypes.ListEntityTypes][google.cloud.dialogflow.v2.EntityTypes.ListEntityTypes].
+ * The response message for
+ * [EntityTypes.ListEntityTypes][google.cloud.dialogflow.v2.EntityTypes.ListEntityTypes].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListEntityTypesResponse}
@@ -69,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ENTITY_TYPES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.EntityType> entityTypes_;
   /**
    *
@@ -143,7 +146,9 @@ public com.google.cloud.dialogflow.v2.EntityTypeOrBuilder getEntityTypesOrBuilde
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -368,7 +373,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The response message for [EntityTypes.ListEntityTypes][google.cloud.dialogflow.v2.EntityTypes.ListEntityTypes].
+   * The response message for
+   * [EntityTypes.ListEntityTypes][google.cloud.dialogflow.v2.EntityTypes.ListEntityTypes].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListEntityTypesResponse}
@@ -402,6 +408,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (entityTypesBuilder_ == null) {
         entityTypes_ = java.util.Collections.emptyList();
       } else {
@@ -410,7 +417,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -438,7 +444,16 @@ public com.google.cloud.dialogflow.v2.ListEntityTypesResponse build() {
     public com.google.cloud.dialogflow.v2.ListEntityTypesResponse buildPartial() {
       com.google.cloud.dialogflow.v2.ListEntityTypesResponse result =
           new com.google.cloud.dialogflow.v2.ListEntityTypesResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.ListEntityTypesResponse result) {
       if (entityTypesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           entityTypes_ = java.util.Collections.unmodifiableList(entityTypes_);
@@ -448,9 +463,13 @@ public com.google.cloud.dialogflow.v2.ListEntityTypesResponse buildPartial() {
       } else {
         result.entityTypes_ = entityTypesBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListEntityTypesResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -528,6 +547,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListEntityTypesResponse
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -572,7 +592,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1027,8 +1047,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1045,8 +1065,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1068,8 +1088,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEnvironmentsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEnvironmentsRequest.java
index 195978f01bb6..3ca35b172553 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEnvironmentsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEnvironmentsRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Environments.ListEnvironments][google.cloud.dialogflow.v2.Environments.ListEnvironments].
+ * The request message for
+ * [Environments.ListEnvironments][google.cloud.dialogflow.v2.Environments.ListEnvironments].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListEnvironmentsRequest}
@@ -69,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -128,13 +131,13 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
    * <pre>
-   * Optional. The maximum number of items to return in a single page. By default 100 and
-   * at most 1000.
+   * Optional. The maximum number of items to return in a single page. By
+   * default 100 and at most 1000.
    * </pre>
    *
    * <code>int32 page_size = 2 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -147,7 +150,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -377,7 +382,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Environments.ListEnvironments][google.cloud.dialogflow.v2.Environments.ListEnvironments].
+   * The request message for
+   * [Environments.ListEnvironments][google.cloud.dialogflow.v2.Environments.ListEnvironments].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListEnvironmentsRequest}
@@ -411,12 +417,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -444,13 +448,26 @@ public com.google.cloud.dialogflow.v2.ListEnvironmentsRequest build() {
     public com.google.cloud.dialogflow.v2.ListEnvironmentsRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ListEnvironmentsRequest result =
           new com.google.cloud.dialogflow.v2.ListEnvironmentsRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListEnvironmentsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -499,6 +516,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListEnvironmentsRequest
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -506,6 +524,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListEnvironmentsRequest
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -537,19 +556,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -569,6 +588,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -645,8 +666,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -667,8 +688,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -694,8 +715,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -705,8 +726,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      *
      *
      * <pre>
-     * Optional. The maximum number of items to return in a single page. By default 100 and
-     * at most 1000.
+     * Optional. The maximum number of items to return in a single page. By
+     * default 100 and at most 1000.
      * </pre>
      *
      * <code>int32 page_size = 2 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -721,8 +742,8 @@ public int getPageSize() {
      *
      *
      * <pre>
-     * Optional. The maximum number of items to return in a single page. By default 100 and
-     * at most 1000.
+     * Optional. The maximum number of items to return in a single page. By
+     * default 100 and at most 1000.
      * </pre>
      *
      * <code>int32 page_size = 2 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -733,6 +754,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -740,8 +762,8 @@ public Builder setPageSize(int value) {
      *
      *
      * <pre>
-     * Optional. The maximum number of items to return in a single page. By default 100 and
-     * at most 1000.
+     * Optional. The maximum number of items to return in a single page. By
+     * default 100 and at most 1000.
      * </pre>
      *
      * <code>int32 page_size = 2 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -749,7 +771,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -816,8 +838,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -833,8 +855,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -855,8 +877,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEnvironmentsRequestOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEnvironmentsRequestOrBuilder.java
index 581acdb12243..c56d2c92d979 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEnvironmentsRequestOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEnvironmentsRequestOrBuilder.java
@@ -62,8 +62,8 @@ public interface ListEnvironmentsRequestOrBuilder
    *
    *
    * <pre>
-   * Optional. The maximum number of items to return in a single page. By default 100 and
-   * at most 1000.
+   * Optional. The maximum number of items to return in a single page. By
+   * default 100 and at most 1000.
    * </pre>
    *
    * <code>int32 page_size = 2 [(.google.api.field_behavior) = OPTIONAL];</code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEnvironmentsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEnvironmentsResponse.java
index 55ecc9a2e134..41960ddbf7bd 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEnvironmentsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEnvironmentsResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The response message for [Environments.ListEnvironments][google.cloud.dialogflow.v2.Environments.ListEnvironments].
+ * The response message for
+ * [Environments.ListEnvironments][google.cloud.dialogflow.v2.Environments.ListEnvironments].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListEnvironmentsResponse}
@@ -69,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ENVIRONMENTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Environment> environments_;
   /**
    *
@@ -143,7 +146,9 @@ public com.google.cloud.dialogflow.v2.EnvironmentOrBuilder getEnvironmentsOrBuil
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -368,7 +373,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The response message for [Environments.ListEnvironments][google.cloud.dialogflow.v2.Environments.ListEnvironments].
+   * The response message for
+   * [Environments.ListEnvironments][google.cloud.dialogflow.v2.Environments.ListEnvironments].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListEnvironmentsResponse}
@@ -402,6 +408,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (environmentsBuilder_ == null) {
         environments_ = java.util.Collections.emptyList();
       } else {
@@ -410,7 +417,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -438,7 +444,16 @@ public com.google.cloud.dialogflow.v2.ListEnvironmentsResponse build() {
     public com.google.cloud.dialogflow.v2.ListEnvironmentsResponse buildPartial() {
       com.google.cloud.dialogflow.v2.ListEnvironmentsResponse result =
           new com.google.cloud.dialogflow.v2.ListEnvironmentsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.ListEnvironmentsResponse result) {
       if (environmentsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           environments_ = java.util.Collections.unmodifiableList(environments_);
@@ -448,9 +463,13 @@ public com.google.cloud.dialogflow.v2.ListEnvironmentsResponse buildPartial() {
       } else {
         result.environments_ = environmentsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListEnvironmentsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -528,6 +547,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListEnvironmentsResponse
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -572,7 +592,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1027,8 +1047,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1045,8 +1065,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1068,8 +1088,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsRequest.java
index c057c4d72a3f..91b786202144 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Intents.ListIntents][google.cloud.dialogflow.v2.Intents.ListIntents].
+ * The request message for
+ * [Intents.ListIntents][google.cloud.dialogflow.v2.Intents.ListIntents].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListIntentsRequest}
@@ -71,7 +72,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -140,7 +143,9 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -197,7 +202,7 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
   }
 
   public static final int INTENT_VIEW_FIELD_NUMBER = 3;
-  private int intentView_;
+  private int intentView_ = 0;
   /**
    *
    *
@@ -230,14 +235,13 @@ public int getIntentViewValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.IntentView getIntentView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.IntentView result =
-        com.google.cloud.dialogflow.v2.IntentView.valueOf(intentView_);
+        com.google.cloud.dialogflow.v2.IntentView.forNumber(intentView_);
     return result == null ? com.google.cloud.dialogflow.v2.IntentView.UNRECOGNIZED : result;
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 4;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -256,7 +260,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 5;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -505,7 +511,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Intents.ListIntents][google.cloud.dialogflow.v2.Intents.ListIntents].
+   * The request message for
+   * [Intents.ListIntents][google.cloud.dialogflow.v2.Intents.ListIntents].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListIntentsRequest}
@@ -539,16 +546,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       languageCode_ = "";
-
       intentView_ = 0;
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -576,15 +579,32 @@ public com.google.cloud.dialogflow.v2.ListIntentsRequest build() {
     public com.google.cloud.dialogflow.v2.ListIntentsRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ListIntentsRequest result =
           new com.google.cloud.dialogflow.v2.ListIntentsRequest(this);
-      result.parent_ = parent_;
-      result.languageCode_ = languageCode_;
-      result.intentView_ = intentView_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListIntentsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.intentView_ = intentView_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -633,10 +653,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListIntentsRequest other
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.intentView_ != 0) {
@@ -647,6 +669,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListIntentsRequest other
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000010;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -678,31 +701,31 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 intentView_ = input.readEnum();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 32:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 32
             case 42:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             default:
@@ -722,6 +745,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -813,8 +838,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -840,8 +865,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -872,8 +897,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -951,8 +976,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -972,8 +997,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -998,8 +1023,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1037,8 +1062,8 @@ public int getIntentViewValue() {
      * @return This builder for chaining.
      */
     public Builder setIntentViewValue(int value) {
-
       intentView_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1057,9 +1082,8 @@ public Builder setIntentViewValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.IntentView getIntentView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.IntentView result =
-          com.google.cloud.dialogflow.v2.IntentView.valueOf(intentView_);
+          com.google.cloud.dialogflow.v2.IntentView.forNumber(intentView_);
       return result == null ? com.google.cloud.dialogflow.v2.IntentView.UNRECOGNIZED : result;
     }
     /**
@@ -1080,7 +1104,7 @@ public Builder setIntentView(com.google.cloud.dialogflow.v2.IntentView value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000004;
       intentView_ = value.getNumber();
       onChanged();
       return this;
@@ -1099,7 +1123,7 @@ public Builder setIntentView(com.google.cloud.dialogflow.v2.IntentView value) {
      * @return This builder for chaining.
      */
     public Builder clearIntentView() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       intentView_ = 0;
       onChanged();
       return this;
@@ -1138,6 +1162,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1154,7 +1179,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -1221,8 +1246,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1238,8 +1263,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000010);
       onChanged();
       return this;
     }
@@ -1260,8 +1285,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsResponse.java
index e630a3556596..0d25d99cfae4 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The response message for [Intents.ListIntents][google.cloud.dialogflow.v2.Intents.ListIntents].
+ * The response message for
+ * [Intents.ListIntents][google.cloud.dialogflow.v2.Intents.ListIntents].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListIntentsResponse}
@@ -69,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int INTENTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Intent> intents_;
   /**
    *
@@ -143,7 +146,9 @@ public com.google.cloud.dialogflow.v2.IntentOrBuilder getIntentsOrBuilder(int in
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -367,7 +372,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The response message for [Intents.ListIntents][google.cloud.dialogflow.v2.Intents.ListIntents].
+   * The response message for
+   * [Intents.ListIntents][google.cloud.dialogflow.v2.Intents.ListIntents].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListIntentsResponse}
@@ -401,6 +407,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (intentsBuilder_ == null) {
         intents_ = java.util.Collections.emptyList();
       } else {
@@ -409,7 +416,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -437,7 +443,16 @@ public com.google.cloud.dialogflow.v2.ListIntentsResponse build() {
     public com.google.cloud.dialogflow.v2.ListIntentsResponse buildPartial() {
       com.google.cloud.dialogflow.v2.ListIntentsResponse result =
           new com.google.cloud.dialogflow.v2.ListIntentsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.ListIntentsResponse result) {
       if (intentsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           intents_ = java.util.Collections.unmodifiableList(intents_);
@@ -447,9 +462,13 @@ public com.google.cloud.dialogflow.v2.ListIntentsResponse buildPartial() {
       } else {
         result.intents_ = intentsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListIntentsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -527,6 +546,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListIntentsResponse othe
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -571,7 +591,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1023,8 +1043,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1041,8 +1061,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1064,8 +1084,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListKnowledgeBasesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListKnowledgeBasesRequest.java
index 93d1eb35d6f3..2797e52d746d 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListKnowledgeBasesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListKnowledgeBasesRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * Request message for [KnowledgeBases.ListKnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBases.ListKnowledgeBases].
+ * Request message for
+ * [KnowledgeBases.ListKnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBases.ListKnowledgeBases].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListKnowledgeBasesRequest}
@@ -70,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -125,7 +128,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -144,7 +147,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -193,7 +198,9 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
   }
 
   public static final int FILTER_FIELD_NUMBER = 4;
-  private volatile java.lang.Object filter_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object filter_ = "";
   /**
    *
    *
@@ -468,7 +475,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Request message for [KnowledgeBases.ListKnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBases.ListKnowledgeBases].
+   * Request message for
+   * [KnowledgeBases.ListKnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBases.ListKnowledgeBases].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListKnowledgeBasesRequest}
@@ -502,14 +510,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       filter_ = "";
-
       return this;
     }
 
@@ -537,14 +542,29 @@ public com.google.cloud.dialogflow.v2.ListKnowledgeBasesRequest build() {
     public com.google.cloud.dialogflow.v2.ListKnowledgeBasesRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ListKnowledgeBasesRequest result =
           new com.google.cloud.dialogflow.v2.ListKnowledgeBasesRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
-      result.filter_ = filter_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListKnowledgeBasesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.filter_ = filter_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -593,6 +613,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListKnowledgeBasesReques
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -600,10 +621,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListKnowledgeBasesReques
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getFilter().isEmpty()) {
         filter_ = other.filter_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -635,25 +658,25 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 filter_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -673,6 +696,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -743,8 +768,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -763,8 +788,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -788,8 +813,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -827,6 +852,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -843,7 +869,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -910,8 +936,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -927,8 +953,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -949,8 +975,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1070,8 +1096,8 @@ public Builder setFilter(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       filter_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1105,8 +1131,8 @@ public Builder setFilter(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFilter() {
-
       filter_ = getDefaultInstance().getFilter();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1145,8 +1171,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       filter_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListKnowledgeBasesResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListKnowledgeBasesResponse.java
index 537fb58d8463..7d98f8fbc593 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListKnowledgeBasesResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListKnowledgeBasesResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * Response message for [KnowledgeBases.ListKnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBases.ListKnowledgeBases].
+ * Response message for
+ * [KnowledgeBases.ListKnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBases.ListKnowledgeBases].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListKnowledgeBasesResponse}
@@ -69,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int KNOWLEDGE_BASES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.KnowledgeBase> knowledgeBases_;
   /**
    *
@@ -139,7 +142,9 @@ public com.google.cloud.dialogflow.v2.KnowledgeBaseOrBuilder getKnowledgeBasesOr
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -364,7 +369,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Response message for [KnowledgeBases.ListKnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBases.ListKnowledgeBases].
+   * Response message for
+   * [KnowledgeBases.ListKnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBases.ListKnowledgeBases].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListKnowledgeBasesResponse}
@@ -398,6 +404,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (knowledgeBasesBuilder_ == null) {
         knowledgeBases_ = java.util.Collections.emptyList();
       } else {
@@ -406,7 +413,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -434,7 +440,16 @@ public com.google.cloud.dialogflow.v2.ListKnowledgeBasesResponse build() {
     public com.google.cloud.dialogflow.v2.ListKnowledgeBasesResponse buildPartial() {
       com.google.cloud.dialogflow.v2.ListKnowledgeBasesResponse result =
           new com.google.cloud.dialogflow.v2.ListKnowledgeBasesResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.ListKnowledgeBasesResponse result) {
       if (knowledgeBasesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           knowledgeBases_ = java.util.Collections.unmodifiableList(knowledgeBases_);
@@ -444,9 +459,13 @@ public com.google.cloud.dialogflow.v2.ListKnowledgeBasesResponse buildPartial()
       } else {
         result.knowledgeBases_ = knowledgeBasesBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListKnowledgeBasesResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -524,6 +543,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListKnowledgeBasesRespon
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -568,7 +588,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1013,8 +1033,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1031,8 +1051,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1054,8 +1074,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListMessagesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListMessagesRequest.java
index e11674357d3e..8d65711d3e47 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListMessagesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListMessagesRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages].
+ * The request message for
+ * [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListMessagesRequest}
@@ -70,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -127,7 +130,9 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int FILTER_FIELD_NUMBER = 4;
-  private volatile java.lang.Object filter_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object filter_ = "";
   /**
    *
    *
@@ -188,7 +193,7 @@ public com.google.protobuf.ByteString getFilterBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -207,7 +212,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -445,7 +452,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages].
+   * The request message for
+   * [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListMessagesRequest}
@@ -479,14 +487,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       filter_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -514,14 +519,29 @@ public com.google.cloud.dialogflow.v2.ListMessagesRequest build() {
     public com.google.cloud.dialogflow.v2.ListMessagesRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ListMessagesRequest result =
           new com.google.cloud.dialogflow.v2.ListMessagesRequest(this);
-      result.parent_ = parent_;
-      result.filter_ = filter_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListMessagesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.filter_ = filter_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -570,10 +590,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListMessagesRequest othe
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getFilter().isEmpty()) {
         filter_ = other.filter_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -581,6 +603,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListMessagesRequest othe
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -612,25 +635,25 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 26
             case 34:
               {
                 filter_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 34
             default:
@@ -650,6 +673,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -723,8 +748,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -744,8 +769,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -770,8 +795,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -855,8 +880,8 @@ public Builder setFilter(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       filter_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -878,8 +903,8 @@ public Builder setFilter(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFilter() {
-
       filter_ = getDefaultInstance().getFilter();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -906,8 +931,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       filter_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -945,6 +970,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -961,7 +987,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -1028,8 +1054,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1045,8 +1071,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1067,8 +1093,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListMessagesResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListMessagesResponse.java
index 380dd5e8524c..2f6505c2ba05 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListMessagesResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListMessagesResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The response message for [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages].
+ * The response message for
+ * [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListMessagesResponse}
@@ -69,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int MESSAGES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Message> messages_;
   /**
    *
@@ -148,7 +151,9 @@ public com.google.cloud.dialogflow.v2.MessageOrBuilder getMessagesOrBuilder(int
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -372,7 +377,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The response message for [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages].
+   * The response message for
+   * [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListMessagesResponse}
@@ -406,6 +412,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (messagesBuilder_ == null) {
         messages_ = java.util.Collections.emptyList();
       } else {
@@ -414,7 +421,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -442,7 +448,16 @@ public com.google.cloud.dialogflow.v2.ListMessagesResponse build() {
     public com.google.cloud.dialogflow.v2.ListMessagesResponse buildPartial() {
       com.google.cloud.dialogflow.v2.ListMessagesResponse result =
           new com.google.cloud.dialogflow.v2.ListMessagesResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.ListMessagesResponse result) {
       if (messagesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           messages_ = java.util.Collections.unmodifiableList(messages_);
@@ -452,9 +467,13 @@ public com.google.cloud.dialogflow.v2.ListMessagesResponse buildPartial() {
       } else {
         result.messages_ = messagesBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListMessagesResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -532,6 +551,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListMessagesResponse oth
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -576,7 +596,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1046,8 +1066,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1064,8 +1084,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1087,8 +1107,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListParticipantsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListParticipantsRequest.java
index f26f7dfcef46..88c5cf6a68bd 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListParticipantsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListParticipantsRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Participants.ListParticipants][google.cloud.dialogflow.v2.Participants.ListParticipants].
+ * The request message for
+ * [Participants.ListParticipants][google.cloud.dialogflow.v2.Participants.ListParticipants].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListParticipantsRequest}
@@ -69,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -126,7 +129,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -145,7 +148,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -375,7 +380,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Participants.ListParticipants][google.cloud.dialogflow.v2.Participants.ListParticipants].
+   * The request message for
+   * [Participants.ListParticipants][google.cloud.dialogflow.v2.Participants.ListParticipants].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListParticipantsRequest}
@@ -409,12 +415,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -442,13 +446,26 @@ public com.google.cloud.dialogflow.v2.ListParticipantsRequest build() {
     public com.google.cloud.dialogflow.v2.ListParticipantsRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ListParticipantsRequest result =
           new com.google.cloud.dialogflow.v2.ListParticipantsRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListParticipantsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -497,6 +514,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListParticipantsRequest
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -504,6 +522,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListParticipantsRequest
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -535,19 +554,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -567,6 +586,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -640,8 +661,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -661,8 +682,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -687,8 +708,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -726,6 +747,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -742,7 +764,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -809,8 +831,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -826,8 +848,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -848,8 +870,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListParticipantsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListParticipantsResponse.java
index b58cbc8dd7eb..d8f782019865 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListParticipantsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListParticipantsResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The response message for [Participants.ListParticipants][google.cloud.dialogflow.v2.Participants.ListParticipants].
+ * The response message for
+ * [Participants.ListParticipants][google.cloud.dialogflow.v2.Participants.ListParticipants].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListParticipantsResponse}
@@ -69,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARTICIPANTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Participant> participants_;
   /**
    *
@@ -143,7 +146,9 @@ public com.google.cloud.dialogflow.v2.ParticipantOrBuilder getParticipantsOrBuil
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -368,7 +373,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The response message for [Participants.ListParticipants][google.cloud.dialogflow.v2.Participants.ListParticipants].
+   * The response message for
+   * [Participants.ListParticipants][google.cloud.dialogflow.v2.Participants.ListParticipants].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListParticipantsResponse}
@@ -402,6 +408,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (participantsBuilder_ == null) {
         participants_ = java.util.Collections.emptyList();
       } else {
@@ -410,7 +417,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -438,7 +444,16 @@ public com.google.cloud.dialogflow.v2.ListParticipantsResponse build() {
     public com.google.cloud.dialogflow.v2.ListParticipantsResponse buildPartial() {
       com.google.cloud.dialogflow.v2.ListParticipantsResponse result =
           new com.google.cloud.dialogflow.v2.ListParticipantsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.ListParticipantsResponse result) {
       if (participantsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           participants_ = java.util.Collections.unmodifiableList(participants_);
@@ -448,9 +463,13 @@ public com.google.cloud.dialogflow.v2.ListParticipantsResponse buildPartial() {
       } else {
         result.participants_ = participantsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListParticipantsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -528,6 +547,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListParticipantsResponse
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -572,7 +592,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1027,8 +1047,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1045,8 +1065,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1068,8 +1088,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesRequest.java
index 03dc301e3a01..3df51ae1be67 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [SessionEntityTypes.ListSessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityTypes.ListSessionEntityTypes].
+ * The request message for
+ * [SessionEntityTypes.ListSessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityTypes.ListSessionEntityTypes].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListSessionEntityTypesRequest}
@@ -69,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -132,7 +135,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -151,7 +154,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -381,7 +386,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [SessionEntityTypes.ListSessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityTypes.ListSessionEntityTypes].
+   * The request message for
+   * [SessionEntityTypes.ListSessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityTypes.ListSessionEntityTypes].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListSessionEntityTypesRequest}
@@ -415,12 +421,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -449,13 +453,27 @@ public com.google.cloud.dialogflow.v2.ListSessionEntityTypesRequest build() {
     public com.google.cloud.dialogflow.v2.ListSessionEntityTypesRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ListSessionEntityTypesRequest result =
           new com.google.cloud.dialogflow.v2.ListSessionEntityTypesRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.ListSessionEntityTypesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -505,6 +523,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListSessionEntityTypesRe
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -512,6 +531,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListSessionEntityTypesRe
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -543,19 +563,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -575,6 +595,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -657,8 +679,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -681,8 +703,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -710,8 +732,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -749,6 +771,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -765,7 +788,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -832,8 +855,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -849,8 +872,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -871,8 +894,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesResponse.java
index f3ce87645b2c..c8e2513a8624 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The response message for [SessionEntityTypes.ListSessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityTypes.ListSessionEntityTypes].
+ * The response message for
+ * [SessionEntityTypes.ListSessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityTypes.ListSessionEntityTypes].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListSessionEntityTypesResponse}
@@ -70,6 +71,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SESSION_ENTITY_TYPES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.SessionEntityType> sessionEntityTypes_;
   /**
    *
@@ -146,7 +149,9 @@ public com.google.cloud.dialogflow.v2.SessionEntityTypeOrBuilder getSessionEntit
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -372,7 +377,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The response message for [SessionEntityTypes.ListSessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityTypes.ListSessionEntityTypes].
+   * The response message for
+   * [SessionEntityTypes.ListSessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityTypes.ListSessionEntityTypes].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListSessionEntityTypesResponse}
@@ -406,6 +412,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (sessionEntityTypesBuilder_ == null) {
         sessionEntityTypes_ = java.util.Collections.emptyList();
       } else {
@@ -414,7 +421,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -443,7 +449,16 @@ public com.google.cloud.dialogflow.v2.ListSessionEntityTypesResponse build() {
     public com.google.cloud.dialogflow.v2.ListSessionEntityTypesResponse buildPartial() {
       com.google.cloud.dialogflow.v2.ListSessionEntityTypesResponse result =
           new com.google.cloud.dialogflow.v2.ListSessionEntityTypesResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.ListSessionEntityTypesResponse result) {
       if (sessionEntityTypesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           sessionEntityTypes_ = java.util.Collections.unmodifiableList(sessionEntityTypes_);
@@ -453,9 +468,14 @@ public com.google.cloud.dialogflow.v2.ListSessionEntityTypesResponse buildPartia
       } else {
         result.sessionEntityTypes_ = sessionEntityTypesBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.ListSessionEntityTypesResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -534,6 +554,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListSessionEntityTypesRe
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -579,7 +600,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1044,8 +1065,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1062,8 +1083,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1085,8 +1106,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListVersionsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListVersionsRequest.java
index c95382439ea5..95848e0c9d1d 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListVersionsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListVersionsRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Versions.ListVersions][google.cloud.dialogflow.v2.Versions.ListVersions].
+ * The request message for
+ * [Versions.ListVersions][google.cloud.dialogflow.v2.Versions.ListVersions].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListVersionsRequest}
@@ -69,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -128,13 +131,13 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
    * <pre>
-   * Optional. The maximum number of items to return in a single page. By default 100 and
-   * at most 1000.
+   * Optional. The maximum number of items to return in a single page. By
+   * default 100 and at most 1000.
    * </pre>
    *
    * <code>int32 page_size = 2 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -147,7 +150,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -376,7 +381,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Versions.ListVersions][google.cloud.dialogflow.v2.Versions.ListVersions].
+   * The request message for
+   * [Versions.ListVersions][google.cloud.dialogflow.v2.Versions.ListVersions].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListVersionsRequest}
@@ -410,12 +416,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -443,13 +447,26 @@ public com.google.cloud.dialogflow.v2.ListVersionsRequest build() {
     public com.google.cloud.dialogflow.v2.ListVersionsRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ListVersionsRequest result =
           new com.google.cloud.dialogflow.v2.ListVersionsRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListVersionsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -498,6 +515,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListVersionsRequest othe
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -505,6 +523,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListVersionsRequest othe
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -536,19 +555,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -568,6 +587,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -644,8 +665,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -666,8 +687,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -693,8 +714,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -704,8 +725,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      *
      *
      * <pre>
-     * Optional. The maximum number of items to return in a single page. By default 100 and
-     * at most 1000.
+     * Optional. The maximum number of items to return in a single page. By
+     * default 100 and at most 1000.
      * </pre>
      *
      * <code>int32 page_size = 2 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -720,8 +741,8 @@ public int getPageSize() {
      *
      *
      * <pre>
-     * Optional. The maximum number of items to return in a single page. By default 100 and
-     * at most 1000.
+     * Optional. The maximum number of items to return in a single page. By
+     * default 100 and at most 1000.
      * </pre>
      *
      * <code>int32 page_size = 2 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -732,6 +753,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -739,8 +761,8 @@ public Builder setPageSize(int value) {
      *
      *
      * <pre>
-     * Optional. The maximum number of items to return in a single page. By default 100 and
-     * at most 1000.
+     * Optional. The maximum number of items to return in a single page. By
+     * default 100 and at most 1000.
      * </pre>
      *
      * <code>int32 page_size = 2 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -748,7 +770,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -815,8 +837,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -832,8 +854,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -854,8 +876,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListVersionsRequestOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListVersionsRequestOrBuilder.java
index 19df9e677fa5..5e74140a8a51 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListVersionsRequestOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListVersionsRequestOrBuilder.java
@@ -62,8 +62,8 @@ public interface ListVersionsRequestOrBuilder
    *
    *
    * <pre>
-   * Optional. The maximum number of items to return in a single page. By default 100 and
-   * at most 1000.
+   * Optional. The maximum number of items to return in a single page. By
+   * default 100 and at most 1000.
    * </pre>
    *
    * <code>int32 page_size = 2 [(.google.api.field_behavior) = OPTIONAL];</code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListVersionsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListVersionsResponse.java
index 997f173a304f..1a6a1351113f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListVersionsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListVersionsResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The response message for [Versions.ListVersions][google.cloud.dialogflow.v2.Versions.ListVersions].
+ * The response message for
+ * [Versions.ListVersions][google.cloud.dialogflow.v2.Versions.ListVersions].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ListVersionsResponse}
@@ -69,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int VERSIONS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Version> versions_;
   /**
    *
@@ -143,7 +146,9 @@ public com.google.cloud.dialogflow.v2.VersionOrBuilder getVersionsOrBuilder(int
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -367,7 +372,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The response message for [Versions.ListVersions][google.cloud.dialogflow.v2.Versions.ListVersions].
+   * The response message for
+   * [Versions.ListVersions][google.cloud.dialogflow.v2.Versions.ListVersions].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ListVersionsResponse}
@@ -401,6 +407,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (versionsBuilder_ == null) {
         versions_ = java.util.Collections.emptyList();
       } else {
@@ -409,7 +416,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -437,7 +443,16 @@ public com.google.cloud.dialogflow.v2.ListVersionsResponse build() {
     public com.google.cloud.dialogflow.v2.ListVersionsResponse buildPartial() {
       com.google.cloud.dialogflow.v2.ListVersionsResponse result =
           new com.google.cloud.dialogflow.v2.ListVersionsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.ListVersionsResponse result) {
       if (versionsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           versions_ = java.util.Collections.unmodifiableList(versions_);
@@ -447,9 +462,13 @@ public com.google.cloud.dialogflow.v2.ListVersionsResponse buildPartial() {
       } else {
         result.versions_ = versionsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ListVersionsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -527,6 +546,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ListVersionsResponse oth
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -571,7 +591,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1023,8 +1043,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1041,8 +1061,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1064,8 +1084,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/LoggingConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/LoggingConfig.java
index 36bf7b46c0a3..af9ce11c8575 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/LoggingConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/LoggingConfig.java
@@ -66,14 +66,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ENABLE_STACKDRIVER_LOGGING_FIELD_NUMBER = 3;
-  private boolean enableStackdriverLogging_;
+  private boolean enableStackdriverLogging_ = false;
   /**
    *
    *
    * <pre>
    * Whether to log conversation events like
-   * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED] to
-   * Stackdriver in the conversation project as JSON format
+   * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED]
+   * to Stackdriver in the conversation project as JSON format
    * [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
    * </pre>
    *
@@ -283,8 +283,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       enableStackdriverLogging_ = false;
-
       return this;
     }
 
@@ -312,11 +312,20 @@ public com.google.cloud.dialogflow.v2.LoggingConfig build() {
     public com.google.cloud.dialogflow.v2.LoggingConfig buildPartial() {
       com.google.cloud.dialogflow.v2.LoggingConfig result =
           new com.google.cloud.dialogflow.v2.LoggingConfig(this);
-      result.enableStackdriverLogging_ = enableStackdriverLogging_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.LoggingConfig result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.enableStackdriverLogging_ = enableStackdriverLogging_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -394,7 +403,7 @@ public Builder mergeFrom(
             case 24:
               {
                 enableStackdriverLogging_ = input.readBool();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 24
             default:
@@ -414,14 +423,16 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private boolean enableStackdriverLogging_;
     /**
      *
      *
      * <pre>
      * Whether to log conversation events like
-     * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED] to
-     * Stackdriver in the conversation project as JSON format
+     * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED]
+     * to Stackdriver in the conversation project as JSON format
      * [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
      * </pre>
      *
@@ -438,8 +449,8 @@ public boolean getEnableStackdriverLogging() {
      *
      * <pre>
      * Whether to log conversation events like
-     * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED] to
-     * Stackdriver in the conversation project as JSON format
+     * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED]
+     * to Stackdriver in the conversation project as JSON format
      * [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
      * </pre>
      *
@@ -451,6 +462,7 @@ public boolean getEnableStackdriverLogging() {
     public Builder setEnableStackdriverLogging(boolean value) {
 
       enableStackdriverLogging_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -459,8 +471,8 @@ public Builder setEnableStackdriverLogging(boolean value) {
      *
      * <pre>
      * Whether to log conversation events like
-     * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED] to
-     * Stackdriver in the conversation project as JSON format
+     * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED]
+     * to Stackdriver in the conversation project as JSON format
      * [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
      * </pre>
      *
@@ -469,7 +481,7 @@ public Builder setEnableStackdriverLogging(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearEnableStackdriverLogging() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       enableStackdriverLogging_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/LoggingConfigOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/LoggingConfigOrBuilder.java
index 52f689bbc8c1..15c43b2a0125 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/LoggingConfigOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/LoggingConfigOrBuilder.java
@@ -28,8 +28,8 @@ public interface LoggingConfigOrBuilder
    *
    * <pre>
    * Whether to log conversation events like
-   * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED] to
-   * Stackdriver in the conversation project as JSON format
+   * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED]
+   * to Stackdriver in the conversation project as JSON format
    * [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
    * </pre>
    *
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Message.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Message.java
index 562cb2efec99..aee05a872001 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Message.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Message.java
@@ -72,7 +72,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -125,7 +127,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int CONTENT_FIELD_NUMBER = 2;
-  private volatile java.lang.Object content_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object content_ = "";
   /**
    *
    *
@@ -174,7 +178,9 @@ public com.google.protobuf.ByteString getContentBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -227,7 +233,9 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
   }
 
   public static final int PARTICIPANT_FIELD_NUMBER = 4;
-  private volatile java.lang.Object participant_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object participant_ = "";
   /**
    *
    *
@@ -276,7 +284,7 @@ public com.google.protobuf.ByteString getParticipantBytes() {
   }
 
   public static final int PARTICIPANT_ROLE_FIELD_NUMBER = 5;
-  private int participantRole_;
+  private int participantRole_ = 0;
   /**
    *
    *
@@ -309,9 +317,8 @@ public int getParticipantRoleValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.Participant.Role getParticipantRole() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.Participant.Role result =
-        com.google.cloud.dialogflow.v2.Participant.Role.valueOf(participantRole_);
+        com.google.cloud.dialogflow.v2.Participant.Role.forNumber(participantRole_);
     return result == null ? com.google.cloud.dialogflow.v2.Participant.Role.UNRECOGNIZED : result;
   }
 
@@ -361,7 +368,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
 
   public static final int SEND_TIME_FIELD_NUMBER = 9;
@@ -410,7 +417,7 @@ public com.google.protobuf.Timestamp getSendTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getSendTimeOrBuilder() {
-    return getSendTime();
+    return sendTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : sendTime_;
   }
 
   public static final int MESSAGE_ANNOTATION_FIELD_NUMBER = 7;
@@ -464,7 +471,9 @@ public com.google.cloud.dialogflow.v2.MessageAnnotation getMessageAnnotation() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.MessageAnnotationOrBuilder getMessageAnnotationOrBuilder() {
-    return getMessageAnnotation();
+    return messageAnnotation_ == null
+        ? com.google.cloud.dialogflow.v2.MessageAnnotation.getDefaultInstance()
+        : messageAnnotation_;
   }
 
   public static final int SENTIMENT_ANALYSIS_FIELD_NUMBER = 8;
@@ -519,7 +528,9 @@ public com.google.cloud.dialogflow.v2.SentimentAnalysisResult getSentimentAnalys
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.SentimentAnalysisResultOrBuilder
       getSentimentAnalysisOrBuilder() {
-    return getSentimentAnalysis();
+    return sentimentAnalysis_ == null
+        ? com.google.cloud.dialogflow.v2.SentimentAnalysisResult.getDefaultInstance()
+        : sentimentAnalysis_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -812,38 +823,30 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       content_ = "";
-
       languageCode_ = "";
-
       participant_ = "";
-
       participantRole_ = 0;
-
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-      if (sendTimeBuilder_ == null) {
-        sendTime_ = null;
-      } else {
-        sendTime_ = null;
+      sendTime_ = null;
+      if (sendTimeBuilder_ != null) {
+        sendTimeBuilder_.dispose();
         sendTimeBuilder_ = null;
       }
-      if (messageAnnotationBuilder_ == null) {
-        messageAnnotation_ = null;
-      } else {
-        messageAnnotation_ = null;
+      messageAnnotation_ = null;
+      if (messageAnnotationBuilder_ != null) {
+        messageAnnotationBuilder_.dispose();
         messageAnnotationBuilder_ = null;
       }
-      if (sentimentAnalysisBuilder_ == null) {
-        sentimentAnalysis_ = null;
-      } else {
-        sentimentAnalysis_ = null;
+      sentimentAnalysis_ = null;
+      if (sentimentAnalysisBuilder_ != null) {
+        sentimentAnalysisBuilder_.dispose();
         sentimentAnalysisBuilder_ = null;
       }
       return this;
@@ -873,33 +876,48 @@ public com.google.cloud.dialogflow.v2.Message build() {
     public com.google.cloud.dialogflow.v2.Message buildPartial() {
       com.google.cloud.dialogflow.v2.Message result =
           new com.google.cloud.dialogflow.v2.Message(this);
-      result.name_ = name_;
-      result.content_ = content_;
-      result.languageCode_ = languageCode_;
-      result.participant_ = participant_;
-      result.participantRole_ = participantRole_;
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (sendTimeBuilder_ == null) {
-        result.sendTime_ = sendTime_;
-      } else {
-        result.sendTime_ = sendTimeBuilder_.build();
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.Message result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
       }
-      if (messageAnnotationBuilder_ == null) {
-        result.messageAnnotation_ = messageAnnotation_;
-      } else {
-        result.messageAnnotation_ = messageAnnotationBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.content_ = content_;
       }
-      if (sentimentAnalysisBuilder_ == null) {
-        result.sentimentAnalysis_ = sentimentAnalysis_;
-      } else {
-        result.sentimentAnalysis_ = sentimentAnalysisBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.participant_ = participant_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.participantRole_ = participantRole_;
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.sendTime_ = sendTimeBuilder_ == null ? sendTime_ : sendTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.messageAnnotation_ =
+            messageAnnotationBuilder_ == null
+                ? messageAnnotation_
+                : messageAnnotationBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000100) != 0)) {
+        result.sentimentAnalysis_ =
+            sentimentAnalysisBuilder_ == null
+                ? sentimentAnalysis_
+                : sentimentAnalysisBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -949,18 +967,22 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Message other) {
       if (other == com.google.cloud.dialogflow.v2.Message.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getContent().isEmpty()) {
         content_ = other.content_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getParticipant().isEmpty()) {
         participant_ = other.participant_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (other.participantRole_ != 0) {
@@ -1007,57 +1029,57 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 content_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 participant_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 40:
               {
                 participantRole_ = input.readEnum();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 40
             case 50:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 50
             case 58:
               {
                 input.readMessage(
                     getMessageAnnotationFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 58
             case 66:
               {
                 input.readMessage(
                     getSentimentAnalysisFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000100;
                 break;
               } // case 66
             case 74:
               {
                 input.readMessage(getSendTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 74
             default:
@@ -1077,6 +1099,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -1144,8 +1168,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1163,8 +1187,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1187,8 +1211,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1254,8 +1278,8 @@ public Builder setContent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       content_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1271,8 +1295,8 @@ public Builder setContent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearContent() {
-
       content_ = getDefaultInstance().getContent();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1293,8 +1317,8 @@ public Builder setContentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       content_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1366,8 +1390,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1385,8 +1409,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1409,8 +1433,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1476,8 +1500,8 @@ public Builder setParticipant(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       participant_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1493,8 +1517,8 @@ public Builder setParticipant(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParticipant() {
-
       participant_ = getDefaultInstance().getParticipant();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1515,8 +1539,8 @@ public Builder setParticipantBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       participant_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1554,8 +1578,8 @@ public int getParticipantRoleValue() {
      * @return This builder for chaining.
      */
     public Builder setParticipantRoleValue(int value) {
-
       participantRole_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1574,9 +1598,8 @@ public Builder setParticipantRoleValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.Participant.Role getParticipantRole() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.Participant.Role result =
-          com.google.cloud.dialogflow.v2.Participant.Role.valueOf(participantRole_);
+          com.google.cloud.dialogflow.v2.Participant.Role.forNumber(participantRole_);
       return result == null ? com.google.cloud.dialogflow.v2.Participant.Role.UNRECOGNIZED : result;
     }
     /**
@@ -1597,7 +1620,7 @@ public Builder setParticipantRole(com.google.cloud.dialogflow.v2.Participant.Rol
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000010;
       participantRole_ = value.getNumber();
       onChanged();
       return this;
@@ -1616,7 +1639,7 @@ public Builder setParticipantRole(com.google.cloud.dialogflow.v2.Participant.Rol
      * @return This builder for chaining.
      */
     public Builder clearParticipantRole() {
-
+      bitField0_ = (bitField0_ & ~0x00000010);
       participantRole_ = 0;
       onChanged();
       return this;
@@ -1642,7 +1665,7 @@ public Builder clearParticipantRole() {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -1683,11 +1706,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1704,11 +1727,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1724,17 +1747,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
         } else {
           createTime_ = value;
         }
-        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1749,14 +1773,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * </code>
      */
     public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1771,7 +1794,7 @@ public Builder clearCreateTime() {
      * </code>
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
@@ -1842,7 +1865,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
      * @return Whether the sendTime field is set.
      */
     public boolean hasSendTime() {
-      return sendTimeBuilder_ != null || sendTime_ != null;
+      return ((bitField0_ & 0x00000040) != 0);
     }
     /**
      *
@@ -1879,11 +1902,11 @@ public Builder setSendTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         sendTime_ = value;
-        onChanged();
       } else {
         sendTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -1899,11 +1922,11 @@ public Builder setSendTime(com.google.protobuf.Timestamp value) {
     public Builder setSendTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (sendTimeBuilder_ == null) {
         sendTime_ = builderForValue.build();
-        onChanged();
       } else {
         sendTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -1918,17 +1941,18 @@ public Builder setSendTime(com.google.protobuf.Timestamp.Builder builderForValue
      */
     public Builder mergeSendTime(com.google.protobuf.Timestamp value) {
       if (sendTimeBuilder_ == null) {
-        if (sendTime_ != null) {
-          sendTime_ =
-              com.google.protobuf.Timestamp.newBuilder(sendTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000040) != 0)
+            && sendTime_ != null
+            && sendTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getSendTimeBuilder().mergeFrom(value);
         } else {
           sendTime_ = value;
         }
-        onChanged();
       } else {
         sendTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -1942,14 +1966,13 @@ public Builder mergeSendTime(com.google.protobuf.Timestamp value) {
      * </code>
      */
     public Builder clearSendTime() {
-      if (sendTimeBuilder_ == null) {
-        sendTime_ = null;
-        onChanged();
-      } else {
-        sendTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      sendTime_ = null;
+      if (sendTimeBuilder_ != null) {
+        sendTimeBuilder_.dispose();
         sendTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1963,7 +1986,7 @@ public Builder clearSendTime() {
      * </code>
      */
     public com.google.protobuf.Timestamp.Builder getSendTimeBuilder() {
-
+      bitField0_ |= 0x00000040;
       onChanged();
       return getSendTimeFieldBuilder().getBuilder();
     }
@@ -2031,7 +2054,7 @@ public com.google.protobuf.TimestampOrBuilder getSendTimeOrBuilder() {
      * @return Whether the messageAnnotation field is set.
      */
     public boolean hasMessageAnnotation() {
-      return messageAnnotationBuilder_ != null || messageAnnotation_ != null;
+      return ((bitField0_ & 0x00000080) != 0);
     }
     /**
      *
@@ -2072,11 +2095,11 @@ public Builder setMessageAnnotation(com.google.cloud.dialogflow.v2.MessageAnnota
           throw new NullPointerException();
         }
         messageAnnotation_ = value;
-        onChanged();
       } else {
         messageAnnotationBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2094,11 +2117,11 @@ public Builder setMessageAnnotation(
         com.google.cloud.dialogflow.v2.MessageAnnotation.Builder builderForValue) {
       if (messageAnnotationBuilder_ == null) {
         messageAnnotation_ = builderForValue.build();
-        onChanged();
       } else {
         messageAnnotationBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2114,19 +2137,19 @@ public Builder setMessageAnnotation(
      */
     public Builder mergeMessageAnnotation(com.google.cloud.dialogflow.v2.MessageAnnotation value) {
       if (messageAnnotationBuilder_ == null) {
-        if (messageAnnotation_ != null) {
-          messageAnnotation_ =
-              com.google.cloud.dialogflow.v2.MessageAnnotation.newBuilder(messageAnnotation_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000080) != 0)
+            && messageAnnotation_ != null
+            && messageAnnotation_
+                != com.google.cloud.dialogflow.v2.MessageAnnotation.getDefaultInstance()) {
+          getMessageAnnotationBuilder().mergeFrom(value);
         } else {
           messageAnnotation_ = value;
         }
-        onChanged();
       } else {
         messageAnnotationBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2141,14 +2164,13 @@ public Builder mergeMessageAnnotation(com.google.cloud.dialogflow.v2.MessageAnno
      * </code>
      */
     public Builder clearMessageAnnotation() {
-      if (messageAnnotationBuilder_ == null) {
-        messageAnnotation_ = null;
-        onChanged();
-      } else {
-        messageAnnotation_ = null;
+      bitField0_ = (bitField0_ & ~0x00000080);
+      messageAnnotation_ = null;
+      if (messageAnnotationBuilder_ != null) {
+        messageAnnotationBuilder_.dispose();
         messageAnnotationBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2163,7 +2185,7 @@ public Builder clearMessageAnnotation() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.MessageAnnotation.Builder getMessageAnnotationBuilder() {
-
+      bitField0_ |= 0x00000080;
       onChanged();
       return getMessageAnnotationFieldBuilder().getBuilder();
     }
@@ -2236,7 +2258,7 @@ public com.google.cloud.dialogflow.v2.MessageAnnotation.Builder getMessageAnnota
      * @return Whether the sentimentAnalysis field is set.
      */
     public boolean hasSentimentAnalysis() {
-      return sentimentAnalysisBuilder_ != null || sentimentAnalysis_ != null;
+      return ((bitField0_ & 0x00000100) != 0);
     }
     /**
      *
@@ -2278,11 +2300,11 @@ public Builder setSentimentAnalysis(
           throw new NullPointerException();
         }
         sentimentAnalysis_ = value;
-        onChanged();
       } else {
         sentimentAnalysisBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -2300,11 +2322,11 @@ public Builder setSentimentAnalysis(
         com.google.cloud.dialogflow.v2.SentimentAnalysisResult.Builder builderForValue) {
       if (sentimentAnalysisBuilder_ == null) {
         sentimentAnalysis_ = builderForValue.build();
-        onChanged();
       } else {
         sentimentAnalysisBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -2321,19 +2343,19 @@ public Builder setSentimentAnalysis(
     public Builder mergeSentimentAnalysis(
         com.google.cloud.dialogflow.v2.SentimentAnalysisResult value) {
       if (sentimentAnalysisBuilder_ == null) {
-        if (sentimentAnalysis_ != null) {
-          sentimentAnalysis_ =
-              com.google.cloud.dialogflow.v2.SentimentAnalysisResult.newBuilder(sentimentAnalysis_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000100) != 0)
+            && sentimentAnalysis_ != null
+            && sentimentAnalysis_
+                != com.google.cloud.dialogflow.v2.SentimentAnalysisResult.getDefaultInstance()) {
+          getSentimentAnalysisBuilder().mergeFrom(value);
         } else {
           sentimentAnalysis_ = value;
         }
-        onChanged();
       } else {
         sentimentAnalysisBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -2348,14 +2370,13 @@ public Builder mergeSentimentAnalysis(
      * </code>
      */
     public Builder clearSentimentAnalysis() {
-      if (sentimentAnalysisBuilder_ == null) {
-        sentimentAnalysis_ = null;
-        onChanged();
-      } else {
-        sentimentAnalysis_ = null;
+      bitField0_ = (bitField0_ & ~0x00000100);
+      sentimentAnalysis_ = null;
+      if (sentimentAnalysisBuilder_ != null) {
+        sentimentAnalysisBuilder_.dispose();
         sentimentAnalysisBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2371,7 +2392,7 @@ public Builder clearSentimentAnalysis() {
      */
     public com.google.cloud.dialogflow.v2.SentimentAnalysisResult.Builder
         getSentimentAnalysisBuilder() {
-
+      bitField0_ |= 0x00000100;
       onChanged();
       return getSentimentAnalysisFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/MessageAnnotation.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/MessageAnnotation.java
index 2f71a8e8b697..e1ca8c797689 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/MessageAnnotation.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/MessageAnnotation.java
@@ -68,6 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.AnnotatedMessagePart> parts_;
   /**
    *
@@ -147,7 +149,7 @@ public com.google.cloud.dialogflow.v2.AnnotatedMessagePartOrBuilder getPartsOrBu
   }
 
   public static final int CONTAIN_ENTITIES_FIELD_NUMBER = 2;
-  private boolean containEntities_;
+  private boolean containEntities_ = false;
   /**
    *
    *
@@ -372,6 +374,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (partsBuilder_ == null) {
         parts_ = java.util.Collections.emptyList();
       } else {
@@ -380,7 +383,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       containEntities_ = false;
-
       return this;
     }
 
@@ -408,7 +410,16 @@ public com.google.cloud.dialogflow.v2.MessageAnnotation build() {
     public com.google.cloud.dialogflow.v2.MessageAnnotation buildPartial() {
       com.google.cloud.dialogflow.v2.MessageAnnotation result =
           new com.google.cloud.dialogflow.v2.MessageAnnotation(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.MessageAnnotation result) {
       if (partsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           parts_ = java.util.Collections.unmodifiableList(parts_);
@@ -418,9 +429,13 @@ public com.google.cloud.dialogflow.v2.MessageAnnotation buildPartial() {
       } else {
         result.parts_ = partsBuilder_.build();
       }
-      result.containEntities_ = containEntities_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.MessageAnnotation result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.containEntities_ = containEntities_;
+      }
     }
 
     @java.lang.Override
@@ -542,7 +557,7 @@ public Builder mergeFrom(
             case 16:
               {
                 containEntities_ = input.readBool();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             default:
@@ -984,6 +999,7 @@ public boolean getContainEntities() {
     public Builder setContainEntities(boolean value) {
 
       containEntities_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -999,7 +1015,7 @@ public Builder setContainEntities(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearContainEntities() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       containEntities_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/NotificationConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/NotificationConfig.java
index a140ce3e5842..6ead147d83d7 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/NotificationConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/NotificationConfig.java
@@ -228,15 +228,18 @@ private MessageFormat(int value) {
   }
 
   public static final int TOPIC_FIELD_NUMBER = 1;
-  private volatile java.lang.Object topic_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object topic_ = "";
   /**
    *
    *
    * <pre>
    * Name of the Pub/Sub topic to publish conversation
    * events like
-   * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED] as
-   * serialized [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
+   * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED]
+   * as serialized
+   * [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
    * For telephony integration to receive notification, make sure either this
    * topic is in the same project as the conversation or you grant
    * `service-&lt;Conversation Project
@@ -269,8 +272,9 @@ public java.lang.String getTopic() {
    * <pre>
    * Name of the Pub/Sub topic to publish conversation
    * events like
-   * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED] as
-   * serialized [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
+   * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED]
+   * as serialized
+   * [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
    * For telephony integration to receive notification, make sure either this
    * topic is in the same project as the conversation or you grant
    * `service-&lt;Conversation Project
@@ -299,7 +303,7 @@ public com.google.protobuf.ByteString getTopicBytes() {
   }
 
   public static final int MESSAGE_FORMAT_FIELD_NUMBER = 2;
-  private int messageFormat_;
+  private int messageFormat_ = 0;
   /**
    *
    *
@@ -328,9 +332,8 @@ public int getMessageFormatValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.NotificationConfig.MessageFormat getMessageFormat() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.NotificationConfig.MessageFormat result =
-        com.google.cloud.dialogflow.v2.NotificationConfig.MessageFormat.valueOf(messageFormat_);
+        com.google.cloud.dialogflow.v2.NotificationConfig.MessageFormat.forNumber(messageFormat_);
     return result == null
         ? com.google.cloud.dialogflow.v2.NotificationConfig.MessageFormat.UNRECOGNIZED
         : result;
@@ -548,10 +551,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       topic_ = "";
-
       messageFormat_ = 0;
-
       return this;
     }
 
@@ -579,12 +581,23 @@ public com.google.cloud.dialogflow.v2.NotificationConfig build() {
     public com.google.cloud.dialogflow.v2.NotificationConfig buildPartial() {
       com.google.cloud.dialogflow.v2.NotificationConfig result =
           new com.google.cloud.dialogflow.v2.NotificationConfig(this);
-      result.topic_ = topic_;
-      result.messageFormat_ = messageFormat_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.NotificationConfig result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.topic_ = topic_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.messageFormat_ = messageFormat_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -633,6 +646,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.NotificationConfig other
         return this;
       if (!other.getTopic().isEmpty()) {
         topic_ = other.topic_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.messageFormat_ != 0) {
@@ -667,13 +681,13 @@ public Builder mergeFrom(
             case 10:
               {
                 topic_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 messageFormat_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             default:
@@ -693,6 +707,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object topic_ = "";
     /**
      *
@@ -700,8 +716,9 @@ public Builder mergeFrom(
      * <pre>
      * Name of the Pub/Sub topic to publish conversation
      * events like
-     * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED] as
-     * serialized [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
+     * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED]
+     * as serialized
+     * [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
      * For telephony integration to receive notification, make sure either this
      * topic is in the same project as the conversation or you grant
      * `service-&lt;Conversation Project
@@ -733,8 +750,9 @@ public java.lang.String getTopic() {
      * <pre>
      * Name of the Pub/Sub topic to publish conversation
      * events like
-     * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED] as
-     * serialized [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
+     * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED]
+     * as serialized
+     * [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
      * For telephony integration to receive notification, make sure either this
      * topic is in the same project as the conversation or you grant
      * `service-&lt;Conversation Project
@@ -766,8 +784,9 @@ public com.google.protobuf.ByteString getTopicBytes() {
      * <pre>
      * Name of the Pub/Sub topic to publish conversation
      * events like
-     * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED] as
-     * serialized [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
+     * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED]
+     * as serialized
+     * [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
      * For telephony integration to receive notification, make sure either this
      * topic is in the same project as the conversation or you grant
      * `service-&lt;Conversation Project
@@ -787,8 +806,8 @@ public Builder setTopic(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       topic_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -798,8 +817,9 @@ public Builder setTopic(java.lang.String value) {
      * <pre>
      * Name of the Pub/Sub topic to publish conversation
      * events like
-     * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED] as
-     * serialized [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
+     * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED]
+     * as serialized
+     * [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
      * For telephony integration to receive notification, make sure either this
      * topic is in the same project as the conversation or you grant
      * `service-&lt;Conversation Project
@@ -815,8 +835,8 @@ public Builder setTopic(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTopic() {
-
       topic_ = getDefaultInstance().getTopic();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -826,8 +846,9 @@ public Builder clearTopic() {
      * <pre>
      * Name of the Pub/Sub topic to publish conversation
      * events like
-     * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED] as
-     * serialized [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
+     * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED]
+     * as serialized
+     * [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
      * For telephony integration to receive notification, make sure either this
      * topic is in the same project as the conversation or you grant
      * `service-&lt;Conversation Project
@@ -848,8 +869,8 @@ public Builder setTopicBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       topic_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -883,8 +904,8 @@ public int getMessageFormatValue() {
      * @return This builder for chaining.
      */
     public Builder setMessageFormatValue(int value) {
-
       messageFormat_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -901,9 +922,8 @@ public Builder setMessageFormatValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.NotificationConfig.MessageFormat getMessageFormat() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.NotificationConfig.MessageFormat result =
-          com.google.cloud.dialogflow.v2.NotificationConfig.MessageFormat.valueOf(messageFormat_);
+          com.google.cloud.dialogflow.v2.NotificationConfig.MessageFormat.forNumber(messageFormat_);
       return result == null
           ? com.google.cloud.dialogflow.v2.NotificationConfig.MessageFormat.UNRECOGNIZED
           : result;
@@ -925,7 +945,7 @@ public Builder setMessageFormat(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       messageFormat_ = value.getNumber();
       onChanged();
       return this;
@@ -942,7 +962,7 @@ public Builder setMessageFormat(
      * @return This builder for chaining.
      */
     public Builder clearMessageFormat() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       messageFormat_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/NotificationConfigOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/NotificationConfigOrBuilder.java
index 49eefe2e522c..6a7076ab6540 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/NotificationConfigOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/NotificationConfigOrBuilder.java
@@ -29,8 +29,9 @@ public interface NotificationConfigOrBuilder
    * <pre>
    * Name of the Pub/Sub topic to publish conversation
    * events like
-   * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED] as
-   * serialized [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
+   * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED]
+   * as serialized
+   * [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
    * For telephony integration to receive notification, make sure either this
    * topic is in the same project as the conversation or you grant
    * `service-&lt;Conversation Project
@@ -52,8 +53,9 @@ public interface NotificationConfigOrBuilder
    * <pre>
    * Name of the Pub/Sub topic to publish conversation
    * events like
-   * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED] as
-   * serialized [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
+   * [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED]
+   * as serialized
+   * [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
    * For telephony integration to receive notification, make sure either this
    * topic is in the same project as the conversation or you grant
    * `service-&lt;Conversation Project
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OriginalDetectIntentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OriginalDetectIntentRequest.java
index 216b66032001..a8146a38fde2 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OriginalDetectIntentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OriginalDetectIntentRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SOURCE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object source_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object source_ = "";
   /**
    *
    *
@@ -121,7 +123,9 @@ public com.google.protobuf.ByteString getSourceBytes() {
   }
 
   public static final int VERSION_FIELD_NUMBER = 2;
-  private volatile java.lang.Object version_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object version_ = "";
   /**
    *
    *
@@ -250,7 +254,7 @@ public com.google.protobuf.Struct getPayload() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() {
-    return getPayload();
+    return payload_ == null ? com.google.protobuf.Struct.getDefaultInstance() : payload_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -475,14 +479,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       source_ = "";
-
       version_ = "";
-
-      if (payloadBuilder_ == null) {
-        payload_ = null;
-      } else {
-        payload_ = null;
+      payload_ = null;
+      if (payloadBuilder_ != null) {
+        payloadBuilder_.dispose();
         payloadBuilder_ = null;
       }
       return this;
@@ -512,17 +514,26 @@ public com.google.cloud.dialogflow.v2.OriginalDetectIntentRequest build() {
     public com.google.cloud.dialogflow.v2.OriginalDetectIntentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.OriginalDetectIntentRequest result =
           new com.google.cloud.dialogflow.v2.OriginalDetectIntentRequest(this);
-      result.source_ = source_;
-      result.version_ = version_;
-      if (payloadBuilder_ == null) {
-        result.payload_ = payload_;
-      } else {
-        result.payload_ = payloadBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.OriginalDetectIntentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.source_ = source_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.version_ = version_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.payload_ = payloadBuilder_ == null ? payload_ : payloadBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -571,10 +582,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.OriginalDetectIntentRequ
         return this;
       if (!other.getSource().isEmpty()) {
         source_ = other.source_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getVersion().isEmpty()) {
         version_ = other.version_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasPayload()) {
@@ -609,19 +622,19 @@ public Builder mergeFrom(
             case 10:
               {
                 source_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 version_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getPayloadFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -641,6 +654,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object source_ = "";
     /**
      *
@@ -705,8 +720,8 @@ public Builder setSource(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       source_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -723,8 +738,8 @@ public Builder setSource(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSource() {
-
       source_ = getDefaultInstance().getSource();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -746,8 +761,8 @@ public Builder setSourceBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       source_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -816,8 +831,8 @@ public Builder setVersion(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       version_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -834,8 +849,8 @@ public Builder setVersion(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearVersion() {
-
       version_ = getDefaultInstance().getVersion();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -857,8 +872,8 @@ public Builder setVersionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       version_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -893,7 +908,7 @@ public Builder setVersionBytes(com.google.protobuf.ByteString value) {
      * @return Whether the payload field is set.
      */
     public boolean hasPayload() {
-      return payloadBuilder_ != null || payload_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -952,11 +967,11 @@ public Builder setPayload(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         payload_ = value;
-        onChanged();
       } else {
         payloadBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -983,11 +998,11 @@ public Builder setPayload(com.google.protobuf.Struct value) {
     public Builder setPayload(com.google.protobuf.Struct.Builder builderForValue) {
       if (payloadBuilder_ == null) {
         payload_ = builderForValue.build();
-        onChanged();
       } else {
         payloadBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1013,17 +1028,18 @@ public Builder setPayload(com.google.protobuf.Struct.Builder builderForValue) {
      */
     public Builder mergePayload(com.google.protobuf.Struct value) {
       if (payloadBuilder_ == null) {
-        if (payload_ != null) {
-          payload_ =
-              com.google.protobuf.Struct.newBuilder(payload_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && payload_ != null
+            && payload_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getPayloadBuilder().mergeFrom(value);
         } else {
           payload_ = value;
         }
-        onChanged();
       } else {
         payloadBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1048,14 +1064,13 @@ public Builder mergePayload(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct payload = 3;</code>
      */
     public Builder clearPayload() {
-      if (payloadBuilder_ == null) {
-        payload_ = null;
-        onChanged();
-      } else {
-        payload_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      payload_ = null;
+      if (payloadBuilder_ != null) {
+        payloadBuilder_.dispose();
         payloadBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1080,7 +1095,7 @@ public Builder clearPayload() {
      * <code>.google.protobuf.Struct payload = 3;</code>
      */
     public com.google.protobuf.Struct.Builder getPayloadBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getPayloadFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OutputAudio.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OutputAudio.java
index e802f75f0be0..ae9838ed5948 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OutputAudio.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OutputAudio.java
@@ -115,11 +115,13 @@ public com.google.cloud.dialogflow.v2.OutputAudioConfig getConfig() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.OutputAudioConfigOrBuilder getConfigOrBuilder() {
-    return getConfig();
+    return config_ == null
+        ? com.google.cloud.dialogflow.v2.OutputAudioConfig.getDefaultInstance()
+        : config_;
   }
 
   public static final int AUDIO_FIELD_NUMBER = 2;
-  private com.google.protobuf.ByteString audio_;
+  private com.google.protobuf.ByteString audio_ = com.google.protobuf.ByteString.EMPTY;
   /**
    *
    *
@@ -347,14 +349,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (configBuilder_ == null) {
-        config_ = null;
-      } else {
-        config_ = null;
+      bitField0_ = 0;
+      config_ = null;
+      if (configBuilder_ != null) {
+        configBuilder_.dispose();
         configBuilder_ = null;
       }
       audio_ = com.google.protobuf.ByteString.EMPTY;
-
       return this;
     }
 
@@ -382,16 +383,23 @@ public com.google.cloud.dialogflow.v2.OutputAudio build() {
     public com.google.cloud.dialogflow.v2.OutputAudio buildPartial() {
       com.google.cloud.dialogflow.v2.OutputAudio result =
           new com.google.cloud.dialogflow.v2.OutputAudio(this);
-      if (configBuilder_ == null) {
-        result.config_ = config_;
-      } else {
-        result.config_ = configBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.audio_ = audio_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.OutputAudio result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.config_ = configBuilder_ == null ? config_ : configBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.audio_ = audio_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -472,13 +480,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 audio_ = input.readBytes();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -498,6 +506,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2.OutputAudioConfig config_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.OutputAudioConfig,
@@ -517,7 +527,7 @@ public Builder mergeFrom(
      * @return Whether the config field is set.
      */
     public boolean hasConfig() {
-      return configBuilder_ != null || config_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -556,11 +566,11 @@ public Builder setConfig(com.google.cloud.dialogflow.v2.OutputAudioConfig value)
           throw new NullPointerException();
         }
         config_ = value;
-        onChanged();
       } else {
         configBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -577,11 +587,11 @@ public Builder setConfig(
         com.google.cloud.dialogflow.v2.OutputAudioConfig.Builder builderForValue) {
       if (configBuilder_ == null) {
         config_ = builderForValue.build();
-        onChanged();
       } else {
         configBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -596,19 +606,18 @@ public Builder setConfig(
      */
     public Builder mergeConfig(com.google.cloud.dialogflow.v2.OutputAudioConfig value) {
       if (configBuilder_ == null) {
-        if (config_ != null) {
-          config_ =
-              com.google.cloud.dialogflow.v2.OutputAudioConfig.newBuilder(config_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && config_ != null
+            && config_ != com.google.cloud.dialogflow.v2.OutputAudioConfig.getDefaultInstance()) {
+          getConfigBuilder().mergeFrom(value);
         } else {
           config_ = value;
         }
-        onChanged();
       } else {
         configBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -622,14 +631,13 @@ public Builder mergeConfig(com.google.cloud.dialogflow.v2.OutputAudioConfig valu
      * <code>.google.cloud.dialogflow.v2.OutputAudioConfig config = 1;</code>
      */
     public Builder clearConfig() {
-      if (configBuilder_ == null) {
-        config_ = null;
-        onChanged();
-      } else {
-        config_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      config_ = null;
+      if (configBuilder_ != null) {
+        configBuilder_.dispose();
         configBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -643,7 +651,7 @@ public Builder clearConfig() {
      * <code>.google.cloud.dialogflow.v2.OutputAudioConfig config = 1;</code>
      */
     public com.google.cloud.dialogflow.v2.OutputAudioConfig.Builder getConfigBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getConfigFieldBuilder().getBuilder();
     }
@@ -725,8 +733,8 @@ public Builder setAudio(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       audio_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -742,7 +750,7 @@ public Builder setAudio(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearAudio() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       audio_ = getDefaultInstance().getAudio();
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OutputAudioConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OutputAudioConfig.java
index deba6fad7a8c..b7a4989b79c4 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OutputAudioConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OutputAudioConfig.java
@@ -70,7 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int AUDIO_ENCODING_FIELD_NUMBER = 1;
-  private int audioEncoding_;
+  private int audioEncoding_ = 0;
   /**
    *
    *
@@ -103,16 +103,15 @@ public int getAudioEncodingValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.OutputAudioEncoding getAudioEncoding() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.OutputAudioEncoding result =
-        com.google.cloud.dialogflow.v2.OutputAudioEncoding.valueOf(audioEncoding_);
+        com.google.cloud.dialogflow.v2.OutputAudioEncoding.forNumber(audioEncoding_);
     return result == null
         ? com.google.cloud.dialogflow.v2.OutputAudioEncoding.UNRECOGNIZED
         : result;
   }
 
   public static final int SAMPLE_RATE_HERTZ_FIELD_NUMBER = 2;
-  private int sampleRateHertz_;
+  private int sampleRateHertz_ = 0;
   /**
    *
    *
@@ -179,7 +178,9 @@ public com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig getSynthesizeSpeech
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.SynthesizeSpeechConfigOrBuilder
       getSynthesizeSpeechConfigOrBuilder() {
-    return getSynthesizeSpeechConfig();
+    return synthesizeSpeechConfig_ == null
+        ? com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig.getDefaultInstance()
+        : synthesizeSpeechConfig_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -409,14 +410,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       audioEncoding_ = 0;
-
       sampleRateHertz_ = 0;
-
-      if (synthesizeSpeechConfigBuilder_ == null) {
-        synthesizeSpeechConfig_ = null;
-      } else {
-        synthesizeSpeechConfig_ = null;
+      synthesizeSpeechConfig_ = null;
+      if (synthesizeSpeechConfigBuilder_ != null) {
+        synthesizeSpeechConfigBuilder_.dispose();
         synthesizeSpeechConfigBuilder_ = null;
       }
       return this;
@@ -446,17 +445,29 @@ public com.google.cloud.dialogflow.v2.OutputAudioConfig build() {
     public com.google.cloud.dialogflow.v2.OutputAudioConfig buildPartial() {
       com.google.cloud.dialogflow.v2.OutputAudioConfig result =
           new com.google.cloud.dialogflow.v2.OutputAudioConfig(this);
-      result.audioEncoding_ = audioEncoding_;
-      result.sampleRateHertz_ = sampleRateHertz_;
-      if (synthesizeSpeechConfigBuilder_ == null) {
-        result.synthesizeSpeechConfig_ = synthesizeSpeechConfig_;
-      } else {
-        result.synthesizeSpeechConfig_ = synthesizeSpeechConfigBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.OutputAudioConfig result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.audioEncoding_ = audioEncoding_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.sampleRateHertz_ = sampleRateHertz_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.synthesizeSpeechConfig_ =
+            synthesizeSpeechConfigBuilder_ == null
+                ? synthesizeSpeechConfig_
+                : synthesizeSpeechConfigBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -541,20 +552,20 @@ public Builder mergeFrom(
             case 8:
               {
                 audioEncoding_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 16:
               {
                 sampleRateHertz_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 input.readMessage(
                     getSynthesizeSpeechConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -574,6 +585,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private int audioEncoding_ = 0;
     /**
      *
@@ -607,8 +620,8 @@ public int getAudioEncodingValue() {
      * @return This builder for chaining.
      */
     public Builder setAudioEncodingValue(int value) {
-
       audioEncoding_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -627,9 +640,8 @@ public Builder setAudioEncodingValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.OutputAudioEncoding getAudioEncoding() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.OutputAudioEncoding result =
-          com.google.cloud.dialogflow.v2.OutputAudioEncoding.valueOf(audioEncoding_);
+          com.google.cloud.dialogflow.v2.OutputAudioEncoding.forNumber(audioEncoding_);
       return result == null
           ? com.google.cloud.dialogflow.v2.OutputAudioEncoding.UNRECOGNIZED
           : result;
@@ -652,7 +664,7 @@ public Builder setAudioEncoding(com.google.cloud.dialogflow.v2.OutputAudioEncodi
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       audioEncoding_ = value.getNumber();
       onChanged();
       return this;
@@ -671,7 +683,7 @@ public Builder setAudioEncoding(com.google.cloud.dialogflow.v2.OutputAudioEncodi
      * @return This builder for chaining.
      */
     public Builder clearAudioEncoding() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       audioEncoding_ = 0;
       onChanged();
       return this;
@@ -716,6 +728,7 @@ public int getSampleRateHertz() {
     public Builder setSampleRateHertz(int value) {
 
       sampleRateHertz_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -735,7 +748,7 @@ public Builder setSampleRateHertz(int value) {
      * @return This builder for chaining.
      */
     public Builder clearSampleRateHertz() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       sampleRateHertz_ = 0;
       onChanged();
       return this;
@@ -759,7 +772,7 @@ public Builder clearSampleRateHertz() {
      * @return Whether the synthesizeSpeechConfig field is set.
      */
     public boolean hasSynthesizeSpeechConfig() {
-      return synthesizeSpeechConfigBuilder_ != null || synthesizeSpeechConfig_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -797,11 +810,11 @@ public Builder setSynthesizeSpeechConfig(
           throw new NullPointerException();
         }
         synthesizeSpeechConfig_ = value;
-        onChanged();
       } else {
         synthesizeSpeechConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -817,11 +830,11 @@ public Builder setSynthesizeSpeechConfig(
         com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig.Builder builderForValue) {
       if (synthesizeSpeechConfigBuilder_ == null) {
         synthesizeSpeechConfig_ = builderForValue.build();
-        onChanged();
       } else {
         synthesizeSpeechConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -836,20 +849,19 @@ public Builder setSynthesizeSpeechConfig(
     public Builder mergeSynthesizeSpeechConfig(
         com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig value) {
       if (synthesizeSpeechConfigBuilder_ == null) {
-        if (synthesizeSpeechConfig_ != null) {
-          synthesizeSpeechConfig_ =
-              com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig.newBuilder(
-                      synthesizeSpeechConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && synthesizeSpeechConfig_ != null
+            && synthesizeSpeechConfig_
+                != com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig.getDefaultInstance()) {
+          getSynthesizeSpeechConfigBuilder().mergeFrom(value);
         } else {
           synthesizeSpeechConfig_ = value;
         }
-        onChanged();
       } else {
         synthesizeSpeechConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -862,14 +874,13 @@ public Builder mergeSynthesizeSpeechConfig(
      * <code>.google.cloud.dialogflow.v2.SynthesizeSpeechConfig synthesize_speech_config = 3;</code>
      */
     public Builder clearSynthesizeSpeechConfig() {
-      if (synthesizeSpeechConfigBuilder_ == null) {
-        synthesizeSpeechConfig_ = null;
-        onChanged();
-      } else {
-        synthesizeSpeechConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      synthesizeSpeechConfig_ = null;
+      if (synthesizeSpeechConfigBuilder_ != null) {
+        synthesizeSpeechConfigBuilder_.dispose();
         synthesizeSpeechConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -883,7 +894,7 @@ public Builder clearSynthesizeSpeechConfig() {
      */
     public com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig.Builder
         getSynthesizeSpeechConfigBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getSynthesizeSpeechConfigFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Participant.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Participant.java
index a22fff3aa358..4150784150d7 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Participant.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Participant.java
@@ -263,7 +263,9 @@ private Role(int value) {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -316,13 +318,13 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int ROLE_FIELD_NUMBER = 2;
-  private int role_;
+  private int role_ = 0;
   /**
    *
    *
    * <pre>
-   * Immutable. The role this participant plays in the conversation. This field must be set
-   * during participant creation and is then immutable.
+   * Immutable. The role this participant plays in the conversation. This field
+   * must be set during participant creation and is then immutable.
    * </pre>
    *
    * <code>
@@ -339,8 +341,8 @@ public int getRoleValue() {
    *
    *
    * <pre>
-   * Immutable. The role this participant plays in the conversation. This field must be set
-   * during participant creation and is then immutable.
+   * Immutable. The role this participant plays in the conversation. This field
+   * must be set during participant creation and is then immutable.
    * </pre>
    *
    * <code>
@@ -351,14 +353,15 @@ public int getRoleValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.Participant.Role getRole() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.Participant.Role result =
-        com.google.cloud.dialogflow.v2.Participant.Role.valueOf(role_);
+        com.google.cloud.dialogflow.v2.Participant.Role.forNumber(role_);
     return result == null ? com.google.cloud.dialogflow.v2.Participant.Role.UNRECOGNIZED : result;
   }
 
   public static final int SIP_RECORDING_MEDIA_LABEL_FIELD_NUMBER = 6;
-  private volatile java.lang.Object sipRecordingMediaLabel_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object sipRecordingMediaLabel_ = "";
   /**
    *
    *
@@ -411,23 +414,30 @@ public com.google.protobuf.ByteString getSipRecordingMediaLabelBytes() {
   }
 
   public static final int OBFUSCATED_EXTERNAL_USER_ID_FIELD_NUMBER = 7;
-  private volatile java.lang.Object obfuscatedExternalUserId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object obfuscatedExternalUserId_ = "";
   /**
    *
    *
    * <pre>
-   * Optional. Obfuscated user id that should be associated with the created participant.
+   * Optional. Obfuscated user id that should be associated with the created
+   * participant.
    * You can specify a user id as follows:
    * 1. If you set this field in
-   *    [CreateParticipantRequest][google.cloud.dialogflow.v2.CreateParticipantRequest.participant] or
+   *    [CreateParticipantRequest][google.cloud.dialogflow.v2.CreateParticipantRequest.participant]
+   *    or
    *    [UpdateParticipantRequest][google.cloud.dialogflow.v2.UpdateParticipantRequest.participant],
    *    Dialogflow adds the obfuscated user id with the participant.
    * 2. If you set this field in
-   *    [AnalyzeContent][google.cloud.dialogflow.v2.AnalyzeContentRequest.obfuscated_external_user_id] or
+   *    [AnalyzeContent][google.cloud.dialogflow.v2.AnalyzeContentRequest.obfuscated_external_user_id]
+   *    or
    *    [StreamingAnalyzeContent][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.obfuscated_external_user_id],
-   *    Dialogflow will update [Participant.obfuscated_external_user_id][google.cloud.dialogflow.v2.Participant.obfuscated_external_user_id].
+   *    Dialogflow will update
+   *    [Participant.obfuscated_external_user_id][google.cloud.dialogflow.v2.Participant.obfuscated_external_user_id].
    * Dialogflow returns an error if you try to add a user id for a
-   * non-[END_USER][google.cloud.dialogflow.v2.Participant.Role.END_USER] participant.
+   * non-[END_USER][google.cloud.dialogflow.v2.Participant.Role.END_USER]
+   * participant.
    * Dialogflow uses this user id for billing and measurement purposes. For
    * example, Dialogflow determines whether a user in one conversation returned
    * in a later conversation.
@@ -459,18 +469,23 @@ public java.lang.String getObfuscatedExternalUserId() {
    *
    *
    * <pre>
-   * Optional. Obfuscated user id that should be associated with the created participant.
+   * Optional. Obfuscated user id that should be associated with the created
+   * participant.
    * You can specify a user id as follows:
    * 1. If you set this field in
-   *    [CreateParticipantRequest][google.cloud.dialogflow.v2.CreateParticipantRequest.participant] or
+   *    [CreateParticipantRequest][google.cloud.dialogflow.v2.CreateParticipantRequest.participant]
+   *    or
    *    [UpdateParticipantRequest][google.cloud.dialogflow.v2.UpdateParticipantRequest.participant],
    *    Dialogflow adds the obfuscated user id with the participant.
    * 2. If you set this field in
-   *    [AnalyzeContent][google.cloud.dialogflow.v2.AnalyzeContentRequest.obfuscated_external_user_id] or
+   *    [AnalyzeContent][google.cloud.dialogflow.v2.AnalyzeContentRequest.obfuscated_external_user_id]
+   *    or
    *    [StreamingAnalyzeContent][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.obfuscated_external_user_id],
-   *    Dialogflow will update [Participant.obfuscated_external_user_id][google.cloud.dialogflow.v2.Participant.obfuscated_external_user_id].
+   *    Dialogflow will update
+   *    [Participant.obfuscated_external_user_id][google.cloud.dialogflow.v2.Participant.obfuscated_external_user_id].
    * Dialogflow returns an error if you try to add a user id for a
-   * non-[END_USER][google.cloud.dialogflow.v2.Participant.Role.END_USER] participant.
+   * non-[END_USER][google.cloud.dialogflow.v2.Participant.Role.END_USER]
+   * participant.
    * Dialogflow uses this user id for billing and measurement purposes. For
    * example, Dialogflow determines whether a user in one conversation returned
    * in a later conversation.
@@ -512,6 +527,7 @@ private static final class DocumentsMetadataFiltersDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.String>
       documentsMetadataFilters_;
 
@@ -531,9 +547,10 @@ public int getDocumentsMetadataFiltersCount() {
    *
    *
    * <pre>
-   * Optional. Key-value filters on the metadata of documents returned by article
-   * suggestion. If specified, article suggestion only returns suggested
-   * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+   * Optional. Key-value filters on the metadata of documents returned by
+   * article suggestion. If specified, article suggestion only returns suggested
+   * documents that match all filters in their
+   * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
    * values for a metadata key should be concatenated by comma. For example,
    * filters to match all documents that have 'US' or 'CA' in their market
    * metadata values and 'agent' in their user metadata values will be
@@ -570,9 +587,10 @@ public java.util.Map<java.lang.String, java.lang.String> getDocumentsMetadataFil
    *
    *
    * <pre>
-   * Optional. Key-value filters on the metadata of documents returned by article
-   * suggestion. If specified, article suggestion only returns suggested
-   * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+   * Optional. Key-value filters on the metadata of documents returned by
+   * article suggestion. If specified, article suggestion only returns suggested
+   * documents that match all filters in their
+   * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
    * values for a metadata key should be concatenated by comma. For example,
    * filters to match all documents that have 'US' or 'CA' in their market
    * metadata values and 'agent' in their user metadata values will be
@@ -600,9 +618,10 @@ public java.util.Map<java.lang.String, java.lang.String> getDocumentsMetadataFil
    *
    *
    * <pre>
-   * Optional. Key-value filters on the metadata of documents returned by article
-   * suggestion. If specified, article suggestion only returns suggested
-   * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+   * Optional. Key-value filters on the metadata of documents returned by
+   * article suggestion. If specified, article suggestion only returns suggested
+   * documents that match all filters in their
+   * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
    * values for a metadata key should be concatenated by comma. For example,
    * filters to match all documents that have 'US' or 'CA' in their market
    * metadata values and 'agent' in their user metadata values will be
@@ -623,8 +642,10 @@ public java.util.Map<java.lang.String, java.lang.String> getDocumentsMetadataFil
    * </code>
    */
   @java.lang.Override
-  public java.lang.String getDocumentsMetadataFiltersOrDefault(
-      java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getDocumentsMetadataFiltersOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -636,9 +657,10 @@ public java.lang.String getDocumentsMetadataFiltersOrDefault(
    *
    *
    * <pre>
-   * Optional. Key-value filters on the metadata of documents returned by article
-   * suggestion. If specified, article suggestion only returns suggested
-   * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+   * Optional. Key-value filters on the metadata of documents returned by
+   * article suggestion. If specified, article suggestion only returns suggested
+   * documents that match all filters in their
+   * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
    * values for a metadata key should be concatenated by comma. For example,
    * filters to match all documents that have 'US' or 'CA' in their market
    * metadata values and 'agent' in their user metadata values will be
@@ -938,14 +960,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       role_ = 0;
-
       sipRecordingMediaLabel_ = "";
-
       obfuscatedExternalUserId_ = "";
-
       internalGetMutableDocumentsMetadataFilters().clear();
       return this;
     }
@@ -974,17 +993,33 @@ public com.google.cloud.dialogflow.v2.Participant build() {
     public com.google.cloud.dialogflow.v2.Participant buildPartial() {
       com.google.cloud.dialogflow.v2.Participant result =
           new com.google.cloud.dialogflow.v2.Participant(this);
-      int from_bitField0_ = bitField0_;
-      result.name_ = name_;
-      result.role_ = role_;
-      result.sipRecordingMediaLabel_ = sipRecordingMediaLabel_;
-      result.obfuscatedExternalUserId_ = obfuscatedExternalUserId_;
-      result.documentsMetadataFilters_ = internalGetDocumentsMetadataFilters();
-      result.documentsMetadataFilters_.makeImmutable();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.Participant result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.role_ = role_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.sipRecordingMediaLabel_ = sipRecordingMediaLabel_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.obfuscatedExternalUserId_ = obfuscatedExternalUserId_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.documentsMetadataFilters_ = internalGetDocumentsMetadataFilters();
+        result.documentsMetadataFilters_.makeImmutable();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -1032,6 +1067,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Participant other) {
       if (other == com.google.cloud.dialogflow.v2.Participant.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.role_ != 0) {
@@ -1039,14 +1075,17 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Participant other) {
       }
       if (!other.getSipRecordingMediaLabel().isEmpty()) {
         sipRecordingMediaLabel_ = other.sipRecordingMediaLabel_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getObfuscatedExternalUserId().isEmpty()) {
         obfuscatedExternalUserId_ = other.obfuscatedExternalUserId_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       internalGetMutableDocumentsMetadataFilters()
           .mergeFrom(other.internalGetDocumentsMetadataFilters());
+      bitField0_ |= 0x00000010;
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -1076,25 +1115,25 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 role_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 50:
               {
                 sipRecordingMediaLabel_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 50
             case 58:
               {
                 obfuscatedExternalUserId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 58
             case 66:
@@ -1109,6 +1148,7 @@ public Builder mergeFrom(
                     .getMutableMap()
                     .put(
                         documentsMetadataFilters__.getKey(), documentsMetadataFilters__.getValue());
+                bitField0_ |= 0x00000010;
                 break;
               } // case 66
             default:
@@ -1197,8 +1237,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1216,8 +1256,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1240,8 +1280,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1251,8 +1291,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      *
      *
      * <pre>
-     * Immutable. The role this participant plays in the conversation. This field must be set
-     * during participant creation and is then immutable.
+     * Immutable. The role this participant plays in the conversation. This field
+     * must be set during participant creation and is then immutable.
      * </pre>
      *
      * <code>
@@ -1269,8 +1309,8 @@ public int getRoleValue() {
      *
      *
      * <pre>
-     * Immutable. The role this participant plays in the conversation. This field must be set
-     * during participant creation and is then immutable.
+     * Immutable. The role this participant plays in the conversation. This field
+     * must be set during participant creation and is then immutable.
      * </pre>
      *
      * <code>
@@ -1281,8 +1321,8 @@ public int getRoleValue() {
      * @return This builder for chaining.
      */
     public Builder setRoleValue(int value) {
-
       role_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1290,8 +1330,8 @@ public Builder setRoleValue(int value) {
      *
      *
      * <pre>
-     * Immutable. The role this participant plays in the conversation. This field must be set
-     * during participant creation and is then immutable.
+     * Immutable. The role this participant plays in the conversation. This field
+     * must be set during participant creation and is then immutable.
      * </pre>
      *
      * <code>
@@ -1302,17 +1342,16 @@ public Builder setRoleValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.Participant.Role getRole() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.Participant.Role result =
-          com.google.cloud.dialogflow.v2.Participant.Role.valueOf(role_);
+          com.google.cloud.dialogflow.v2.Participant.Role.forNumber(role_);
       return result == null ? com.google.cloud.dialogflow.v2.Participant.Role.UNRECOGNIZED : result;
     }
     /**
      *
      *
      * <pre>
-     * Immutable. The role this participant plays in the conversation. This field must be set
-     * during participant creation and is then immutable.
+     * Immutable. The role this participant plays in the conversation. This field
+     * must be set during participant creation and is then immutable.
      * </pre>
      *
      * <code>
@@ -1326,7 +1365,7 @@ public Builder setRole(com.google.cloud.dialogflow.v2.Participant.Role value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       role_ = value.getNumber();
       onChanged();
       return this;
@@ -1335,8 +1374,8 @@ public Builder setRole(com.google.cloud.dialogflow.v2.Participant.Role value) {
      *
      *
      * <pre>
-     * Immutable. The role this participant plays in the conversation. This field must be set
-     * during participant creation and is then immutable.
+     * Immutable. The role this participant plays in the conversation. This field
+     * must be set during participant creation and is then immutable.
      * </pre>
      *
      * <code>
@@ -1346,7 +1385,7 @@ public Builder setRole(com.google.cloud.dialogflow.v2.Participant.Role value) {
      * @return This builder for chaining.
      */
     public Builder clearRole() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       role_ = 0;
       onChanged();
       return this;
@@ -1419,8 +1458,8 @@ public Builder setSipRecordingMediaLabel(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       sipRecordingMediaLabel_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1438,8 +1477,8 @@ public Builder setSipRecordingMediaLabel(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSipRecordingMediaLabel() {
-
       sipRecordingMediaLabel_ = getDefaultInstance().getSipRecordingMediaLabel();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1462,8 +1501,8 @@ public Builder setSipRecordingMediaLabelBytes(com.google.protobuf.ByteString val
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       sipRecordingMediaLabel_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1473,18 +1512,23 @@ public Builder setSipRecordingMediaLabelBytes(com.google.protobuf.ByteString val
      *
      *
      * <pre>
-     * Optional. Obfuscated user id that should be associated with the created participant.
+     * Optional. Obfuscated user id that should be associated with the created
+     * participant.
      * You can specify a user id as follows:
      * 1. If you set this field in
-     *    [CreateParticipantRequest][google.cloud.dialogflow.v2.CreateParticipantRequest.participant] or
+     *    [CreateParticipantRequest][google.cloud.dialogflow.v2.CreateParticipantRequest.participant]
+     *    or
      *    [UpdateParticipantRequest][google.cloud.dialogflow.v2.UpdateParticipantRequest.participant],
      *    Dialogflow adds the obfuscated user id with the participant.
      * 2. If you set this field in
-     *    [AnalyzeContent][google.cloud.dialogflow.v2.AnalyzeContentRequest.obfuscated_external_user_id] or
+     *    [AnalyzeContent][google.cloud.dialogflow.v2.AnalyzeContentRequest.obfuscated_external_user_id]
+     *    or
      *    [StreamingAnalyzeContent][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.obfuscated_external_user_id],
-     *    Dialogflow will update [Participant.obfuscated_external_user_id][google.cloud.dialogflow.v2.Participant.obfuscated_external_user_id].
+     *    Dialogflow will update
+     *    [Participant.obfuscated_external_user_id][google.cloud.dialogflow.v2.Participant.obfuscated_external_user_id].
      * Dialogflow returns an error if you try to add a user id for a
-     * non-[END_USER][google.cloud.dialogflow.v2.Participant.Role.END_USER] participant.
+     * non-[END_USER][google.cloud.dialogflow.v2.Participant.Role.END_USER]
+     * participant.
      * Dialogflow uses this user id for billing and measurement purposes. For
      * example, Dialogflow determines whether a user in one conversation returned
      * in a later conversation.
@@ -1516,18 +1560,23 @@ public java.lang.String getObfuscatedExternalUserId() {
      *
      *
      * <pre>
-     * Optional. Obfuscated user id that should be associated with the created participant.
+     * Optional. Obfuscated user id that should be associated with the created
+     * participant.
      * You can specify a user id as follows:
      * 1. If you set this field in
-     *    [CreateParticipantRequest][google.cloud.dialogflow.v2.CreateParticipantRequest.participant] or
+     *    [CreateParticipantRequest][google.cloud.dialogflow.v2.CreateParticipantRequest.participant]
+     *    or
      *    [UpdateParticipantRequest][google.cloud.dialogflow.v2.UpdateParticipantRequest.participant],
      *    Dialogflow adds the obfuscated user id with the participant.
      * 2. If you set this field in
-     *    [AnalyzeContent][google.cloud.dialogflow.v2.AnalyzeContentRequest.obfuscated_external_user_id] or
+     *    [AnalyzeContent][google.cloud.dialogflow.v2.AnalyzeContentRequest.obfuscated_external_user_id]
+     *    or
      *    [StreamingAnalyzeContent][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.obfuscated_external_user_id],
-     *    Dialogflow will update [Participant.obfuscated_external_user_id][google.cloud.dialogflow.v2.Participant.obfuscated_external_user_id].
+     *    Dialogflow will update
+     *    [Participant.obfuscated_external_user_id][google.cloud.dialogflow.v2.Participant.obfuscated_external_user_id].
      * Dialogflow returns an error if you try to add a user id for a
-     * non-[END_USER][google.cloud.dialogflow.v2.Participant.Role.END_USER] participant.
+     * non-[END_USER][google.cloud.dialogflow.v2.Participant.Role.END_USER]
+     * participant.
      * Dialogflow uses this user id for billing and measurement purposes. For
      * example, Dialogflow determines whether a user in one conversation returned
      * in a later conversation.
@@ -1559,18 +1608,23 @@ public com.google.protobuf.ByteString getObfuscatedExternalUserIdBytes() {
      *
      *
      * <pre>
-     * Optional. Obfuscated user id that should be associated with the created participant.
+     * Optional. Obfuscated user id that should be associated with the created
+     * participant.
      * You can specify a user id as follows:
      * 1. If you set this field in
-     *    [CreateParticipantRequest][google.cloud.dialogflow.v2.CreateParticipantRequest.participant] or
+     *    [CreateParticipantRequest][google.cloud.dialogflow.v2.CreateParticipantRequest.participant]
+     *    or
      *    [UpdateParticipantRequest][google.cloud.dialogflow.v2.UpdateParticipantRequest.participant],
      *    Dialogflow adds the obfuscated user id with the participant.
      * 2. If you set this field in
-     *    [AnalyzeContent][google.cloud.dialogflow.v2.AnalyzeContentRequest.obfuscated_external_user_id] or
+     *    [AnalyzeContent][google.cloud.dialogflow.v2.AnalyzeContentRequest.obfuscated_external_user_id]
+     *    or
      *    [StreamingAnalyzeContent][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.obfuscated_external_user_id],
-     *    Dialogflow will update [Participant.obfuscated_external_user_id][google.cloud.dialogflow.v2.Participant.obfuscated_external_user_id].
+     *    Dialogflow will update
+     *    [Participant.obfuscated_external_user_id][google.cloud.dialogflow.v2.Participant.obfuscated_external_user_id].
      * Dialogflow returns an error if you try to add a user id for a
-     * non-[END_USER][google.cloud.dialogflow.v2.Participant.Role.END_USER] participant.
+     * non-[END_USER][google.cloud.dialogflow.v2.Participant.Role.END_USER]
+     * participant.
      * Dialogflow uses this user id for billing and measurement purposes. For
      * example, Dialogflow determines whether a user in one conversation returned
      * in a later conversation.
@@ -1592,8 +1646,8 @@ public Builder setObfuscatedExternalUserId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       obfuscatedExternalUserId_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1601,18 +1655,23 @@ public Builder setObfuscatedExternalUserId(java.lang.String value) {
      *
      *
      * <pre>
-     * Optional. Obfuscated user id that should be associated with the created participant.
+     * Optional. Obfuscated user id that should be associated with the created
+     * participant.
      * You can specify a user id as follows:
      * 1. If you set this field in
-     *    [CreateParticipantRequest][google.cloud.dialogflow.v2.CreateParticipantRequest.participant] or
+     *    [CreateParticipantRequest][google.cloud.dialogflow.v2.CreateParticipantRequest.participant]
+     *    or
      *    [UpdateParticipantRequest][google.cloud.dialogflow.v2.UpdateParticipantRequest.participant],
      *    Dialogflow adds the obfuscated user id with the participant.
      * 2. If you set this field in
-     *    [AnalyzeContent][google.cloud.dialogflow.v2.AnalyzeContentRequest.obfuscated_external_user_id] or
+     *    [AnalyzeContent][google.cloud.dialogflow.v2.AnalyzeContentRequest.obfuscated_external_user_id]
+     *    or
      *    [StreamingAnalyzeContent][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.obfuscated_external_user_id],
-     *    Dialogflow will update [Participant.obfuscated_external_user_id][google.cloud.dialogflow.v2.Participant.obfuscated_external_user_id].
+     *    Dialogflow will update
+     *    [Participant.obfuscated_external_user_id][google.cloud.dialogflow.v2.Participant.obfuscated_external_user_id].
      * Dialogflow returns an error if you try to add a user id for a
-     * non-[END_USER][google.cloud.dialogflow.v2.Participant.Role.END_USER] participant.
+     * non-[END_USER][google.cloud.dialogflow.v2.Participant.Role.END_USER]
+     * participant.
      * Dialogflow uses this user id for billing and measurement purposes. For
      * example, Dialogflow determines whether a user in one conversation returned
      * in a later conversation.
@@ -1630,8 +1689,8 @@ public Builder setObfuscatedExternalUserId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearObfuscatedExternalUserId() {
-
       obfuscatedExternalUserId_ = getDefaultInstance().getObfuscatedExternalUserId();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1639,18 +1698,23 @@ public Builder clearObfuscatedExternalUserId() {
      *
      *
      * <pre>
-     * Optional. Obfuscated user id that should be associated with the created participant.
+     * Optional. Obfuscated user id that should be associated with the created
+     * participant.
      * You can specify a user id as follows:
      * 1. If you set this field in
-     *    [CreateParticipantRequest][google.cloud.dialogflow.v2.CreateParticipantRequest.participant] or
+     *    [CreateParticipantRequest][google.cloud.dialogflow.v2.CreateParticipantRequest.participant]
+     *    or
      *    [UpdateParticipantRequest][google.cloud.dialogflow.v2.UpdateParticipantRequest.participant],
      *    Dialogflow adds the obfuscated user id with the participant.
      * 2. If you set this field in
-     *    [AnalyzeContent][google.cloud.dialogflow.v2.AnalyzeContentRequest.obfuscated_external_user_id] or
+     *    [AnalyzeContent][google.cloud.dialogflow.v2.AnalyzeContentRequest.obfuscated_external_user_id]
+     *    or
      *    [StreamingAnalyzeContent][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.obfuscated_external_user_id],
-     *    Dialogflow will update [Participant.obfuscated_external_user_id][google.cloud.dialogflow.v2.Participant.obfuscated_external_user_id].
+     *    Dialogflow will update
+     *    [Participant.obfuscated_external_user_id][google.cloud.dialogflow.v2.Participant.obfuscated_external_user_id].
      * Dialogflow returns an error if you try to add a user id for a
-     * non-[END_USER][google.cloud.dialogflow.v2.Participant.Role.END_USER] participant.
+     * non-[END_USER][google.cloud.dialogflow.v2.Participant.Role.END_USER]
+     * participant.
      * Dialogflow uses this user id for billing and measurement purposes. For
      * example, Dialogflow determines whether a user in one conversation returned
      * in a later conversation.
@@ -1673,8 +1737,8 @@ public Builder setObfuscatedExternalUserIdBytes(com.google.protobuf.ByteString v
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       obfuscatedExternalUserId_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1693,8 +1757,6 @@ public Builder setObfuscatedExternalUserIdBytes(com.google.protobuf.ByteString v
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
         internalGetMutableDocumentsMetadataFilters() {
-      onChanged();
-      ;
       if (documentsMetadataFilters_ == null) {
         documentsMetadataFilters_ =
             com.google.protobuf.MapField.newMapField(
@@ -1703,6 +1765,8 @@ public Builder setObfuscatedExternalUserIdBytes(com.google.protobuf.ByteString v
       if (!documentsMetadataFilters_.isMutable()) {
         documentsMetadataFilters_ = documentsMetadataFilters_.copy();
       }
+      bitField0_ |= 0x00000010;
+      onChanged();
       return documentsMetadataFilters_;
     }
 
@@ -1713,9 +1777,10 @@ public int getDocumentsMetadataFiltersCount() {
      *
      *
      * <pre>
-     * Optional. Key-value filters on the metadata of documents returned by article
-     * suggestion. If specified, article suggestion only returns suggested
-     * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+     * Optional. Key-value filters on the metadata of documents returned by
+     * article suggestion. If specified, article suggestion only returns suggested
+     * documents that match all filters in their
+     * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
      * values for a metadata key should be concatenated by comma. For example,
      * filters to match all documents that have 'US' or 'CA' in their market
      * metadata values and 'agent' in their user metadata values will be
@@ -1752,9 +1817,10 @@ public java.util.Map<java.lang.String, java.lang.String> getDocumentsMetadataFil
      *
      *
      * <pre>
-     * Optional. Key-value filters on the metadata of documents returned by article
-     * suggestion. If specified, article suggestion only returns suggested
-     * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+     * Optional. Key-value filters on the metadata of documents returned by
+     * article suggestion. If specified, article suggestion only returns suggested
+     * documents that match all filters in their
+     * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
      * values for a metadata key should be concatenated by comma. For example,
      * filters to match all documents that have 'US' or 'CA' in their market
      * metadata values and 'agent' in their user metadata values will be
@@ -1782,9 +1848,10 @@ public java.util.Map<java.lang.String, java.lang.String> getDocumentsMetadataFil
      *
      *
      * <pre>
-     * Optional. Key-value filters on the metadata of documents returned by article
-     * suggestion. If specified, article suggestion only returns suggested
-     * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+     * Optional. Key-value filters on the metadata of documents returned by
+     * article suggestion. If specified, article suggestion only returns suggested
+     * documents that match all filters in their
+     * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
      * values for a metadata key should be concatenated by comma. For example,
      * filters to match all documents that have 'US' or 'CA' in their market
      * metadata values and 'agent' in their user metadata values will be
@@ -1805,8 +1872,10 @@ public java.util.Map<java.lang.String, java.lang.String> getDocumentsMetadataFil
      * </code>
      */
     @java.lang.Override
-    public java.lang.String getDocumentsMetadataFiltersOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getDocumentsMetadataFiltersOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1818,9 +1887,10 @@ public java.lang.String getDocumentsMetadataFiltersOrDefault(
      *
      *
      * <pre>
-     * Optional. Key-value filters on the metadata of documents returned by article
-     * suggestion. If specified, article suggestion only returns suggested
-     * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+     * Optional. Key-value filters on the metadata of documents returned by
+     * article suggestion. If specified, article suggestion only returns suggested
+     * documents that match all filters in their
+     * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
      * values for a metadata key should be concatenated by comma. For example,
      * filters to match all documents that have 'US' or 'CA' in their market
      * metadata values and 'agent' in their user metadata values will be
@@ -1854,6 +1924,7 @@ public java.lang.String getDocumentsMetadataFiltersOrThrow(java.lang.String key)
     }
 
     public Builder clearDocumentsMetadataFilters() {
+      bitField0_ = (bitField0_ & ~0x00000010);
       internalGetMutableDocumentsMetadataFilters().getMutableMap().clear();
       return this;
     }
@@ -1861,9 +1932,10 @@ public Builder clearDocumentsMetadataFilters() {
      *
      *
      * <pre>
-     * Optional. Key-value filters on the metadata of documents returned by article
-     * suggestion. If specified, article suggestion only returns suggested
-     * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+     * Optional. Key-value filters on the metadata of documents returned by
+     * article suggestion. If specified, article suggestion only returns suggested
+     * documents that match all filters in their
+     * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
      * values for a metadata key should be concatenated by comma. For example,
      * filters to match all documents that have 'US' or 'CA' in their market
      * metadata values and 'agent' in their user metadata values will be
@@ -1893,15 +1965,17 @@ public Builder removeDocumentsMetadataFilters(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMutableDocumentsMetadataFilters() {
+      bitField0_ |= 0x00000010;
       return internalGetMutableDocumentsMetadataFilters().getMutableMap();
     }
     /**
      *
      *
      * <pre>
-     * Optional. Key-value filters on the metadata of documents returned by article
-     * suggestion. If specified, article suggestion only returns suggested
-     * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+     * Optional. Key-value filters on the metadata of documents returned by
+     * article suggestion. If specified, article suggestion only returns suggested
+     * documents that match all filters in their
+     * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
      * values for a metadata key should be concatenated by comma. For example,
      * filters to match all documents that have 'US' or 'CA' in their market
      * metadata values and 'agent' in their user metadata values will be
@@ -1928,17 +2002,18 @@ public Builder putDocumentsMetadataFilters(java.lang.String key, java.lang.Strin
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableDocumentsMetadataFilters().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000010;
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Optional. Key-value filters on the metadata of documents returned by article
-     * suggestion. If specified, article suggestion only returns suggested
-     * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+     * Optional. Key-value filters on the metadata of documents returned by
+     * article suggestion. If specified, article suggestion only returns suggested
+     * documents that match all filters in their
+     * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
      * values for a metadata key should be concatenated by comma. For example,
      * filters to match all documents that have 'US' or 'CA' in their market
      * metadata values and 'agent' in their user metadata values will be
@@ -1961,6 +2036,7 @@ public Builder putDocumentsMetadataFilters(java.lang.String key, java.lang.Strin
     public Builder putAllDocumentsMetadataFilters(
         java.util.Map<java.lang.String, java.lang.String> values) {
       internalGetMutableDocumentsMetadataFilters().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000010;
       return this;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ParticipantOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ParticipantOrBuilder.java
index eba103549fbb..1126b51e541b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ParticipantOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ParticipantOrBuilder.java
@@ -56,8 +56,8 @@ public interface ParticipantOrBuilder
    *
    *
    * <pre>
-   * Immutable. The role this participant plays in the conversation. This field must be set
-   * during participant creation and is then immutable.
+   * Immutable. The role this participant plays in the conversation. This field
+   * must be set during participant creation and is then immutable.
    * </pre>
    *
    * <code>
@@ -71,8 +71,8 @@ public interface ParticipantOrBuilder
    *
    *
    * <pre>
-   * Immutable. The role this participant plays in the conversation. This field must be set
-   * during participant creation and is then immutable.
+   * Immutable. The role this participant plays in the conversation. This field
+   * must be set during participant creation and is then immutable.
    * </pre>
    *
    * <code>
@@ -116,18 +116,23 @@ public interface ParticipantOrBuilder
    *
    *
    * <pre>
-   * Optional. Obfuscated user id that should be associated with the created participant.
+   * Optional. Obfuscated user id that should be associated with the created
+   * participant.
    * You can specify a user id as follows:
    * 1. If you set this field in
-   *    [CreateParticipantRequest][google.cloud.dialogflow.v2.CreateParticipantRequest.participant] or
+   *    [CreateParticipantRequest][google.cloud.dialogflow.v2.CreateParticipantRequest.participant]
+   *    or
    *    [UpdateParticipantRequest][google.cloud.dialogflow.v2.UpdateParticipantRequest.participant],
    *    Dialogflow adds the obfuscated user id with the participant.
    * 2. If you set this field in
-   *    [AnalyzeContent][google.cloud.dialogflow.v2.AnalyzeContentRequest.obfuscated_external_user_id] or
+   *    [AnalyzeContent][google.cloud.dialogflow.v2.AnalyzeContentRequest.obfuscated_external_user_id]
+   *    or
    *    [StreamingAnalyzeContent][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.obfuscated_external_user_id],
-   *    Dialogflow will update [Participant.obfuscated_external_user_id][google.cloud.dialogflow.v2.Participant.obfuscated_external_user_id].
+   *    Dialogflow will update
+   *    [Participant.obfuscated_external_user_id][google.cloud.dialogflow.v2.Participant.obfuscated_external_user_id].
    * Dialogflow returns an error if you try to add a user id for a
-   * non-[END_USER][google.cloud.dialogflow.v2.Participant.Role.END_USER] participant.
+   * non-[END_USER][google.cloud.dialogflow.v2.Participant.Role.END_USER]
+   * participant.
    * Dialogflow uses this user id for billing and measurement purposes. For
    * example, Dialogflow determines whether a user in one conversation returned
    * in a later conversation.
@@ -148,18 +153,23 @@ public interface ParticipantOrBuilder
    *
    *
    * <pre>
-   * Optional. Obfuscated user id that should be associated with the created participant.
+   * Optional. Obfuscated user id that should be associated with the created
+   * participant.
    * You can specify a user id as follows:
    * 1. If you set this field in
-   *    [CreateParticipantRequest][google.cloud.dialogflow.v2.CreateParticipantRequest.participant] or
+   *    [CreateParticipantRequest][google.cloud.dialogflow.v2.CreateParticipantRequest.participant]
+   *    or
    *    [UpdateParticipantRequest][google.cloud.dialogflow.v2.UpdateParticipantRequest.participant],
    *    Dialogflow adds the obfuscated user id with the participant.
    * 2. If you set this field in
-   *    [AnalyzeContent][google.cloud.dialogflow.v2.AnalyzeContentRequest.obfuscated_external_user_id] or
+   *    [AnalyzeContent][google.cloud.dialogflow.v2.AnalyzeContentRequest.obfuscated_external_user_id]
+   *    or
    *    [StreamingAnalyzeContent][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.obfuscated_external_user_id],
-   *    Dialogflow will update [Participant.obfuscated_external_user_id][google.cloud.dialogflow.v2.Participant.obfuscated_external_user_id].
+   *    Dialogflow will update
+   *    [Participant.obfuscated_external_user_id][google.cloud.dialogflow.v2.Participant.obfuscated_external_user_id].
    * Dialogflow returns an error if you try to add a user id for a
-   * non-[END_USER][google.cloud.dialogflow.v2.Participant.Role.END_USER] participant.
+   * non-[END_USER][google.cloud.dialogflow.v2.Participant.Role.END_USER]
+   * participant.
    * Dialogflow uses this user id for billing and measurement purposes. For
    * example, Dialogflow determines whether a user in one conversation returned
    * in a later conversation.
@@ -181,9 +191,10 @@ public interface ParticipantOrBuilder
    *
    *
    * <pre>
-   * Optional. Key-value filters on the metadata of documents returned by article
-   * suggestion. If specified, article suggestion only returns suggested
-   * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+   * Optional. Key-value filters on the metadata of documents returned by
+   * article suggestion. If specified, article suggestion only returns suggested
+   * documents that match all filters in their
+   * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
    * values for a metadata key should be concatenated by comma. For example,
    * filters to match all documents that have 'US' or 'CA' in their market
    * metadata values and 'agent' in their user metadata values will be
@@ -208,9 +219,10 @@ public interface ParticipantOrBuilder
    *
    *
    * <pre>
-   * Optional. Key-value filters on the metadata of documents returned by article
-   * suggestion. If specified, article suggestion only returns suggested
-   * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+   * Optional. Key-value filters on the metadata of documents returned by
+   * article suggestion. If specified, article suggestion only returns suggested
+   * documents that match all filters in their
+   * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
    * values for a metadata key should be concatenated by comma. For example,
    * filters to match all documents that have 'US' or 'CA' in their market
    * metadata values and 'agent' in their user metadata values will be
@@ -238,9 +250,10 @@ public interface ParticipantOrBuilder
    *
    *
    * <pre>
-   * Optional. Key-value filters on the metadata of documents returned by article
-   * suggestion. If specified, article suggestion only returns suggested
-   * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+   * Optional. Key-value filters on the metadata of documents returned by
+   * article suggestion. If specified, article suggestion only returns suggested
+   * documents that match all filters in their
+   * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
    * values for a metadata key should be concatenated by comma. For example,
    * filters to match all documents that have 'US' or 'CA' in their market
    * metadata values and 'agent' in their user metadata values will be
@@ -265,9 +278,10 @@ public interface ParticipantOrBuilder
    *
    *
    * <pre>
-   * Optional. Key-value filters on the metadata of documents returned by article
-   * suggestion. If specified, article suggestion only returns suggested
-   * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+   * Optional. Key-value filters on the metadata of documents returned by
+   * article suggestion. If specified, article suggestion only returns suggested
+   * documents that match all filters in their
+   * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
    * values for a metadata key should be concatenated by comma. For example,
    * filters to match all documents that have 'US' or 'CA' in their market
    * metadata values and 'agent' in their user metadata values will be
@@ -287,7 +301,6 @@ public interface ParticipantOrBuilder
    * map&lt;string, string&gt; documents_metadata_filters = 8 [(.google.api.field_behavior) = OPTIONAL];
    * </code>
    */
-
   /* nullable */
   java.lang.String getDocumentsMetadataFiltersOrDefault(
       java.lang.String key,
@@ -297,9 +310,10 @@ java.lang.String getDocumentsMetadataFiltersOrDefault(
    *
    *
    * <pre>
-   * Optional. Key-value filters on the metadata of documents returned by article
-   * suggestion. If specified, article suggestion only returns suggested
-   * documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+   * Optional. Key-value filters on the metadata of documents returned by
+   * article suggestion. If specified, article suggestion only returns suggested
+   * documents that match all filters in their
+   * [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
    * values for a metadata key should be concatenated by comma. For example,
    * filters to match all documents that have 'US' or 'CA' in their market
    * metadata values and 'agent' in their user metadata values will be
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ParticipantProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ParticipantProto.java
index 4cfb1407f141..6d38d9c2a5bd 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ParticipantProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ParticipantProto.java
@@ -429,11 +429,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "plies:\001*\332A\006parent\032x\312A\031dialogflow.googlea"
           + "pis.com\322AYhttps://www.googleapis.com/aut"
           + "h/cloud-platform,https://www.googleapis."
-          + "com/auth/dialogflowB\237\001\n\036com.google.cloud"
-          + ".dialogflow.v2B\020ParticipantProtoP\001ZDgoog"
-          + "le.golang.org/genproto/googleapis/cloud/"
-          + "dialogflow/v2;dialogflow\370\001\001\242\002\002DF\252\002\032Googl"
-          + "e.Cloud.Dialogflow.V2b\006proto3"
+          + "com/auth/dialogflowB\231\001\n\036com.google.cloud"
+          + ".dialogflow.v2B\020ParticipantProtoP\001Z>clou"
+          + "d.google.com/go/dialogflow/apiv2/dialogf"
+          + "lowpb;dialogflowpb\370\001\001\242\002\002DF\252\002\032Google.Clou"
+          + "d.Dialogflow.V2b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryInput.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryInput.java
index 3997a63a0819..a229af59c8ca 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryInput.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryInput.java
@@ -521,6 +521,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (audioConfigBuilder_ != null) {
         audioConfigBuilder_.clear();
       }
@@ -559,32 +560,32 @@ public com.google.cloud.dialogflow.v2.QueryInput build() {
     public com.google.cloud.dialogflow.v2.QueryInput buildPartial() {
       com.google.cloud.dialogflow.v2.QueryInput result =
           new com.google.cloud.dialogflow.v2.QueryInput(this);
-      if (inputCase_ == 1) {
-        if (audioConfigBuilder_ == null) {
-          result.input_ = input_;
-        } else {
-          result.input_ = audioConfigBuilder_.build();
-        }
-      }
-      if (inputCase_ == 2) {
-        if (textBuilder_ == null) {
-          result.input_ = input_;
-        } else {
-          result.input_ = textBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (inputCase_ == 3) {
-        if (eventBuilder_ == null) {
-          result.input_ = input_;
-        } else {
-          result.input_ = eventBuilder_.build();
-        }
-      }
-      result.inputCase_ = inputCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.QueryInput result) {
+      int from_bitField0_ = bitField0_;
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2.QueryInput result) {
+      result.inputCase_ = inputCase_;
+      result.input_ = this.input_;
+      if (inputCase_ == 1 && audioConfigBuilder_ != null) {
+        result.input_ = audioConfigBuilder_.build();
+      }
+      if (inputCase_ == 2 && textBuilder_ != null) {
+        result.input_ = textBuilder_.build();
+      }
+      if (inputCase_ == 3 && eventBuilder_ != null) {
+        result.input_ = eventBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -726,6 +727,8 @@ public Builder clearInput() {
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.InputAudioConfig,
             com.google.cloud.dialogflow.v2.InputAudioConfig.Builder,
@@ -932,7 +935,6 @@ public com.google.cloud.dialogflow.v2.InputAudioConfigOrBuilder getAudioConfigOr
       }
       inputCase_ = 1;
       onChanged();
-      ;
       return audioConfigBuilder_;
     }
 
@@ -1150,7 +1152,6 @@ public com.google.cloud.dialogflow.v2.TextInputOrBuilder getTextOrBuilder() {
       }
       inputCase_ = 2;
       onChanged();
-      ;
       return textBuilder_;
     }
 
@@ -1359,7 +1360,6 @@ public com.google.cloud.dialogflow.v2.EventInputOrBuilder getEventOrBuilder() {
       }
       inputCase_ = 3;
       onChanged();
-      ;
       return eventBuilder_;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryParameters.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryParameters.java
index 06ea55942d0f..55d695f86aa3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryParameters.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryParameters.java
@@ -81,7 +81,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   }
 
   public static final int TIME_ZONE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object timeZone_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object timeZone_ = "";
   /**
    *
    *
@@ -178,10 +180,12 @@ public com.google.type.LatLng getGeoLocation() {
    */
   @java.lang.Override
   public com.google.type.LatLngOrBuilder getGeoLocationOrBuilder() {
-    return getGeoLocation();
+    return geoLocation_ == null ? com.google.type.LatLng.getDefaultInstance() : geoLocation_;
   }
 
   public static final int CONTEXTS_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Context> contexts_;
   /**
    *
@@ -256,7 +260,7 @@ public com.google.cloud.dialogflow.v2.ContextOrBuilder getContextsOrBuilder(int
   }
 
   public static final int RESET_CONTEXTS_FIELD_NUMBER = 4;
-  private boolean resetContexts_;
+  private boolean resetContexts_ = false;
   /**
    *
    *
@@ -275,6 +279,8 @@ public boolean getResetContexts() {
   }
 
   public static final int SESSION_ENTITY_TYPES_FIELD_NUMBER = 5;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.SessionEntityType> sessionEntityTypes_;
   /**
    *
@@ -410,7 +416,7 @@ public com.google.protobuf.Struct getPayload() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() {
-    return getPayload();
+    return payload_ == null ? com.google.protobuf.Struct.getDefaultInstance() : payload_;
   }
 
   public static final int SENTIMENT_ANALYSIS_REQUEST_CONFIG_FIELD_NUMBER = 10;
@@ -470,7 +476,9 @@ public boolean hasSentimentAnalysisRequestConfig() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.SentimentAnalysisRequestConfigOrBuilder
       getSentimentAnalysisRequestConfigOrBuilder() {
-    return getSentimentAnalysisRequestConfig();
+    return sentimentAnalysisRequestConfig_ == null
+        ? com.google.cloud.dialogflow.v2.SentimentAnalysisRequestConfig.getDefaultInstance()
+        : sentimentAnalysisRequestConfig_;
   }
 
   public static final int WEBHOOK_HEADERS_FIELD_NUMBER = 14;
@@ -486,6 +494,7 @@ private static final class WebhookHeadersDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> webhookHeaders_;
 
   private com.google.protobuf.MapField<java.lang.String, java.lang.String>
@@ -569,8 +578,10 @@ public java.util.Map<java.lang.String, java.lang.String> getWebhookHeadersMap()
    * <code>map&lt;string, string&gt; webhook_headers = 14;</code>
    */
   @java.lang.Override
-  public java.lang.String getWebhookHeadersOrDefault(
-      java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getWebhookHeadersOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -918,12 +929,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       timeZone_ = "";
-
-      if (geoLocationBuilder_ == null) {
-        geoLocation_ = null;
-      } else {
-        geoLocation_ = null;
+      geoLocation_ = null;
+      if (geoLocationBuilder_ != null) {
+        geoLocationBuilder_.dispose();
         geoLocationBuilder_ = null;
       }
       if (contextsBuilder_ == null) {
@@ -932,26 +942,23 @@ public Builder clear() {
         contexts_ = null;
         contextsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000004);
       resetContexts_ = false;
-
       if (sessionEntityTypesBuilder_ == null) {
         sessionEntityTypes_ = java.util.Collections.emptyList();
       } else {
         sessionEntityTypes_ = null;
         sessionEntityTypesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
-      if (payloadBuilder_ == null) {
-        payload_ = null;
-      } else {
-        payload_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      payload_ = null;
+      if (payloadBuilder_ != null) {
+        payloadBuilder_.dispose();
         payloadBuilder_ = null;
       }
-      if (sentimentAnalysisRequestConfigBuilder_ == null) {
-        sentimentAnalysisRequestConfig_ = null;
-      } else {
-        sentimentAnalysisRequestConfig_ = null;
+      sentimentAnalysisRequestConfig_ = null;
+      if (sentimentAnalysisRequestConfigBuilder_ != null) {
+        sentimentAnalysisRequestConfigBuilder_.dispose();
         sentimentAnalysisRequestConfigBuilder_ = null;
       }
       internalGetMutableWebhookHeaders().clear();
@@ -982,46 +989,60 @@ public com.google.cloud.dialogflow.v2.QueryParameters build() {
     public com.google.cloud.dialogflow.v2.QueryParameters buildPartial() {
       com.google.cloud.dialogflow.v2.QueryParameters result =
           new com.google.cloud.dialogflow.v2.QueryParameters(this);
-      int from_bitField0_ = bitField0_;
-      result.timeZone_ = timeZone_;
-      if (geoLocationBuilder_ == null) {
-        result.geoLocation_ = geoLocation_;
-      } else {
-        result.geoLocation_ = geoLocationBuilder_.build();
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.cloud.dialogflow.v2.QueryParameters result) {
       if (contextsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000004) != 0)) {
           contexts_ = java.util.Collections.unmodifiableList(contexts_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.contexts_ = contexts_;
       } else {
         result.contexts_ = contextsBuilder_.build();
       }
-      result.resetContexts_ = resetContexts_;
       if (sessionEntityTypesBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000010) != 0)) {
           sessionEntityTypes_ = java.util.Collections.unmodifiableList(sessionEntityTypes_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000010);
         }
         result.sessionEntityTypes_ = sessionEntityTypes_;
       } else {
         result.sessionEntityTypes_ = sessionEntityTypesBuilder_.build();
       }
-      if (payloadBuilder_ == null) {
-        result.payload_ = payload_;
-      } else {
-        result.payload_ = payloadBuilder_.build();
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.QueryParameters result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.timeZone_ = timeZone_;
       }
-      if (sentimentAnalysisRequestConfigBuilder_ == null) {
-        result.sentimentAnalysisRequestConfig_ = sentimentAnalysisRequestConfig_;
-      } else {
-        result.sentimentAnalysisRequestConfig_ = sentimentAnalysisRequestConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.geoLocation_ =
+            geoLocationBuilder_ == null ? geoLocation_ : geoLocationBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.resetContexts_ = resetContexts_;
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.payload_ = payloadBuilder_ == null ? payload_ : payloadBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.sentimentAnalysisRequestConfig_ =
+            sentimentAnalysisRequestConfigBuilder_ == null
+                ? sentimentAnalysisRequestConfig_
+                : sentimentAnalysisRequestConfigBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.webhookHeaders_ = internalGetWebhookHeaders();
+        result.webhookHeaders_.makeImmutable();
       }
-      result.webhookHeaders_ = internalGetWebhookHeaders();
-      result.webhookHeaders_.makeImmutable();
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -1071,6 +1092,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.QueryParameters other) {
       if (other == com.google.cloud.dialogflow.v2.QueryParameters.getDefaultInstance()) return this;
       if (!other.getTimeZone().isEmpty()) {
         timeZone_ = other.timeZone_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasGeoLocation()) {
@@ -1080,7 +1102,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.QueryParameters other) {
         if (!other.contexts_.isEmpty()) {
           if (contexts_.isEmpty()) {
             contexts_ = other.contexts_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureContextsIsMutable();
             contexts_.addAll(other.contexts_);
@@ -1093,7 +1115,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.QueryParameters other) {
             contextsBuilder_.dispose();
             contextsBuilder_ = null;
             contexts_ = other.contexts_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
             contextsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getContextsFieldBuilder()
@@ -1110,7 +1132,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.QueryParameters other) {
         if (!other.sessionEntityTypes_.isEmpty()) {
           if (sessionEntityTypes_.isEmpty()) {
             sessionEntityTypes_ = other.sessionEntityTypes_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
             ensureSessionEntityTypesIsMutable();
             sessionEntityTypes_.addAll(other.sessionEntityTypes_);
@@ -1123,7 +1145,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.QueryParameters other) {
             sessionEntityTypesBuilder_.dispose();
             sessionEntityTypesBuilder_ = null;
             sessionEntityTypes_ = other.sessionEntityTypes_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000010);
             sessionEntityTypesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getSessionEntityTypesFieldBuilder()
@@ -1140,6 +1162,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.QueryParameters other) {
         mergeSentimentAnalysisRequestConfig(other.getSentimentAnalysisRequestConfig());
       }
       internalGetMutableWebhookHeaders().mergeFrom(other.internalGetWebhookHeaders());
+      bitField0_ |= 0x00000080;
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -1169,13 +1192,13 @@ public Builder mergeFrom(
             case 10:
               {
                 timeZone_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getGeoLocationFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
@@ -1194,7 +1217,7 @@ public Builder mergeFrom(
             case 32:
               {
                 resetContexts_ = input.readBool();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 32
             case 42:
@@ -1214,7 +1237,7 @@ public Builder mergeFrom(
             case 50:
               {
                 input.readMessage(getPayloadFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 50
             case 82:
@@ -1222,7 +1245,7 @@ public Builder mergeFrom(
                 input.readMessage(
                     getSentimentAnalysisRequestConfigFieldBuilder().getBuilder(),
                     extensionRegistry);
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 82
             case 114:
@@ -1234,6 +1257,7 @@ public Builder mergeFrom(
                 internalGetMutableWebhookHeaders()
                     .getMutableMap()
                     .put(webhookHeaders__.getKey(), webhookHeaders__.getValue());
+                bitField0_ |= 0x00000080;
                 break;
               } // case 114
             default:
@@ -1325,8 +1349,8 @@ public Builder setTimeZone(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       timeZone_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1345,8 +1369,8 @@ public Builder setTimeZone(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTimeZone() {
-
       timeZone_ = getDefaultInstance().getTimeZone();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1370,8 +1394,8 @@ public Builder setTimeZoneBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       timeZone_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1392,7 +1416,7 @@ public Builder setTimeZoneBytes(com.google.protobuf.ByteString value) {
      * @return Whether the geoLocation field is set.
      */
     public boolean hasGeoLocation() {
-      return geoLocationBuilder_ != null || geoLocation_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -1427,11 +1451,11 @@ public Builder setGeoLocation(com.google.type.LatLng value) {
           throw new NullPointerException();
         }
         geoLocation_ = value;
-        onChanged();
       } else {
         geoLocationBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1446,11 +1470,11 @@ public Builder setGeoLocation(com.google.type.LatLng value) {
     public Builder setGeoLocation(com.google.type.LatLng.Builder builderForValue) {
       if (geoLocationBuilder_ == null) {
         geoLocation_ = builderForValue.build();
-        onChanged();
       } else {
         geoLocationBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1464,17 +1488,18 @@ public Builder setGeoLocation(com.google.type.LatLng.Builder builderForValue) {
      */
     public Builder mergeGeoLocation(com.google.type.LatLng value) {
       if (geoLocationBuilder_ == null) {
-        if (geoLocation_ != null) {
-          geoLocation_ =
-              com.google.type.LatLng.newBuilder(geoLocation_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && geoLocation_ != null
+            && geoLocation_ != com.google.type.LatLng.getDefaultInstance()) {
+          getGeoLocationBuilder().mergeFrom(value);
         } else {
           geoLocation_ = value;
         }
-        onChanged();
       } else {
         geoLocationBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1487,14 +1512,13 @@ public Builder mergeGeoLocation(com.google.type.LatLng value) {
      * <code>.google.type.LatLng geo_location = 2;</code>
      */
     public Builder clearGeoLocation() {
-      if (geoLocationBuilder_ == null) {
-        geoLocation_ = null;
-        onChanged();
-      } else {
-        geoLocation_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      geoLocation_ = null;
+      if (geoLocationBuilder_ != null) {
+        geoLocationBuilder_.dispose();
         geoLocationBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1507,7 +1531,7 @@ public Builder clearGeoLocation() {
      * <code>.google.type.LatLng geo_location = 2;</code>
      */
     public com.google.type.LatLng.Builder getGeoLocationBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getGeoLocationFieldBuilder().getBuilder();
     }
@@ -1555,9 +1579,9 @@ public com.google.type.LatLngOrBuilder getGeoLocationOrBuilder() {
         java.util.Collections.emptyList();
 
     private void ensureContextsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         contexts_ = new java.util.ArrayList<com.google.cloud.dialogflow.v2.Context>(contexts_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000004;
       }
     }
 
@@ -1783,7 +1807,7 @@ public Builder addAllContexts(
     public Builder clearContexts() {
       if (contextsBuilder_ == null) {
         contexts_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
       } else {
         contextsBuilder_.clear();
@@ -1911,7 +1935,7 @@ public java.util.List<com.google.cloud.dialogflow.v2.Context.Builder> getContext
                 com.google.cloud.dialogflow.v2.Context,
                 com.google.cloud.dialogflow.v2.Context.Builder,
                 com.google.cloud.dialogflow.v2.ContextOrBuilder>(
-                contexts_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                contexts_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
         contexts_ = null;
       }
       return contextsBuilder_;
@@ -1950,6 +1974,7 @@ public boolean getResetContexts() {
     public Builder setResetContexts(boolean value) {
 
       resetContexts_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1966,7 +1991,7 @@ public Builder setResetContexts(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearResetContexts() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       resetContexts_ = false;
       onChanged();
       return this;
@@ -1976,11 +2001,11 @@ public Builder clearResetContexts() {
         java.util.Collections.emptyList();
 
     private void ensureSessionEntityTypesIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         sessionEntityTypes_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.SessionEntityType>(
                 sessionEntityTypes_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000010;
       }
     }
 
@@ -2221,7 +2246,7 @@ public Builder addAllSessionEntityTypes(
     public Builder clearSessionEntityTypes() {
       if (sessionEntityTypesBuilder_ == null) {
         sessionEntityTypes_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
       } else {
         sessionEntityTypesBuilder_.clear();
@@ -2361,7 +2386,7 @@ public com.google.cloud.dialogflow.v2.SessionEntityType.Builder addSessionEntity
                 com.google.cloud.dialogflow.v2.SessionEntityType.Builder,
                 com.google.cloud.dialogflow.v2.SessionEntityTypeOrBuilder>(
                 sessionEntityTypes_,
-                ((bitField0_ & 0x00000002) != 0),
+                ((bitField0_ & 0x00000010) != 0),
                 getParentForChildren(),
                 isClean());
         sessionEntityTypes_ = null;
@@ -2391,7 +2416,7 @@ public com.google.cloud.dialogflow.v2.SessionEntityType.Builder addSessionEntity
      * @return Whether the payload field is set.
      */
     public boolean hasPayload() {
-      return payloadBuilder_ != null || payload_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -2434,11 +2459,11 @@ public Builder setPayload(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         payload_ = value;
-        onChanged();
       } else {
         payloadBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2457,11 +2482,11 @@ public Builder setPayload(com.google.protobuf.Struct value) {
     public Builder setPayload(com.google.protobuf.Struct.Builder builderForValue) {
       if (payloadBuilder_ == null) {
         payload_ = builderForValue.build();
-        onChanged();
       } else {
         payloadBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2479,17 +2504,18 @@ public Builder setPayload(com.google.protobuf.Struct.Builder builderForValue) {
      */
     public Builder mergePayload(com.google.protobuf.Struct value) {
       if (payloadBuilder_ == null) {
-        if (payload_ != null) {
-          payload_ =
-              com.google.protobuf.Struct.newBuilder(payload_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && payload_ != null
+            && payload_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getPayloadBuilder().mergeFrom(value);
         } else {
           payload_ = value;
         }
-        onChanged();
       } else {
         payloadBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2506,14 +2532,13 @@ public Builder mergePayload(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct payload = 6;</code>
      */
     public Builder clearPayload() {
-      if (payloadBuilder_ == null) {
-        payload_ = null;
-        onChanged();
-      } else {
-        payload_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      payload_ = null;
+      if (payloadBuilder_ != null) {
+        payloadBuilder_.dispose();
         payloadBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2530,7 +2555,7 @@ public Builder clearPayload() {
      * <code>.google.protobuf.Struct payload = 6;</code>
      */
     public com.google.protobuf.Struct.Builder getPayloadBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getPayloadFieldBuilder().getBuilder();
     }
@@ -2606,8 +2631,7 @@ public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() {
      * @return Whether the sentimentAnalysisRequestConfig field is set.
      */
     public boolean hasSentimentAnalysisRequestConfig() {
-      return sentimentAnalysisRequestConfigBuilder_ != null
-          || sentimentAnalysisRequestConfig_ != null;
+      return ((bitField0_ & 0x00000040) != 0);
     }
     /**
      *
@@ -2652,11 +2676,11 @@ public Builder setSentimentAnalysisRequestConfig(
           throw new NullPointerException();
         }
         sentimentAnalysisRequestConfig_ = value;
-        onChanged();
       } else {
         sentimentAnalysisRequestConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2675,11 +2699,11 @@ public Builder setSentimentAnalysisRequestConfig(
         com.google.cloud.dialogflow.v2.SentimentAnalysisRequestConfig.Builder builderForValue) {
       if (sentimentAnalysisRequestConfigBuilder_ == null) {
         sentimentAnalysisRequestConfig_ = builderForValue.build();
-        onChanged();
       } else {
         sentimentAnalysisRequestConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2697,20 +2721,20 @@ public Builder setSentimentAnalysisRequestConfig(
     public Builder mergeSentimentAnalysisRequestConfig(
         com.google.cloud.dialogflow.v2.SentimentAnalysisRequestConfig value) {
       if (sentimentAnalysisRequestConfigBuilder_ == null) {
-        if (sentimentAnalysisRequestConfig_ != null) {
-          sentimentAnalysisRequestConfig_ =
-              com.google.cloud.dialogflow.v2.SentimentAnalysisRequestConfig.newBuilder(
-                      sentimentAnalysisRequestConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000040) != 0)
+            && sentimentAnalysisRequestConfig_ != null
+            && sentimentAnalysisRequestConfig_
+                != com.google.cloud.dialogflow.v2.SentimentAnalysisRequestConfig
+                    .getDefaultInstance()) {
+          getSentimentAnalysisRequestConfigBuilder().mergeFrom(value);
         } else {
           sentimentAnalysisRequestConfig_ = value;
         }
-        onChanged();
       } else {
         sentimentAnalysisRequestConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2726,14 +2750,13 @@ public Builder mergeSentimentAnalysisRequestConfig(
      * </code>
      */
     public Builder clearSentimentAnalysisRequestConfig() {
-      if (sentimentAnalysisRequestConfigBuilder_ == null) {
-        sentimentAnalysisRequestConfig_ = null;
-        onChanged();
-      } else {
-        sentimentAnalysisRequestConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      sentimentAnalysisRequestConfig_ = null;
+      if (sentimentAnalysisRequestConfigBuilder_ != null) {
+        sentimentAnalysisRequestConfigBuilder_.dispose();
         sentimentAnalysisRequestConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2750,7 +2773,7 @@ public Builder clearSentimentAnalysisRequestConfig() {
      */
     public com.google.cloud.dialogflow.v2.SentimentAnalysisRequestConfig.Builder
         getSentimentAnalysisRequestConfigBuilder() {
-
+      bitField0_ |= 0x00000040;
       onChanged();
       return getSentimentAnalysisRequestConfigFieldBuilder().getBuilder();
     }
@@ -2818,8 +2841,6 @@ public Builder clearSentimentAnalysisRequestConfig() {
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
         internalGetMutableWebhookHeaders() {
-      onChanged();
-      ;
       if (webhookHeaders_ == null) {
         webhookHeaders_ =
             com.google.protobuf.MapField.newMapField(WebhookHeadersDefaultEntryHolder.defaultEntry);
@@ -2827,6 +2848,8 @@ public Builder clearSentimentAnalysisRequestConfig() {
       if (!webhookHeaders_.isMutable()) {
         webhookHeaders_ = webhookHeaders_.copy();
       }
+      bitField0_ |= 0x00000080;
+      onChanged();
       return webhookHeaders_;
     }
 
@@ -2902,8 +2925,10 @@ public java.util.Map<java.lang.String, java.lang.String> getWebhookHeadersMap()
      * <code>map&lt;string, string&gt; webhook_headers = 14;</code>
      */
     @java.lang.Override
-    public java.lang.String getWebhookHeadersOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getWebhookHeadersOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -2940,6 +2965,7 @@ public java.lang.String getWebhookHeadersOrThrow(java.lang.String key) {
     }
 
     public Builder clearWebhookHeaders() {
+      bitField0_ = (bitField0_ & ~0x00000080);
       internalGetMutableWebhookHeaders().getMutableMap().clear();
       return this;
     }
@@ -2970,6 +2996,7 @@ public Builder removeWebhookHeaders(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMutableWebhookHeaders() {
+      bitField0_ |= 0x00000080;
       return internalGetMutableWebhookHeaders().getMutableMap();
     }
     /**
@@ -2996,8 +3023,8 @@ public Builder putWebhookHeaders(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableWebhookHeaders().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000080;
       return this;
     }
     /**
@@ -3019,6 +3046,7 @@ public Builder putWebhookHeaders(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllWebhookHeaders(java.util.Map<java.lang.String, java.lang.String> values) {
       internalGetMutableWebhookHeaders().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000080;
       return this;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryParametersOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryParametersOrBuilder.java
index 2e08decfdb86..67b1418e7d49 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryParametersOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryParametersOrBuilder.java
@@ -389,7 +389,6 @@ com.google.cloud.dialogflow.v2.SessionEntityTypeOrBuilder getSessionEntityTypesO
    *
    * <code>map&lt;string, string&gt; webhook_headers = 14;</code>
    */
-
   /* nullable */
   java.lang.String getWebhookHeadersOrDefault(
       java.lang.String key,
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryResult.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryResult.java
index 3c22010a2f40..209d8288cbba 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryResult.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryResult.java
@@ -74,7 +74,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int QUERY_TEXT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object queryText_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object queryText_ = "";
   /**
    *
    *
@@ -137,7 +139,9 @@ public com.google.protobuf.ByteString getQueryTextBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 15;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -192,7 +196,7 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
   }
 
   public static final int SPEECH_RECOGNITION_CONFIDENCE_FIELD_NUMBER = 2;
-  private float speechRecognitionConfidence_;
+  private float speechRecognitionConfidence_ = 0F;
   /**
    *
    *
@@ -217,7 +221,9 @@ public float getSpeechRecognitionConfidence() {
   }
 
   public static final int ACTION_FIELD_NUMBER = 3;
-  private volatile java.lang.Object action_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object action_ = "";
   /**
    *
    *
@@ -347,11 +353,11 @@ public com.google.protobuf.Struct getParameters() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getParametersOrBuilder() {
-    return getParameters();
+    return parameters_ == null ? com.google.protobuf.Struct.getDefaultInstance() : parameters_;
   }
 
   public static final int ALL_REQUIRED_PARAMS_PRESENT_FIELD_NUMBER = 5;
-  private boolean allRequiredParamsPresent_;
+  private boolean allRequiredParamsPresent_ = false;
   /**
    *
    *
@@ -373,7 +379,7 @@ public boolean getAllRequiredParamsPresent() {
   }
 
   public static final int CANCELS_SLOT_FILLING_FIELD_NUMBER = 21;
-  private boolean cancelsSlotFilling_;
+  private boolean cancelsSlotFilling_ = false;
   /**
    *
    *
@@ -393,7 +399,9 @@ public boolean getCancelsSlotFilling() {
   }
 
   public static final int FULFILLMENT_TEXT_FIELD_NUMBER = 6;
-  private volatile java.lang.Object fulfillmentText_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object fulfillmentText_ = "";
   /**
    *
    *
@@ -444,6 +452,8 @@ public com.google.protobuf.ByteString getFulfillmentTextBytes() {
   }
 
   public static final int FULFILLMENT_MESSAGES_FIELD_NUMBER = 7;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Intent.Message> fulfillmentMessages_;
   /**
    *
@@ -515,7 +525,9 @@ public com.google.cloud.dialogflow.v2.Intent.MessageOrBuilder getFulfillmentMess
   }
 
   public static final int WEBHOOK_SOURCE_FIELD_NUMBER = 8;
-  private volatile java.lang.Object webhookSource_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object webhookSource_ = "";
   /**
    *
    *
@@ -613,10 +625,14 @@ public com.google.protobuf.Struct getWebhookPayload() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getWebhookPayloadOrBuilder() {
-    return getWebhookPayload();
+    return webhookPayload_ == null
+        ? com.google.protobuf.Struct.getDefaultInstance()
+        : webhookPayload_;
   }
 
   public static final int OUTPUT_CONTEXTS_FIELD_NUMBER = 10;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Context> outputContexts_;
   /**
    *
@@ -749,11 +765,11 @@ public com.google.cloud.dialogflow.v2.Intent getIntent() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.IntentOrBuilder getIntentOrBuilder() {
-    return getIntent();
+    return intent_ == null ? com.google.cloud.dialogflow.v2.Intent.getDefaultInstance() : intent_;
   }
 
   public static final int INTENT_DETECTION_CONFIDENCE_FIELD_NUMBER = 12;
-  private float intentDetectionConfidence_;
+  private float intentDetectionConfidence_ = 0F;
   /**
    *
    *
@@ -837,7 +853,9 @@ public com.google.protobuf.Struct getDiagnosticInfo() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getDiagnosticInfoOrBuilder() {
-    return getDiagnosticInfo();
+    return diagnosticInfo_ == null
+        ? com.google.protobuf.Struct.getDefaultInstance()
+        : diagnosticInfo_;
   }
 
   public static final int SENTIMENT_ANALYSIS_RESULT_FIELD_NUMBER = 17;
@@ -892,7 +910,9 @@ public com.google.cloud.dialogflow.v2.SentimentAnalysisResult getSentimentAnalys
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.SentimentAnalysisResultOrBuilder
       getSentimentAnalysisResultOrBuilder() {
-    return getSentimentAnalysisResult();
+    return sentimentAnalysisResult_ == null
+        ? com.google.cloud.dialogflow.v2.SentimentAnalysisResult.getDefaultInstance()
+        : sentimentAnalysisResult_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -1263,39 +1283,30 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       queryText_ = "";
-
       languageCode_ = "";
-
       speechRecognitionConfidence_ = 0F;
-
       action_ = "";
-
-      if (parametersBuilder_ == null) {
-        parameters_ = null;
-      } else {
-        parameters_ = null;
+      parameters_ = null;
+      if (parametersBuilder_ != null) {
+        parametersBuilder_.dispose();
         parametersBuilder_ = null;
       }
       allRequiredParamsPresent_ = false;
-
       cancelsSlotFilling_ = false;
-
       fulfillmentText_ = "";
-
       if (fulfillmentMessagesBuilder_ == null) {
         fulfillmentMessages_ = java.util.Collections.emptyList();
       } else {
         fulfillmentMessages_ = null;
         fulfillmentMessagesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000100);
       webhookSource_ = "";
-
-      if (webhookPayloadBuilder_ == null) {
-        webhookPayload_ = null;
-      } else {
-        webhookPayload_ = null;
+      webhookPayload_ = null;
+      if (webhookPayloadBuilder_ != null) {
+        webhookPayloadBuilder_.dispose();
         webhookPayloadBuilder_ = null;
       }
       if (outputContextsBuilder_ == null) {
@@ -1304,25 +1315,21 @@ public Builder clear() {
         outputContexts_ = null;
         outputContextsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
-      if (intentBuilder_ == null) {
-        intent_ = null;
-      } else {
-        intent_ = null;
+      bitField0_ = (bitField0_ & ~0x00000800);
+      intent_ = null;
+      if (intentBuilder_ != null) {
+        intentBuilder_.dispose();
         intentBuilder_ = null;
       }
       intentDetectionConfidence_ = 0F;
-
-      if (diagnosticInfoBuilder_ == null) {
-        diagnosticInfo_ = null;
-      } else {
-        diagnosticInfo_ = null;
+      diagnosticInfo_ = null;
+      if (diagnosticInfoBuilder_ != null) {
+        diagnosticInfoBuilder_.dispose();
         diagnosticInfoBuilder_ = null;
       }
-      if (sentimentAnalysisResultBuilder_ == null) {
-        sentimentAnalysisResult_ = null;
-      } else {
-        sentimentAnalysisResult_ = null;
+      sentimentAnalysisResult_ = null;
+      if (sentimentAnalysisResultBuilder_ != null) {
+        sentimentAnalysisResultBuilder_.dispose();
         sentimentAnalysisResultBuilder_ = null;
       }
       return this;
@@ -1352,61 +1359,84 @@ public com.google.cloud.dialogflow.v2.QueryResult build() {
     public com.google.cloud.dialogflow.v2.QueryResult buildPartial() {
       com.google.cloud.dialogflow.v2.QueryResult result =
           new com.google.cloud.dialogflow.v2.QueryResult(this);
-      int from_bitField0_ = bitField0_;
-      result.queryText_ = queryText_;
-      result.languageCode_ = languageCode_;
-      result.speechRecognitionConfidence_ = speechRecognitionConfidence_;
-      result.action_ = action_;
-      if (parametersBuilder_ == null) {
-        result.parameters_ = parameters_;
-      } else {
-        result.parameters_ = parametersBuilder_.build();
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.allRequiredParamsPresent_ = allRequiredParamsPresent_;
-      result.cancelsSlotFilling_ = cancelsSlotFilling_;
-      result.fulfillmentText_ = fulfillmentText_;
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.cloud.dialogflow.v2.QueryResult result) {
       if (fulfillmentMessagesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000100) != 0)) {
           fulfillmentMessages_ = java.util.Collections.unmodifiableList(fulfillmentMessages_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000100);
         }
         result.fulfillmentMessages_ = fulfillmentMessages_;
       } else {
         result.fulfillmentMessages_ = fulfillmentMessagesBuilder_.build();
       }
-      result.webhookSource_ = webhookSource_;
-      if (webhookPayloadBuilder_ == null) {
-        result.webhookPayload_ = webhookPayload_;
-      } else {
-        result.webhookPayload_ = webhookPayloadBuilder_.build();
-      }
       if (outputContextsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000800) != 0)) {
           outputContexts_ = java.util.Collections.unmodifiableList(outputContexts_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000800);
         }
         result.outputContexts_ = outputContexts_;
       } else {
         result.outputContexts_ = outputContextsBuilder_.build();
       }
-      if (intentBuilder_ == null) {
-        result.intent_ = intent_;
-      } else {
-        result.intent_ = intentBuilder_.build();
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.QueryResult result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.queryText_ = queryText_;
       }
-      result.intentDetectionConfidence_ = intentDetectionConfidence_;
-      if (diagnosticInfoBuilder_ == null) {
-        result.diagnosticInfo_ = diagnosticInfo_;
-      } else {
-        result.diagnosticInfo_ = diagnosticInfoBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.languageCode_ = languageCode_;
       }
-      if (sentimentAnalysisResultBuilder_ == null) {
-        result.sentimentAnalysisResult_ = sentimentAnalysisResult_;
-      } else {
-        result.sentimentAnalysisResult_ = sentimentAnalysisResultBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.speechRecognitionConfidence_ = speechRecognitionConfidence_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.action_ = action_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.parameters_ = parametersBuilder_ == null ? parameters_ : parametersBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.allRequiredParamsPresent_ = allRequiredParamsPresent_;
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.cancelsSlotFilling_ = cancelsSlotFilling_;
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.fulfillmentText_ = fulfillmentText_;
+      }
+      if (((from_bitField0_ & 0x00000200) != 0)) {
+        result.webhookSource_ = webhookSource_;
+      }
+      if (((from_bitField0_ & 0x00000400) != 0)) {
+        result.webhookPayload_ =
+            webhookPayloadBuilder_ == null ? webhookPayload_ : webhookPayloadBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00001000) != 0)) {
+        result.intent_ = intentBuilder_ == null ? intent_ : intentBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00002000) != 0)) {
+        result.intentDetectionConfidence_ = intentDetectionConfidence_;
+      }
+      if (((from_bitField0_ & 0x00004000) != 0)) {
+        result.diagnosticInfo_ =
+            diagnosticInfoBuilder_ == null ? diagnosticInfo_ : diagnosticInfoBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00008000) != 0)) {
+        result.sentimentAnalysisResult_ =
+            sentimentAnalysisResultBuilder_ == null
+                ? sentimentAnalysisResult_
+                : sentimentAnalysisResultBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -1456,10 +1486,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.QueryResult other) {
       if (other == com.google.cloud.dialogflow.v2.QueryResult.getDefaultInstance()) return this;
       if (!other.getQueryText().isEmpty()) {
         queryText_ = other.queryText_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getSpeechRecognitionConfidence() != 0F) {
@@ -1467,6 +1499,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.QueryResult other) {
       }
       if (!other.getAction().isEmpty()) {
         action_ = other.action_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (other.hasParameters()) {
@@ -1480,13 +1513,14 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.QueryResult other) {
       }
       if (!other.getFulfillmentText().isEmpty()) {
         fulfillmentText_ = other.fulfillmentText_;
+        bitField0_ |= 0x00000080;
         onChanged();
       }
       if (fulfillmentMessagesBuilder_ == null) {
         if (!other.fulfillmentMessages_.isEmpty()) {
           if (fulfillmentMessages_.isEmpty()) {
             fulfillmentMessages_ = other.fulfillmentMessages_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000100);
           } else {
             ensureFulfillmentMessagesIsMutable();
             fulfillmentMessages_.addAll(other.fulfillmentMessages_);
@@ -1499,7 +1533,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.QueryResult other) {
             fulfillmentMessagesBuilder_.dispose();
             fulfillmentMessagesBuilder_ = null;
             fulfillmentMessages_ = other.fulfillmentMessages_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000100);
             fulfillmentMessagesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getFulfillmentMessagesFieldBuilder()
@@ -1511,6 +1545,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.QueryResult other) {
       }
       if (!other.getWebhookSource().isEmpty()) {
         webhookSource_ = other.webhookSource_;
+        bitField0_ |= 0x00000200;
         onChanged();
       }
       if (other.hasWebhookPayload()) {
@@ -1520,7 +1555,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.QueryResult other) {
         if (!other.outputContexts_.isEmpty()) {
           if (outputContexts_.isEmpty()) {
             outputContexts_ = other.outputContexts_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000800);
           } else {
             ensureOutputContextsIsMutable();
             outputContexts_.addAll(other.outputContexts_);
@@ -1533,7 +1568,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.QueryResult other) {
             outputContextsBuilder_.dispose();
             outputContextsBuilder_ = null;
             outputContexts_ = other.outputContexts_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000800);
             outputContextsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getOutputContextsFieldBuilder()
@@ -1584,37 +1619,37 @@ public Builder mergeFrom(
             case 10:
               {
                 queryText_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 21:
               {
                 speechRecognitionConfidence_ = input.readFloat();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 21
             case 26:
               {
                 action_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(getParametersFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 34
             case 40:
               {
                 allRequiredParamsPresent_ = input.readBool();
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 40
             case 50:
               {
                 fulfillmentText_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 50
             case 58:
@@ -1633,13 +1668,13 @@ public Builder mergeFrom(
             case 66:
               {
                 webhookSource_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000200;
                 break;
               } // case 66
             case 74:
               {
                 input.readMessage(getWebhookPayloadFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000400;
                 break;
               } // case 74
             case 82:
@@ -1658,38 +1693,38 @@ public Builder mergeFrom(
             case 90:
               {
                 input.readMessage(getIntentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00001000;
                 break;
               } // case 90
             case 101:
               {
                 intentDetectionConfidence_ = input.readFloat();
-
+                bitField0_ |= 0x00002000;
                 break;
               } // case 101
             case 114:
               {
                 input.readMessage(getDiagnosticInfoFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00004000;
                 break;
               } // case 114
             case 122:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 122
             case 138:
               {
                 input.readMessage(
                     getSentimentAnalysisResultFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00008000;
                 break;
               } // case 138
             case 168:
               {
                 cancelsSlotFilling_ = input.readBool();
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 168
             default:
@@ -1793,8 +1828,8 @@ public Builder setQueryText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       queryText_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1817,8 +1852,8 @@ public Builder setQueryText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearQueryText() {
-
       queryText_ = getDefaultInstance().getQueryText();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1846,8 +1881,8 @@ public Builder setQueryTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       queryText_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1922,8 +1957,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1942,8 +1977,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1967,8 +2002,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -2018,6 +2053,7 @@ public float getSpeechRecognitionConfidence() {
     public Builder setSpeechRecognitionConfidence(float value) {
 
       speechRecognitionConfidence_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2040,7 +2076,7 @@ public Builder setSpeechRecognitionConfidence(float value) {
      * @return This builder for chaining.
      */
     public Builder clearSpeechRecognitionConfidence() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       speechRecognitionConfidence_ = 0F;
       onChanged();
       return this;
@@ -2107,8 +2143,8 @@ public Builder setAction(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       action_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2124,8 +2160,8 @@ public Builder setAction(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAction() {
-
       action_ = getDefaultInstance().getAction();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -2146,8 +2182,8 @@ public Builder setActionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       action_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2183,7 +2219,7 @@ public Builder setActionBytes(com.google.protobuf.ByteString value) {
      * @return Whether the parameters field is set.
      */
     public boolean hasParameters() {
-      return parametersBuilder_ != null || parameters_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -2244,11 +2280,11 @@ public Builder setParameters(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         parameters_ = value;
-        onChanged();
       } else {
         parametersBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2276,11 +2312,11 @@ public Builder setParameters(com.google.protobuf.Struct value) {
     public Builder setParameters(com.google.protobuf.Struct.Builder builderForValue) {
       if (parametersBuilder_ == null) {
         parameters_ = builderForValue.build();
-        onChanged();
       } else {
         parametersBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2307,17 +2343,18 @@ public Builder setParameters(com.google.protobuf.Struct.Builder builderForValue)
      */
     public Builder mergeParameters(com.google.protobuf.Struct value) {
       if (parametersBuilder_ == null) {
-        if (parameters_ != null) {
-          parameters_ =
-              com.google.protobuf.Struct.newBuilder(parameters_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && parameters_ != null
+            && parameters_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getParametersBuilder().mergeFrom(value);
         } else {
           parameters_ = value;
         }
-        onChanged();
       } else {
         parametersBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2343,14 +2380,13 @@ public Builder mergeParameters(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct parameters = 4;</code>
      */
     public Builder clearParameters() {
-      if (parametersBuilder_ == null) {
-        parameters_ = null;
-        onChanged();
-      } else {
-        parameters_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      parameters_ = null;
+      if (parametersBuilder_ != null) {
+        parametersBuilder_.dispose();
         parametersBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2376,7 +2412,7 @@ public Builder clearParameters() {
      * <code>.google.protobuf.Struct parameters = 4;</code>
      */
     public com.google.protobuf.Struct.Builder getParametersBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getParametersFieldBuilder().getBuilder();
     }
@@ -2487,6 +2523,7 @@ public boolean getAllRequiredParamsPresent() {
     public Builder setAllRequiredParamsPresent(boolean value) {
 
       allRequiredParamsPresent_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2506,7 +2543,7 @@ public Builder setAllRequiredParamsPresent(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearAllRequiredParamsPresent() {
-
+      bitField0_ = (bitField0_ & ~0x00000020);
       allRequiredParamsPresent_ = false;
       onChanged();
       return this;
@@ -2547,6 +2584,7 @@ public boolean getCancelsSlotFilling() {
     public Builder setCancelsSlotFilling(boolean value) {
 
       cancelsSlotFilling_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2564,7 +2602,7 @@ public Builder setCancelsSlotFilling(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearCancelsSlotFilling() {
-
+      bitField0_ = (bitField0_ & ~0x00000040);
       cancelsSlotFilling_ = false;
       onChanged();
       return this;
@@ -2634,8 +2672,8 @@ public Builder setFulfillmentText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       fulfillmentText_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2652,8 +2690,8 @@ public Builder setFulfillmentText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFulfillmentText() {
-
       fulfillmentText_ = getDefaultInstance().getFulfillmentText();
+      bitField0_ = (bitField0_ & ~0x00000080);
       onChanged();
       return this;
     }
@@ -2675,8 +2713,8 @@ public Builder setFulfillmentTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       fulfillmentText_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2685,11 +2723,11 @@ public Builder setFulfillmentTextBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureFulfillmentMessagesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000100) != 0)) {
         fulfillmentMessages_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.Intent.Message>(
                 fulfillmentMessages_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000100;
       }
     }
 
@@ -2908,7 +2946,7 @@ public Builder addAllFulfillmentMessages(
     public Builder clearFulfillmentMessages() {
       if (fulfillmentMessagesBuilder_ == null) {
         fulfillmentMessages_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000100);
         onChanged();
       } else {
         fulfillmentMessagesBuilder_.clear();
@@ -3034,7 +3072,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Builder addFulfillmentMessa
                 com.google.cloud.dialogflow.v2.Intent.Message.Builder,
                 com.google.cloud.dialogflow.v2.Intent.MessageOrBuilder>(
                 fulfillmentMessages_,
-                ((bitField0_ & 0x00000001) != 0),
+                ((bitField0_ & 0x00000100) != 0),
                 getParentForChildren(),
                 isClean());
         fulfillmentMessages_ = null;
@@ -3106,8 +3144,8 @@ public Builder setWebhookSource(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       webhookSource_ = value;
+      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -3124,8 +3162,8 @@ public Builder setWebhookSource(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearWebhookSource() {
-
       webhookSource_ = getDefaultInstance().getWebhookSource();
+      bitField0_ = (bitField0_ & ~0x00000200);
       onChanged();
       return this;
     }
@@ -3147,8 +3185,8 @@ public Builder setWebhookSourceBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       webhookSource_ = value;
+      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -3172,7 +3210,7 @@ public Builder setWebhookSourceBytes(com.google.protobuf.ByteString value) {
      * @return Whether the webhookPayload field is set.
      */
     public boolean hasWebhookPayload() {
-      return webhookPayloadBuilder_ != null || webhookPayload_ != null;
+      return ((bitField0_ & 0x00000400) != 0);
     }
     /**
      *
@@ -3211,11 +3249,11 @@ public Builder setWebhookPayload(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         webhookPayload_ = value;
-        onChanged();
       } else {
         webhookPayloadBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000400;
+      onChanged();
       return this;
     }
     /**
@@ -3231,11 +3269,11 @@ public Builder setWebhookPayload(com.google.protobuf.Struct value) {
     public Builder setWebhookPayload(com.google.protobuf.Struct.Builder builderForValue) {
       if (webhookPayloadBuilder_ == null) {
         webhookPayload_ = builderForValue.build();
-        onChanged();
       } else {
         webhookPayloadBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000400;
+      onChanged();
       return this;
     }
     /**
@@ -3250,19 +3288,18 @@ public Builder setWebhookPayload(com.google.protobuf.Struct.Builder builderForVa
      */
     public Builder mergeWebhookPayload(com.google.protobuf.Struct value) {
       if (webhookPayloadBuilder_ == null) {
-        if (webhookPayload_ != null) {
-          webhookPayload_ =
-              com.google.protobuf.Struct.newBuilder(webhookPayload_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000400) != 0)
+            && webhookPayload_ != null
+            && webhookPayload_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getWebhookPayloadBuilder().mergeFrom(value);
         } else {
           webhookPayload_ = value;
         }
-        onChanged();
       } else {
         webhookPayloadBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000400;
+      onChanged();
       return this;
     }
     /**
@@ -3276,14 +3313,13 @@ public Builder mergeWebhookPayload(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct webhook_payload = 9;</code>
      */
     public Builder clearWebhookPayload() {
-      if (webhookPayloadBuilder_ == null) {
-        webhookPayload_ = null;
-        onChanged();
-      } else {
-        webhookPayload_ = null;
+      bitField0_ = (bitField0_ & ~0x00000400);
+      webhookPayload_ = null;
+      if (webhookPayloadBuilder_ != null) {
+        webhookPayloadBuilder_.dispose();
         webhookPayloadBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3297,7 +3333,7 @@ public Builder clearWebhookPayload() {
      * <code>.google.protobuf.Struct webhook_payload = 9;</code>
      */
     public com.google.protobuf.Struct.Builder getWebhookPayloadBuilder() {
-
+      bitField0_ |= 0x00000400;
       onChanged();
       return getWebhookPayloadFieldBuilder().getBuilder();
     }
@@ -3351,10 +3387,10 @@ public com.google.protobuf.StructOrBuilder getWebhookPayloadOrBuilder() {
         java.util.Collections.emptyList();
 
     private void ensureOutputContextsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000800) != 0)) {
         outputContexts_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.Context>(outputContexts_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000800;
       }
     }
 
@@ -3603,7 +3639,7 @@ public Builder addAllOutputContexts(
     public Builder clearOutputContexts() {
       if (outputContextsBuilder_ == null) {
         outputContexts_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000800);
         onChanged();
       } else {
         outputContextsBuilder_.clear();
@@ -3747,7 +3783,7 @@ public com.google.cloud.dialogflow.v2.Context.Builder addOutputContextsBuilder(i
                 com.google.cloud.dialogflow.v2.Context.Builder,
                 com.google.cloud.dialogflow.v2.ContextOrBuilder>(
                 outputContexts_,
-                ((bitField0_ & 0x00000002) != 0),
+                ((bitField0_ & 0x00000800) != 0),
                 getParentForChildren(),
                 isClean());
         outputContexts_ = null;
@@ -3775,7 +3811,7 @@ public com.google.cloud.dialogflow.v2.Context.Builder addOutputContextsBuilder(i
      * @return Whether the intent field is set.
      */
     public boolean hasIntent() {
-      return intentBuilder_ != null || intent_ != null;
+      return ((bitField0_ & 0x00001000) != 0);
     }
     /**
      *
@@ -3816,11 +3852,11 @@ public Builder setIntent(com.google.cloud.dialogflow.v2.Intent value) {
           throw new NullPointerException();
         }
         intent_ = value;
-        onChanged();
       } else {
         intentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00001000;
+      onChanged();
       return this;
     }
     /**
@@ -3837,11 +3873,11 @@ public Builder setIntent(com.google.cloud.dialogflow.v2.Intent value) {
     public Builder setIntent(com.google.cloud.dialogflow.v2.Intent.Builder builderForValue) {
       if (intentBuilder_ == null) {
         intent_ = builderForValue.build();
-        onChanged();
       } else {
         intentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00001000;
+      onChanged();
       return this;
     }
     /**
@@ -3857,19 +3893,18 @@ public Builder setIntent(com.google.cloud.dialogflow.v2.Intent.Builder builderFo
      */
     public Builder mergeIntent(com.google.cloud.dialogflow.v2.Intent value) {
       if (intentBuilder_ == null) {
-        if (intent_ != null) {
-          intent_ =
-              com.google.cloud.dialogflow.v2.Intent.newBuilder(intent_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00001000) != 0)
+            && intent_ != null
+            && intent_ != com.google.cloud.dialogflow.v2.Intent.getDefaultInstance()) {
+          getIntentBuilder().mergeFrom(value);
         } else {
           intent_ = value;
         }
-        onChanged();
       } else {
         intentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00001000;
+      onChanged();
       return this;
     }
     /**
@@ -3884,14 +3919,13 @@ public Builder mergeIntent(com.google.cloud.dialogflow.v2.Intent value) {
      * <code>.google.cloud.dialogflow.v2.Intent intent = 11;</code>
      */
     public Builder clearIntent() {
-      if (intentBuilder_ == null) {
-        intent_ = null;
-        onChanged();
-      } else {
-        intent_ = null;
+      bitField0_ = (bitField0_ & ~0x00001000);
+      intent_ = null;
+      if (intentBuilder_ != null) {
+        intentBuilder_.dispose();
         intentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3906,7 +3940,7 @@ public Builder clearIntent() {
      * <code>.google.cloud.dialogflow.v2.Intent intent = 11;</code>
      */
     public com.google.cloud.dialogflow.v2.Intent.Builder getIntentBuilder() {
-
+      bitField0_ |= 0x00001000;
       onChanged();
       return getIntentFieldBuilder().getBuilder();
     }
@@ -4003,6 +4037,7 @@ public float getIntentDetectionConfidence() {
     public Builder setIntentDetectionConfidence(float value) {
 
       intentDetectionConfidence_ = value;
+      bitField0_ |= 0x00002000;
       onChanged();
       return this;
     }
@@ -4025,7 +4060,7 @@ public Builder setIntentDetectionConfidence(float value) {
      * @return This builder for chaining.
      */
     public Builder clearIntentDetectionConfidence() {
-
+      bitField0_ = (bitField0_ & ~0x00002000);
       intentDetectionConfidence_ = 0F;
       onChanged();
       return this;
@@ -4054,7 +4089,7 @@ public Builder clearIntentDetectionConfidence() {
      * @return Whether the diagnosticInfo field is set.
      */
     public boolean hasDiagnosticInfo() {
-      return diagnosticInfoBuilder_ != null || diagnosticInfo_ != null;
+      return ((bitField0_ & 0x00004000) != 0);
     }
     /**
      *
@@ -4101,11 +4136,11 @@ public Builder setDiagnosticInfo(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         diagnosticInfo_ = value;
-        onChanged();
       } else {
         diagnosticInfoBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00004000;
+      onChanged();
       return this;
     }
     /**
@@ -4125,11 +4160,11 @@ public Builder setDiagnosticInfo(com.google.protobuf.Struct value) {
     public Builder setDiagnosticInfo(com.google.protobuf.Struct.Builder builderForValue) {
       if (diagnosticInfoBuilder_ == null) {
         diagnosticInfo_ = builderForValue.build();
-        onChanged();
       } else {
         diagnosticInfoBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00004000;
+      onChanged();
       return this;
     }
     /**
@@ -4148,19 +4183,18 @@ public Builder setDiagnosticInfo(com.google.protobuf.Struct.Builder builderForVa
      */
     public Builder mergeDiagnosticInfo(com.google.protobuf.Struct value) {
       if (diagnosticInfoBuilder_ == null) {
-        if (diagnosticInfo_ != null) {
-          diagnosticInfo_ =
-              com.google.protobuf.Struct.newBuilder(diagnosticInfo_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00004000) != 0)
+            && diagnosticInfo_ != null
+            && diagnosticInfo_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getDiagnosticInfoBuilder().mergeFrom(value);
         } else {
           diagnosticInfo_ = value;
         }
-        onChanged();
       } else {
         diagnosticInfoBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00004000;
+      onChanged();
       return this;
     }
     /**
@@ -4178,14 +4212,13 @@ public Builder mergeDiagnosticInfo(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct diagnostic_info = 14;</code>
      */
     public Builder clearDiagnosticInfo() {
-      if (diagnosticInfoBuilder_ == null) {
-        diagnosticInfo_ = null;
-        onChanged();
-      } else {
-        diagnosticInfo_ = null;
+      bitField0_ = (bitField0_ & ~0x00004000);
+      diagnosticInfo_ = null;
+      if (diagnosticInfoBuilder_ != null) {
+        diagnosticInfoBuilder_.dispose();
         diagnosticInfoBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -4203,7 +4236,7 @@ public Builder clearDiagnosticInfo() {
      * <code>.google.protobuf.Struct diagnostic_info = 14;</code>
      */
     public com.google.protobuf.Struct.Builder getDiagnosticInfoBuilder() {
-
+      bitField0_ |= 0x00004000;
       onChanged();
       return getDiagnosticInfoFieldBuilder().getBuilder();
     }
@@ -4281,7 +4314,7 @@ public com.google.protobuf.StructOrBuilder getDiagnosticInfoOrBuilder() {
      * @return Whether the sentimentAnalysisResult field is set.
      */
     public boolean hasSentimentAnalysisResult() {
-      return sentimentAnalysisResultBuilder_ != null || sentimentAnalysisResult_ != null;
+      return ((bitField0_ & 0x00008000) != 0);
     }
     /**
      *
@@ -4323,11 +4356,11 @@ public Builder setSentimentAnalysisResult(
           throw new NullPointerException();
         }
         sentimentAnalysisResult_ = value;
-        onChanged();
       } else {
         sentimentAnalysisResultBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00008000;
+      onChanged();
       return this;
     }
     /**
@@ -4345,11 +4378,11 @@ public Builder setSentimentAnalysisResult(
         com.google.cloud.dialogflow.v2.SentimentAnalysisResult.Builder builderForValue) {
       if (sentimentAnalysisResultBuilder_ == null) {
         sentimentAnalysisResult_ = builderForValue.build();
-        onChanged();
       } else {
         sentimentAnalysisResultBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00008000;
+      onChanged();
       return this;
     }
     /**
@@ -4366,20 +4399,19 @@ public Builder setSentimentAnalysisResult(
     public Builder mergeSentimentAnalysisResult(
         com.google.cloud.dialogflow.v2.SentimentAnalysisResult value) {
       if (sentimentAnalysisResultBuilder_ == null) {
-        if (sentimentAnalysisResult_ != null) {
-          sentimentAnalysisResult_ =
-              com.google.cloud.dialogflow.v2.SentimentAnalysisResult.newBuilder(
-                      sentimentAnalysisResult_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00008000) != 0)
+            && sentimentAnalysisResult_ != null
+            && sentimentAnalysisResult_
+                != com.google.cloud.dialogflow.v2.SentimentAnalysisResult.getDefaultInstance()) {
+          getSentimentAnalysisResultBuilder().mergeFrom(value);
         } else {
           sentimentAnalysisResult_ = value;
         }
-        onChanged();
       } else {
         sentimentAnalysisResultBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00008000;
+      onChanged();
       return this;
     }
     /**
@@ -4394,14 +4426,13 @@ public Builder mergeSentimentAnalysisResult(
      * </code>
      */
     public Builder clearSentimentAnalysisResult() {
-      if (sentimentAnalysisResultBuilder_ == null) {
-        sentimentAnalysisResult_ = null;
-        onChanged();
-      } else {
-        sentimentAnalysisResult_ = null;
+      bitField0_ = (bitField0_ & ~0x00008000);
+      sentimentAnalysisResult_ = null;
+      if (sentimentAnalysisResultBuilder_ != null) {
+        sentimentAnalysisResultBuilder_.dispose();
         sentimentAnalysisResultBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -4417,7 +4448,7 @@ public Builder clearSentimentAnalysisResult() {
      */
     public com.google.cloud.dialogflow.v2.SentimentAnalysisResult.Builder
         getSentimentAnalysisResultBuilder() {
-
+      bitField0_ |= 0x00008000;
       onChanged();
       return getSentimentAnalysisResultFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ReloadDocumentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ReloadDocumentRequest.java
index 8f6609f73c55..7d952aef22c2 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ReloadDocumentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ReloadDocumentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * Request message for [Documents.ReloadDocument][google.cloud.dialogflow.v2.Documents.ReloadDocument].
+ * Request message for
+ * [Documents.ReloadDocument][google.cloud.dialogflow.v2.Documents.ReloadDocument].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.ReloadDocumentRequest}
@@ -112,7 +113,9 @@ public SourceCase getSourceCase() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -173,8 +176,8 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    *
    * <pre>
-   * Optional. The path of gcs source file for reloading document content. For now,
-   * only gcs uri is supported.
+   * Optional. The path of gcs source file for reloading document content. For
+   * now, only gcs uri is supported.
    * For documents stored in Google Cloud Storage, these URIs must have
    * the form `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`.
    * </pre>
@@ -190,8 +193,8 @@ public boolean hasContentUri() {
    *
    *
    * <pre>
-   * Optional. The path of gcs source file for reloading document content. For now,
-   * only gcs uri is supported.
+   * Optional. The path of gcs source file for reloading document content. For
+   * now, only gcs uri is supported.
    * For documents stored in Google Cloud Storage, these URIs must have
    * the form `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`.
    * </pre>
@@ -220,8 +223,8 @@ public java.lang.String getContentUri() {
    *
    *
    * <pre>
-   * Optional. The path of gcs source file for reloading document content. For now,
-   * only gcs uri is supported.
+   * Optional. The path of gcs source file for reloading document content. For
+   * now, only gcs uri is supported.
    * For documents stored in Google Cloud Storage, these URIs must have
    * the form `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`.
    * </pre>
@@ -248,7 +251,7 @@ public com.google.protobuf.ByteString getContentUriBytes() {
   }
 
   public static final int IMPORT_GCS_CUSTOM_METADATA_FIELD_NUMBER = 4;
-  private boolean importGcsCustomMetadata_;
+  private boolean importGcsCustomMetadata_ = false;
   /**
    *
    *
@@ -267,13 +270,13 @@ public boolean getImportGcsCustomMetadata() {
   }
 
   public static final int SMART_MESSAGING_PARTIAL_UPDATE_FIELD_NUMBER = 5;
-  private boolean smartMessagingPartialUpdate_;
+  private boolean smartMessagingPartialUpdate_ = false;
   /**
    *
    *
    * <pre>
-   * Optional. When enabled, the reload request is to apply partial update to the smart
-   * messaging allowlist.
+   * Optional. When enabled, the reload request is to apply partial update to
+   * the smart messaging allowlist.
    * </pre>
    *
    * <code>bool smart_messaging_partial_update = 5 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -489,7 +492,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Request message for [Documents.ReloadDocument][google.cloud.dialogflow.v2.Documents.ReloadDocument].
+   * Request message for
+   * [Documents.ReloadDocument][google.cloud.dialogflow.v2.Documents.ReloadDocument].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.ReloadDocumentRequest}
@@ -523,12 +527,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       importGcsCustomMetadata_ = false;
-
       smartMessagingPartialUpdate_ = false;
-
       sourceCase_ = 0;
       source_ = null;
       return this;
@@ -558,17 +560,32 @@ public com.google.cloud.dialogflow.v2.ReloadDocumentRequest build() {
     public com.google.cloud.dialogflow.v2.ReloadDocumentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ReloadDocumentRequest result =
           new com.google.cloud.dialogflow.v2.ReloadDocumentRequest(this);
-      result.name_ = name_;
-      if (sourceCase_ == 3) {
-        result.source_ = source_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.importGcsCustomMetadata_ = importGcsCustomMetadata_;
-      result.smartMessagingPartialUpdate_ = smartMessagingPartialUpdate_;
-      result.sourceCase_ = sourceCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ReloadDocumentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.importGcsCustomMetadata_ = importGcsCustomMetadata_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.smartMessagingPartialUpdate_ = smartMessagingPartialUpdate_;
+      }
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2.ReloadDocumentRequest result) {
+      result.sourceCase_ = sourceCase_;
+      result.source_ = this.source_;
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -617,6 +634,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ReloadDocumentRequest ot
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getImportGcsCustomMetadata() != false) {
@@ -667,7 +685,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 26:
@@ -680,13 +698,13 @@ public Builder mergeFrom(
             case 32:
               {
                 importGcsCustomMetadata_ = input.readBool();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 32
             case 40:
               {
                 smartMessagingPartialUpdate_ = input.readBool();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 40
             default:
@@ -720,6 +738,8 @@ public Builder clearSource() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -793,8 +813,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -814,8 +834,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -840,8 +860,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -850,8 +870,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      *
      *
      * <pre>
-     * Optional. The path of gcs source file for reloading document content. For now,
-     * only gcs uri is supported.
+     * Optional. The path of gcs source file for reloading document content. For
+     * now, only gcs uri is supported.
      * For documents stored in Google Cloud Storage, these URIs must have
      * the form `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`.
      * </pre>
@@ -868,8 +888,8 @@ public boolean hasContentUri() {
      *
      *
      * <pre>
-     * Optional. The path of gcs source file for reloading document content. For now,
-     * only gcs uri is supported.
+     * Optional. The path of gcs source file for reloading document content. For
+     * now, only gcs uri is supported.
      * For documents stored in Google Cloud Storage, these URIs must have
      * the form `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`.
      * </pre>
@@ -899,8 +919,8 @@ public java.lang.String getContentUri() {
      *
      *
      * <pre>
-     * Optional. The path of gcs source file for reloading document content. For now,
-     * only gcs uri is supported.
+     * Optional. The path of gcs source file for reloading document content. For
+     * now, only gcs uri is supported.
      * For documents stored in Google Cloud Storage, these URIs must have
      * the form `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`.
      * </pre>
@@ -930,8 +950,8 @@ public com.google.protobuf.ByteString getContentUriBytes() {
      *
      *
      * <pre>
-     * Optional. The path of gcs source file for reloading document content. For now,
-     * only gcs uri is supported.
+     * Optional. The path of gcs source file for reloading document content. For
+     * now, only gcs uri is supported.
      * For documents stored in Google Cloud Storage, these URIs must have
      * the form `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`.
      * </pre>
@@ -954,8 +974,8 @@ public Builder setContentUri(java.lang.String value) {
      *
      *
      * <pre>
-     * Optional. The path of gcs source file for reloading document content. For now,
-     * only gcs uri is supported.
+     * Optional. The path of gcs source file for reloading document content. For
+     * now, only gcs uri is supported.
      * For documents stored in Google Cloud Storage, these URIs must have
      * the form `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`.
      * </pre>
@@ -976,8 +996,8 @@ public Builder clearContentUri() {
      *
      *
      * <pre>
-     * Optional. The path of gcs source file for reloading document content. For now,
-     * only gcs uri is supported.
+     * Optional. The path of gcs source file for reloading document content. For
+     * now, only gcs uri is supported.
      * For documents stored in Google Cloud Storage, these URIs must have
      * the form `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`.
      * </pre>
@@ -1031,6 +1051,7 @@ public boolean getImportGcsCustomMetadata() {
     public Builder setImportGcsCustomMetadata(boolean value) {
 
       importGcsCustomMetadata_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1047,7 +1068,7 @@ public Builder setImportGcsCustomMetadata(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearImportGcsCustomMetadata() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       importGcsCustomMetadata_ = false;
       onChanged();
       return this;
@@ -1058,8 +1079,8 @@ public Builder clearImportGcsCustomMetadata() {
      *
      *
      * <pre>
-     * Optional. When enabled, the reload request is to apply partial update to the smart
-     * messaging allowlist.
+     * Optional. When enabled, the reload request is to apply partial update to
+     * the smart messaging allowlist.
      * </pre>
      *
      * <code>bool smart_messaging_partial_update = 5 [(.google.api.field_behavior) = OPTIONAL];
@@ -1075,8 +1096,8 @@ public boolean getSmartMessagingPartialUpdate() {
      *
      *
      * <pre>
-     * Optional. When enabled, the reload request is to apply partial update to the smart
-     * messaging allowlist.
+     * Optional. When enabled, the reload request is to apply partial update to
+     * the smart messaging allowlist.
      * </pre>
      *
      * <code>bool smart_messaging_partial_update = 5 [(.google.api.field_behavior) = OPTIONAL];
@@ -1088,6 +1109,7 @@ public boolean getSmartMessagingPartialUpdate() {
     public Builder setSmartMessagingPartialUpdate(boolean value) {
 
       smartMessagingPartialUpdate_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1095,8 +1117,8 @@ public Builder setSmartMessagingPartialUpdate(boolean value) {
      *
      *
      * <pre>
-     * Optional. When enabled, the reload request is to apply partial update to the smart
-     * messaging allowlist.
+     * Optional. When enabled, the reload request is to apply partial update to
+     * the smart messaging allowlist.
      * </pre>
      *
      * <code>bool smart_messaging_partial_update = 5 [(.google.api.field_behavior) = OPTIONAL];
@@ -1105,7 +1127,7 @@ public Builder setSmartMessagingPartialUpdate(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearSmartMessagingPartialUpdate() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       smartMessagingPartialUpdate_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ReloadDocumentRequestOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ReloadDocumentRequestOrBuilder.java
index cc21cb8b8fb8..b16c27e883be 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ReloadDocumentRequestOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ReloadDocumentRequestOrBuilder.java
@@ -60,8 +60,8 @@ public interface ReloadDocumentRequestOrBuilder
    *
    *
    * <pre>
-   * Optional. The path of gcs source file for reloading document content. For now,
-   * only gcs uri is supported.
+   * Optional. The path of gcs source file for reloading document content. For
+   * now, only gcs uri is supported.
    * For documents stored in Google Cloud Storage, these URIs must have
    * the form `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`.
    * </pre>
@@ -75,8 +75,8 @@ public interface ReloadDocumentRequestOrBuilder
    *
    *
    * <pre>
-   * Optional. The path of gcs source file for reloading document content. For now,
-   * only gcs uri is supported.
+   * Optional. The path of gcs source file for reloading document content. For
+   * now, only gcs uri is supported.
    * For documents stored in Google Cloud Storage, these URIs must have
    * the form `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`.
    * </pre>
@@ -90,8 +90,8 @@ public interface ReloadDocumentRequestOrBuilder
    *
    *
    * <pre>
-   * Optional. The path of gcs source file for reloading document content. For now,
-   * only gcs uri is supported.
+   * Optional. The path of gcs source file for reloading document content. For
+   * now, only gcs uri is supported.
    * For documents stored in Google Cloud Storage, these URIs must have
    * the form `gs://&lt;bucket-name&gt;/&lt;object-name&gt;`.
    * </pre>
@@ -120,8 +120,8 @@ public interface ReloadDocumentRequestOrBuilder
    *
    *
    * <pre>
-   * Optional. When enabled, the reload request is to apply partial update to the smart
-   * messaging allowlist.
+   * Optional. When enabled, the reload request is to apply partial update to
+   * the smart messaging allowlist.
    * </pre>
    *
    * <code>bool smart_messaging_partial_update = 5 [(.google.api.field_behavior) = OPTIONAL];</code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/RestoreAgentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/RestoreAgentRequest.java
index 55fc7237c300..1dce93e12971 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/RestoreAgentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/RestoreAgentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Agents.RestoreAgent][google.cloud.dialogflow.v2.Agents.RestoreAgent].
+ * The request message for
+ * [Agents.RestoreAgent][google.cloud.dialogflow.v2.Agents.RestoreAgent].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.RestoreAgentRequest}
@@ -115,7 +116,9 @@ public AgentCase getAgentCase() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -492,7 +495,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Agents.RestoreAgent][google.cloud.dialogflow.v2.Agents.RestoreAgent].
+   * The request message for
+   * [Agents.RestoreAgent][google.cloud.dialogflow.v2.Agents.RestoreAgent].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.RestoreAgentRequest}
@@ -526,8 +530,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       agentCase_ = 0;
       agent_ = null;
       return this;
@@ -557,18 +561,26 @@ public com.google.cloud.dialogflow.v2.RestoreAgentRequest build() {
     public com.google.cloud.dialogflow.v2.RestoreAgentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.RestoreAgentRequest result =
           new com.google.cloud.dialogflow.v2.RestoreAgentRequest(this);
-      result.parent_ = parent_;
-      if (agentCase_ == 2) {
-        result.agent_ = agent_;
-      }
-      if (agentCase_ == 3) {
-        result.agent_ = agent_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.agentCase_ = agentCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.RestoreAgentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2.RestoreAgentRequest result) {
+      result.agentCase_ = agentCase_;
+      result.agent_ = this.agent_;
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -617,6 +629,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.RestoreAgentRequest othe
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       switch (other.getAgentCase()) {
@@ -666,7 +679,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -713,6 +726,8 @@ public Builder clearAgent() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -783,8 +798,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -803,8 +818,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -828,8 +843,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsRequest.java
index 78976353c80b..7db789617cab 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Agents.SearchAgents][google.cloud.dialogflow.v2.Agents.SearchAgents].
+ * The request message for
+ * [Agents.SearchAgents][google.cloud.dialogflow.v2.Agents.SearchAgents].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.SearchAgentsRequest}
@@ -69,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -124,7 +127,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -143,7 +146,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -372,7 +377,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Agents.SearchAgents][google.cloud.dialogflow.v2.Agents.SearchAgents].
+   * The request message for
+   * [Agents.SearchAgents][google.cloud.dialogflow.v2.Agents.SearchAgents].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.SearchAgentsRequest}
@@ -406,12 +412,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -439,13 +443,26 @@ public com.google.cloud.dialogflow.v2.SearchAgentsRequest build() {
     public com.google.cloud.dialogflow.v2.SearchAgentsRequest buildPartial() {
       com.google.cloud.dialogflow.v2.SearchAgentsRequest result =
           new com.google.cloud.dialogflow.v2.SearchAgentsRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.SearchAgentsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -494,6 +511,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.SearchAgentsRequest othe
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -501,6 +519,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.SearchAgentsRequest othe
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -532,19 +551,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -564,6 +583,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -634,8 +655,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -654,8 +675,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -679,8 +700,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -718,6 +739,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -734,7 +756,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -801,8 +823,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -818,8 +840,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -840,8 +862,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsResponse.java
index cc85db64edc8..5ba2471113b1 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The response message for [Agents.SearchAgents][google.cloud.dialogflow.v2.Agents.SearchAgents].
+ * The response message for
+ * [Agents.SearchAgents][google.cloud.dialogflow.v2.Agents.SearchAgents].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.SearchAgentsResponse}
@@ -69,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int AGENTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Agent> agents_;
   /**
    *
@@ -143,7 +146,9 @@ public com.google.cloud.dialogflow.v2.AgentOrBuilder getAgentsOrBuilder(int inde
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -367,7 +372,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The response message for [Agents.SearchAgents][google.cloud.dialogflow.v2.Agents.SearchAgents].
+   * The response message for
+   * [Agents.SearchAgents][google.cloud.dialogflow.v2.Agents.SearchAgents].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.SearchAgentsResponse}
@@ -401,6 +407,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (agentsBuilder_ == null) {
         agents_ = java.util.Collections.emptyList();
       } else {
@@ -409,7 +416,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -437,7 +443,16 @@ public com.google.cloud.dialogflow.v2.SearchAgentsResponse build() {
     public com.google.cloud.dialogflow.v2.SearchAgentsResponse buildPartial() {
       com.google.cloud.dialogflow.v2.SearchAgentsResponse result =
           new com.google.cloud.dialogflow.v2.SearchAgentsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.SearchAgentsResponse result) {
       if (agentsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           agents_ = java.util.Collections.unmodifiableList(agents_);
@@ -447,9 +462,13 @@ public com.google.cloud.dialogflow.v2.SearchAgentsResponse buildPartial() {
       } else {
         result.agents_ = agentsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.SearchAgentsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -527,6 +546,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.SearchAgentsResponse oth
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -571,7 +591,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1023,8 +1043,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1041,8 +1061,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1064,8 +1084,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Sentiment.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Sentiment.java
index 99726a6f0610..6d6469b0b16a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Sentiment.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Sentiment.java
@@ -69,7 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SCORE_FIELD_NUMBER = 1;
-  private float score_;
+  private float score_ = 0F;
   /**
    *
    *
@@ -88,7 +88,7 @@ public float getScore() {
   }
 
   public static final int MAGNITUDE_FIELD_NUMBER = 2;
-  private float magnitude_;
+  private float magnitude_ = 0F;
   /**
    *
    *
@@ -316,10 +316,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       score_ = 0F;
-
       magnitude_ = 0F;
-
       return this;
     }
 
@@ -347,12 +346,23 @@ public com.google.cloud.dialogflow.v2.Sentiment build() {
     public com.google.cloud.dialogflow.v2.Sentiment buildPartial() {
       com.google.cloud.dialogflow.v2.Sentiment result =
           new com.google.cloud.dialogflow.v2.Sentiment(this);
-      result.score_ = score_;
-      result.magnitude_ = magnitude_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.Sentiment result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.score_ = score_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.magnitude_ = magnitude_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -433,13 +443,13 @@ public Builder mergeFrom(
             case 13:
               {
                 score_ = input.readFloat();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 13
             case 21:
               {
                 magnitude_ = input.readFloat();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 21
             default:
@@ -459,6 +469,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private float score_;
     /**
      *
@@ -492,6 +504,7 @@ public float getScore() {
     public Builder setScore(float value) {
 
       score_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -508,7 +521,7 @@ public Builder setScore(float value) {
      * @return This builder for chaining.
      */
     public Builder clearScore() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       score_ = 0F;
       onChanged();
       return this;
@@ -547,6 +560,7 @@ public float getMagnitude() {
     public Builder setMagnitude(float value) {
 
       magnitude_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -563,7 +577,7 @@ public Builder setMagnitude(float value) {
      * @return This builder for chaining.
      */
     public Builder clearMagnitude() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       magnitude_ = 0F;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SentimentAnalysisRequestConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SentimentAnalysisRequestConfig.java
index 205bccedca4d..f813cf94f7f6 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SentimentAnalysisRequestConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SentimentAnalysisRequestConfig.java
@@ -67,7 +67,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ANALYZE_QUERY_TEXT_SENTIMENT_FIELD_NUMBER = 1;
-  private boolean analyzeQueryTextSentiment_;
+  private boolean analyzeQueryTextSentiment_ = false;
   /**
    *
    *
@@ -284,8 +284,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       analyzeQueryTextSentiment_ = false;
-
       return this;
     }
 
@@ -314,11 +314,21 @@ public com.google.cloud.dialogflow.v2.SentimentAnalysisRequestConfig build() {
     public com.google.cloud.dialogflow.v2.SentimentAnalysisRequestConfig buildPartial() {
       com.google.cloud.dialogflow.v2.SentimentAnalysisRequestConfig result =
           new com.google.cloud.dialogflow.v2.SentimentAnalysisRequestConfig(this);
-      result.analyzeQueryTextSentiment_ = analyzeQueryTextSentiment_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.SentimentAnalysisRequestConfig result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.analyzeQueryTextSentiment_ = analyzeQueryTextSentiment_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -398,7 +408,7 @@ public Builder mergeFrom(
             case 8:
               {
                 analyzeQueryTextSentiment_ = input.readBool();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             default:
@@ -418,6 +428,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private boolean analyzeQueryTextSentiment_;
     /**
      *
@@ -453,6 +465,7 @@ public boolean getAnalyzeQueryTextSentiment() {
     public Builder setAnalyzeQueryTextSentiment(boolean value) {
 
       analyzeQueryTextSentiment_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -470,7 +483,7 @@ public Builder setAnalyzeQueryTextSentiment(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearAnalyzeQueryTextSentiment() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       analyzeQueryTextSentiment_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SentimentAnalysisResult.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SentimentAnalysisResult.java
index aa8defb6c20a..5a9dbfcb203e 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SentimentAnalysisResult.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SentimentAnalysisResult.java
@@ -26,11 +26,14 @@
  * and identifies the prevailing subjective opinion, especially to determine a
  * user's attitude as positive, negative, or neutral.
  * For [Participants.DetectIntent][], it needs to be configured in
- * [DetectIntentRequest.query_params][google.cloud.dialogflow.v2.DetectIntentRequest.query_params]. For
- * [Participants.StreamingDetectIntent][], it needs to be configured in
+ * [DetectIntentRequest.query_params][google.cloud.dialogflow.v2.DetectIntentRequest.query_params].
+ * For [Participants.StreamingDetectIntent][], it needs to be configured in
  * [StreamingDetectIntentRequest.query_params][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.query_params].
- * And for [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent] and
- * [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent], it needs to be configured in
+ * And for
+ * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent]
+ * and
+ * [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent],
+ * it needs to be configured in
  * [ConversationProfile.human_agent_assistant_config][google.cloud.dialogflow.v2.ConversationProfile.human_agent_assistant_config]
  * </pre>
  *
@@ -119,7 +122,9 @@ public com.google.cloud.dialogflow.v2.Sentiment getQueryTextSentiment() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.SentimentOrBuilder getQueryTextSentimentOrBuilder() {
-    return getQueryTextSentiment();
+    return queryTextSentiment_ == null
+        ? com.google.cloud.dialogflow.v2.Sentiment.getDefaultInstance()
+        : queryTextSentiment_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -295,11 +300,14 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * and identifies the prevailing subjective opinion, especially to determine a
    * user's attitude as positive, negative, or neutral.
    * For [Participants.DetectIntent][], it needs to be configured in
-   * [DetectIntentRequest.query_params][google.cloud.dialogflow.v2.DetectIntentRequest.query_params]. For
-   * [Participants.StreamingDetectIntent][], it needs to be configured in
+   * [DetectIntentRequest.query_params][google.cloud.dialogflow.v2.DetectIntentRequest.query_params].
+   * For [Participants.StreamingDetectIntent][], it needs to be configured in
    * [StreamingDetectIntentRequest.query_params][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.query_params].
-   * And for [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent] and
-   * [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent], it needs to be configured in
+   * And for
+   * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent]
+   * and
+   * [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent],
+   * it needs to be configured in
    * [ConversationProfile.human_agent_assistant_config][google.cloud.dialogflow.v2.ConversationProfile.human_agent_assistant_config]
    * </pre>
    *
@@ -334,10 +342,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (queryTextSentimentBuilder_ == null) {
-        queryTextSentiment_ = null;
-      } else {
-        queryTextSentiment_ = null;
+      bitField0_ = 0;
+      queryTextSentiment_ = null;
+      if (queryTextSentimentBuilder_ != null) {
+        queryTextSentimentBuilder_.dispose();
         queryTextSentimentBuilder_ = null;
       }
       return this;
@@ -367,15 +375,23 @@ public com.google.cloud.dialogflow.v2.SentimentAnalysisResult build() {
     public com.google.cloud.dialogflow.v2.SentimentAnalysisResult buildPartial() {
       com.google.cloud.dialogflow.v2.SentimentAnalysisResult result =
           new com.google.cloud.dialogflow.v2.SentimentAnalysisResult(this);
-      if (queryTextSentimentBuilder_ == null) {
-        result.queryTextSentiment_ = queryTextSentiment_;
-      } else {
-        result.queryTextSentiment_ = queryTextSentimentBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.SentimentAnalysisResult result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.queryTextSentiment_ =
+            queryTextSentimentBuilder_ == null
+                ? queryTextSentiment_
+                : queryTextSentimentBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -455,7 +471,7 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getQueryTextSentimentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -475,6 +491,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2.Sentiment queryTextSentiment_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.Sentiment,
@@ -493,7 +511,7 @@ public Builder mergeFrom(
      * @return Whether the queryTextSentiment field is set.
      */
     public boolean hasQueryTextSentiment() {
-      return queryTextSentimentBuilder_ != null || queryTextSentiment_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -530,11 +548,11 @@ public Builder setQueryTextSentiment(com.google.cloud.dialogflow.v2.Sentiment va
           throw new NullPointerException();
         }
         queryTextSentiment_ = value;
-        onChanged();
       } else {
         queryTextSentimentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -550,11 +568,11 @@ public Builder setQueryTextSentiment(
         com.google.cloud.dialogflow.v2.Sentiment.Builder builderForValue) {
       if (queryTextSentimentBuilder_ == null) {
         queryTextSentiment_ = builderForValue.build();
-        onChanged();
       } else {
         queryTextSentimentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -568,19 +586,19 @@ public Builder setQueryTextSentiment(
      */
     public Builder mergeQueryTextSentiment(com.google.cloud.dialogflow.v2.Sentiment value) {
       if (queryTextSentimentBuilder_ == null) {
-        if (queryTextSentiment_ != null) {
-          queryTextSentiment_ =
-              com.google.cloud.dialogflow.v2.Sentiment.newBuilder(queryTextSentiment_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && queryTextSentiment_ != null
+            && queryTextSentiment_
+                != com.google.cloud.dialogflow.v2.Sentiment.getDefaultInstance()) {
+          getQueryTextSentimentBuilder().mergeFrom(value);
         } else {
           queryTextSentiment_ = value;
         }
-        onChanged();
       } else {
         queryTextSentimentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -593,14 +611,13 @@ public Builder mergeQueryTextSentiment(com.google.cloud.dialogflow.v2.Sentiment
      * <code>.google.cloud.dialogflow.v2.Sentiment query_text_sentiment = 1;</code>
      */
     public Builder clearQueryTextSentiment() {
-      if (queryTextSentimentBuilder_ == null) {
-        queryTextSentiment_ = null;
-        onChanged();
-      } else {
-        queryTextSentiment_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      queryTextSentiment_ = null;
+      if (queryTextSentimentBuilder_ != null) {
+        queryTextSentimentBuilder_.dispose();
         queryTextSentimentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -613,7 +630,7 @@ public Builder clearQueryTextSentiment() {
      * <code>.google.cloud.dialogflow.v2.Sentiment query_text_sentiment = 1;</code>
      */
     public com.google.cloud.dialogflow.v2.Sentiment.Builder getQueryTextSentimentBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getQueryTextSentimentFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityType.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityType.java
index 07d729f6d96d..f4eb863a5e0b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityType.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityType.java
@@ -116,8 +116,9 @@ public enum EntityOverrideMode implements com.google.protobuf.ProtocolMessageEnu
      * `GetSessionEntityType`, `CreateSessionEntityType` and
      * `UpdateSessionEntityType` only return the additional entities added in
      * this session entity type. If you want to get the supplemented list,
-     * please call [EntityTypes.GetEntityType][google.cloud.dialogflow.v2.EntityTypes.GetEntityType] on the custom entity type
-     * and merge.
+     * please call
+     * [EntityTypes.GetEntityType][google.cloud.dialogflow.v2.EntityTypes.GetEntityType]
+     * on the custom entity type and merge.
      * </pre>
      *
      * <code>ENTITY_OVERRIDE_MODE_SUPPLEMENT = 2;</code>
@@ -157,8 +158,9 @@ public enum EntityOverrideMode implements com.google.protobuf.ProtocolMessageEnu
      * `GetSessionEntityType`, `CreateSessionEntityType` and
      * `UpdateSessionEntityType` only return the additional entities added in
      * this session entity type. If you want to get the supplemented list,
-     * please call [EntityTypes.GetEntityType][google.cloud.dialogflow.v2.EntityTypes.GetEntityType] on the custom entity type
-     * and merge.
+     * please call
+     * [EntityTypes.GetEntityType][google.cloud.dialogflow.v2.EntityTypes.GetEntityType]
+     * on the custom entity type and merge.
      * </pre>
      *
      * <code>ENTITY_OVERRIDE_MODE_SUPPLEMENT = 2;</code>
@@ -252,7 +254,9 @@ private EntityOverrideMode(int value) {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -317,7 +321,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int ENTITY_OVERRIDE_MODE_FIELD_NUMBER = 2;
-  private int entityOverrideMode_;
+  private int entityOverrideMode_ = 0;
   /**
    *
    *
@@ -353,9 +357,8 @@ public int getEntityOverrideModeValue() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.SessionEntityType.EntityOverrideMode
       getEntityOverrideMode() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.SessionEntityType.EntityOverrideMode result =
-        com.google.cloud.dialogflow.v2.SessionEntityType.EntityOverrideMode.valueOf(
+        com.google.cloud.dialogflow.v2.SessionEntityType.EntityOverrideMode.forNumber(
             entityOverrideMode_);
     return result == null
         ? com.google.cloud.dialogflow.v2.SessionEntityType.EntityOverrideMode.UNRECOGNIZED
@@ -363,6 +366,8 @@ public int getEntityOverrideModeValue() {
   }
 
   public static final int ENTITIES_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.EntityType.Entity> entities_;
   /**
    *
@@ -675,17 +680,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       entityOverrideMode_ = 0;
-
       if (entitiesBuilder_ == null) {
         entities_ = java.util.Collections.emptyList();
       } else {
         entities_ = null;
         entitiesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000004);
       return this;
     }
 
@@ -713,20 +717,35 @@ public com.google.cloud.dialogflow.v2.SessionEntityType build() {
     public com.google.cloud.dialogflow.v2.SessionEntityType buildPartial() {
       com.google.cloud.dialogflow.v2.SessionEntityType result =
           new com.google.cloud.dialogflow.v2.SessionEntityType(this);
-      int from_bitField0_ = bitField0_;
-      result.name_ = name_;
-      result.entityOverrideMode_ = entityOverrideMode_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.SessionEntityType result) {
       if (entitiesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000004) != 0)) {
           entities_ = java.util.Collections.unmodifiableList(entities_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.entities_ = entities_;
       } else {
         result.entities_ = entitiesBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.SessionEntityType result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.entityOverrideMode_ = entityOverrideMode_;
+      }
     }
 
     @java.lang.Override
@@ -777,6 +796,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.SessionEntityType other)
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.entityOverrideMode_ != 0) {
@@ -786,7 +806,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.SessionEntityType other)
         if (!other.entities_.isEmpty()) {
           if (entities_.isEmpty()) {
             entities_ = other.entities_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureEntitiesIsMutable();
             entities_.addAll(other.entities_);
@@ -799,7 +819,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.SessionEntityType other)
             entitiesBuilder_.dispose();
             entitiesBuilder_ = null;
             entities_ = other.entities_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
             entitiesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getEntitiesFieldBuilder()
@@ -838,13 +858,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 entityOverrideMode_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
@@ -965,8 +985,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -990,8 +1010,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1020,8 +1040,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1061,8 +1081,8 @@ public int getEntityOverrideModeValue() {
      * @return This builder for chaining.
      */
     public Builder setEntityOverrideModeValue(int value) {
-
       entityOverrideMode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1083,9 +1103,8 @@ public Builder setEntityOverrideModeValue(int value) {
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.SessionEntityType.EntityOverrideMode
         getEntityOverrideMode() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.SessionEntityType.EntityOverrideMode result =
-          com.google.cloud.dialogflow.v2.SessionEntityType.EntityOverrideMode.valueOf(
+          com.google.cloud.dialogflow.v2.SessionEntityType.EntityOverrideMode.forNumber(
               entityOverrideMode_);
       return result == null
           ? com.google.cloud.dialogflow.v2.SessionEntityType.EntityOverrideMode.UNRECOGNIZED
@@ -1111,7 +1130,7 @@ public Builder setEntityOverrideMode(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       entityOverrideMode_ = value.getNumber();
       onChanged();
       return this;
@@ -1131,7 +1150,7 @@ public Builder setEntityOverrideMode(
      * @return This builder for chaining.
      */
     public Builder clearEntityOverrideMode() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       entityOverrideMode_ = 0;
       onChanged();
       return this;
@@ -1141,10 +1160,10 @@ public Builder clearEntityOverrideMode() {
         java.util.Collections.emptyList();
 
     private void ensureEntitiesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         entities_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.EntityType.Entity>(entities_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000004;
       }
     }
 
@@ -1393,7 +1412,7 @@ public Builder addAllEntities(
     public Builder clearEntities() {
       if (entitiesBuilder_ == null) {
         entities_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
       } else {
         entitiesBuilder_.clear();
@@ -1537,7 +1556,7 @@ public com.google.cloud.dialogflow.v2.EntityType.Entity.Builder addEntitiesBuild
                 com.google.cloud.dialogflow.v2.EntityType.Entity,
                 com.google.cloud.dialogflow.v2.EntityType.Entity.Builder,
                 com.google.cloud.dialogflow.v2.EntityType.EntityOrBuilder>(
-                entities_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                entities_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
         entities_ = null;
       }
       return entitiesBuilder_;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypeProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypeProto.java
index f1f3b9b1d79b..868638220494 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypeProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypeProto.java
@@ -179,11 +179,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "ntityTypes/*}\332A\004name\032x\312A\031dialogflow.goog"
           + "leapis.com\322AYhttps://www.googleapis.com/"
           + "auth/cloud-platform,https://www.googleap"
-          + "is.com/auth/dialogflowB\245\001\n\036com.google.cl"
+          + "is.com/auth/dialogflowB\237\001\n\036com.google.cl"
           + "oud.dialogflow.v2B\026SessionEntityTypeProt"
-          + "oP\001ZDgoogle.golang.org/genproto/googleap"
-          + "is/cloud/dialogflow/v2;dialogflow\370\001\001\242\002\002D"
-          + "F\252\002\032Google.Cloud.Dialogflow.V2b\006proto3"
+          + "oP\001Z>cloud.google.com/go/dialogflow/apiv"
+          + "2/dialogflowpb;dialogflowpb\370\001\001\242\002\002DF\252\002\032Go"
+          + "ogle.Cloud.Dialogflow.V2b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionProto.java
index e75cf152cfee..f2c6b979e510 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionProto.java
@@ -213,20 +213,20 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "tectIntentResponse\"\000(\0010\001\032x\312A\031dialogflow."
           + "googleapis.com\322AYhttps://www.googleapis."
           + "com/auth/cloud-platform,https://www.goog"
-          + "leapis.com/auth/dialogflowB\360\003\n\036com.googl"
-          + "e.cloud.dialogflow.v2B\014SessionProtoP\001ZDg"
-          + "oogle.golang.org/genproto/googleapis/clo"
-          + "ud/dialogflow/v2;dialogflow\370\001\001\242\002\002DF\252\002\032Go"
-          + "ogle.Cloud.Dialogflow.V2\352A\321\002\n!dialogflow"
-          + ".googleapis.com/Session\022+projects/{proje"
-          + "ct}/agent/sessions/{session}\022Sprojects/{"
-          + "project}/agent/environments/{environment"
-          + "}/users/{user}/sessions/{session}\022@proje"
-          + "cts/{project}/locations/{location}/agent"
-          + "/sessions/{session}\022hprojects/{project}/"
-          + "locations/{location}/agent/environments/"
-          + "{environment}/users/{user}/sessions/{ses"
-          + "sion}b\006proto3"
+          + "leapis.com/auth/dialogflowB\352\003\n\036com.googl"
+          + "e.cloud.dialogflow.v2B\014SessionProtoP\001Z>c"
+          + "loud.google.com/go/dialogflow/apiv2/dial"
+          + "ogflowpb;dialogflowpb\370\001\001\242\002\002DF\252\002\032Google.C"
+          + "loud.Dialogflow.V2\352A\321\002\n!dialogflow.googl"
+          + "eapis.com/Session\022+projects/{project}/ag"
+          + "ent/sessions/{session}\022Sprojects/{projec"
+          + "t}/agent/environments/{environment}/user"
+          + "s/{user}/sessions/{session}\022@projects/{p"
+          + "roject}/locations/{location}/agent/sessi"
+          + "ons/{session}\022hprojects/{project}/locati"
+          + "ons/{location}/agent/environments/{envir"
+          + "onment}/users/{user}/sessions/{session}b"
+          + "\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SetAgentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SetAgentRequest.java
index 5ba0bae1fe67..bd9ababde533 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SetAgentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SetAgentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Agents.SetAgent][google.cloud.dialogflow.v2.Agents.SetAgent].
+ * The request message for
+ * [Agents.SetAgent][google.cloud.dialogflow.v2.Agents.SetAgent].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.SetAgentRequest}
@@ -111,7 +112,7 @@ public com.google.cloud.dialogflow.v2.Agent getAgent() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.AgentOrBuilder getAgentOrBuilder() {
-    return getAgent();
+    return agent_ == null ? com.google.cloud.dialogflow.v2.Agent.getDefaultInstance() : agent_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -160,7 +161,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -345,7 +346,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Agents.SetAgent][google.cloud.dialogflow.v2.Agents.SetAgent].
+   * The request message for
+   * [Agents.SetAgent][google.cloud.dialogflow.v2.Agents.SetAgent].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.SetAgentRequest}
@@ -379,16 +381,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (agentBuilder_ == null) {
-        agent_ = null;
-      } else {
-        agent_ = null;
+      bitField0_ = 0;
+      agent_ = null;
+      if (agentBuilder_ != null) {
+        agentBuilder_.dispose();
         agentBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -418,20 +419,23 @@ public com.google.cloud.dialogflow.v2.SetAgentRequest build() {
     public com.google.cloud.dialogflow.v2.SetAgentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.SetAgentRequest result =
           new com.google.cloud.dialogflow.v2.SetAgentRequest(this);
-      if (agentBuilder_ == null) {
-        result.agent_ = agent_;
-      } else {
-        result.agent_ = agentBuilder_.build();
-      }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.SetAgentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.agent_ = agentBuilder_ == null ? agent_ : agentBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -512,13 +516,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getAgentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -538,6 +542,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2.Agent agent_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.Agent,
@@ -557,7 +563,7 @@ public Builder mergeFrom(
      * @return Whether the agent field is set.
      */
     public boolean hasAgent() {
-      return agentBuilder_ != null || agent_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -594,11 +600,11 @@ public Builder setAgent(com.google.cloud.dialogflow.v2.Agent value) {
           throw new NullPointerException();
         }
         agent_ = value;
-        onChanged();
       } else {
         agentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -614,11 +620,11 @@ public Builder setAgent(com.google.cloud.dialogflow.v2.Agent value) {
     public Builder setAgent(com.google.cloud.dialogflow.v2.Agent.Builder builderForValue) {
       if (agentBuilder_ == null) {
         agent_ = builderForValue.build();
-        onChanged();
       } else {
         agentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -633,19 +639,18 @@ public Builder setAgent(com.google.cloud.dialogflow.v2.Agent.Builder builderForV
      */
     public Builder mergeAgent(com.google.cloud.dialogflow.v2.Agent value) {
       if (agentBuilder_ == null) {
-        if (agent_ != null) {
-          agent_ =
-              com.google.cloud.dialogflow.v2.Agent.newBuilder(agent_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && agent_ != null
+            && agent_ != com.google.cloud.dialogflow.v2.Agent.getDefaultInstance()) {
+          getAgentBuilder().mergeFrom(value);
         } else {
           agent_ = value;
         }
-        onChanged();
       } else {
         agentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -659,14 +664,13 @@ public Builder mergeAgent(com.google.cloud.dialogflow.v2.Agent value) {
      * </code>
      */
     public Builder clearAgent() {
-      if (agentBuilder_ == null) {
-        agent_ = null;
-        onChanged();
-      } else {
-        agent_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      agent_ = null;
+      if (agentBuilder_ != null) {
+        agentBuilder_.dispose();
         agentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -680,7 +684,7 @@ public Builder clearAgent() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.Agent.Builder getAgentBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getAgentFieldBuilder().getBuilder();
     }
@@ -747,7 +751,7 @@ public com.google.cloud.dialogflow.v2.AgentOrBuilder getAgentOrBuilder() {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -786,11 +790,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -806,11 +810,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -825,17 +829,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -849,14 +854,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -870,7 +874,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SetSuggestionFeatureConfigOperationMetadata.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SetSuggestionFeatureConfigOperationMetadata.java
index c8405fd19e53..a8b6401b604e 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SetSuggestionFeatureConfigOperationMetadata.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SetSuggestionFeatureConfigOperationMetadata.java
@@ -74,7 +74,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_PROFILE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object conversationProfile_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversationProfile_ = "";
   /**
    *
    *
@@ -127,7 +129,7 @@ public com.google.protobuf.ByteString getConversationProfileBytes() {
   }
 
   public static final int PARTICIPANT_ROLE_FIELD_NUMBER = 2;
-  private int participantRole_;
+  private int participantRole_ = 0;
   /**
    *
    *
@@ -162,14 +164,13 @@ public int getParticipantRoleValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.Participant.Role getParticipantRole() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.Participant.Role result =
-        com.google.cloud.dialogflow.v2.Participant.Role.valueOf(participantRole_);
+        com.google.cloud.dialogflow.v2.Participant.Role.forNumber(participantRole_);
     return result == null ? com.google.cloud.dialogflow.v2.Participant.Role.UNRECOGNIZED : result;
   }
 
   public static final int SUGGESTION_FEATURE_TYPE_FIELD_NUMBER = 3;
-  private int suggestionFeatureType_;
+  private int suggestionFeatureType_ = 0;
   /**
    *
    *
@@ -202,9 +203,8 @@ public int getSuggestionFeatureTypeValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.SuggestionFeature.Type getSuggestionFeatureType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.SuggestionFeature.Type result =
-        com.google.cloud.dialogflow.v2.SuggestionFeature.Type.valueOf(suggestionFeatureType_);
+        com.google.cloud.dialogflow.v2.SuggestionFeature.Type.forNumber(suggestionFeatureType_);
     return result == null
         ? com.google.cloud.dialogflow.v2.SuggestionFeature.Type.UNRECOGNIZED
         : result;
@@ -253,7 +253,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -500,16 +500,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       conversationProfile_ = "";
-
       participantRole_ = 0;
-
       suggestionFeatureType_ = 0;
-
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
       return this;
@@ -543,18 +540,30 @@ public com.google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadat
         buildPartial() {
       com.google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadata result =
           new com.google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadata(this);
-      result.conversationProfile_ = conversationProfile_;
-      result.participantRole_ = participantRole_;
-      result.suggestionFeatureType_ = suggestionFeatureType_;
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversationProfile_ = conversationProfile_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.participantRole_ = participantRole_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.suggestionFeatureType_ = suggestionFeatureType_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -607,6 +616,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getConversationProfile().isEmpty()) {
         conversationProfile_ = other.conversationProfile_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.participantRole_ != 0) {
@@ -647,25 +657,25 @@ public Builder mergeFrom(
             case 10:
               {
                 conversationProfile_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 participantRole_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 24:
               {
                 suggestionFeatureType_ = input.readEnum();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 34:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -685,6 +695,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object conversationProfile_ = "";
     /**
      *
@@ -752,8 +764,8 @@ public Builder setConversationProfile(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversationProfile_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -771,8 +783,8 @@ public Builder setConversationProfile(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationProfile() {
-
       conversationProfile_ = getDefaultInstance().getConversationProfile();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -795,8 +807,8 @@ public Builder setConversationProfileBytes(com.google.protobuf.ByteString value)
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversationProfile_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -836,8 +848,8 @@ public int getParticipantRoleValue() {
      * @return This builder for chaining.
      */
     public Builder setParticipantRoleValue(int value) {
-
       participantRole_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -857,9 +869,8 @@ public Builder setParticipantRoleValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.Participant.Role getParticipantRole() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.Participant.Role result =
-          com.google.cloud.dialogflow.v2.Participant.Role.valueOf(participantRole_);
+          com.google.cloud.dialogflow.v2.Participant.Role.forNumber(participantRole_);
       return result == null ? com.google.cloud.dialogflow.v2.Participant.Role.UNRECOGNIZED : result;
     }
     /**
@@ -881,7 +892,7 @@ public Builder setParticipantRole(com.google.cloud.dialogflow.v2.Participant.Rol
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       participantRole_ = value.getNumber();
       onChanged();
       return this;
@@ -901,7 +912,7 @@ public Builder setParticipantRole(com.google.cloud.dialogflow.v2.Participant.Rol
      * @return This builder for chaining.
      */
     public Builder clearParticipantRole() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       participantRole_ = 0;
       onChanged();
       return this;
@@ -940,8 +951,8 @@ public int getSuggestionFeatureTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setSuggestionFeatureTypeValue(int value) {
-
       suggestionFeatureType_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -960,9 +971,8 @@ public Builder setSuggestionFeatureTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.SuggestionFeature.Type getSuggestionFeatureType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.SuggestionFeature.Type result =
-          com.google.cloud.dialogflow.v2.SuggestionFeature.Type.valueOf(suggestionFeatureType_);
+          com.google.cloud.dialogflow.v2.SuggestionFeature.Type.forNumber(suggestionFeatureType_);
       return result == null
           ? com.google.cloud.dialogflow.v2.SuggestionFeature.Type.UNRECOGNIZED
           : result;
@@ -986,7 +996,7 @@ public Builder setSuggestionFeatureType(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000004;
       suggestionFeatureType_ = value.getNumber();
       onChanged();
       return this;
@@ -1005,7 +1015,7 @@ public Builder setSuggestionFeatureType(
      * @return This builder for chaining.
      */
     public Builder clearSuggestionFeatureType() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       suggestionFeatureType_ = 0;
       onChanged();
       return this;
@@ -1029,7 +1039,7 @@ public Builder clearSuggestionFeatureType() {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1066,11 +1076,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1085,11 +1095,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1103,17 +1113,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
         } else {
           createTime_ = value;
         }
-        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1126,14 +1137,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * <code>.google.protobuf.Timestamp create_time = 4;</code>
      */
     public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1146,7 +1156,7 @@ public Builder clearCreateTime() {
      * <code>.google.protobuf.Timestamp create_time = 4;</code>
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SetSuggestionFeatureConfigRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SetSuggestionFeatureConfigRequest.java
index 53135f995629..1f55948125d0 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SetSuggestionFeatureConfigRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SetSuggestionFeatureConfigRequest.java
@@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_PROFILE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object conversationProfile_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversationProfile_ = "";
   /**
    *
    *
@@ -124,7 +126,7 @@ public com.google.protobuf.ByteString getConversationProfileBytes() {
   }
 
   public static final int PARTICIPANT_ROLE_FIELD_NUMBER = 2;
-  private int participantRole_;
+  private int participantRole_ = 0;
   /**
    *
    *
@@ -159,9 +161,8 @@ public int getParticipantRoleValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.Participant.Role getParticipantRole() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.Participant.Role result =
-        com.google.cloud.dialogflow.v2.Participant.Role.valueOf(participantRole_);
+        com.google.cloud.dialogflow.v2.Participant.Role.forNumber(participantRole_);
     return result == null ? com.google.cloud.dialogflow.v2.Participant.Role.UNRECOGNIZED : result;
   }
 
@@ -220,7 +221,10 @@ public boolean hasSuggestionFeatureConfig() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionFeatureConfigOrBuilder
       getSuggestionFeatureConfigOrBuilder() {
-    return getSuggestionFeatureConfig();
+    return suggestionFeatureConfig_ == null
+        ? com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionFeatureConfig
+            .getDefaultInstance()
+        : suggestionFeatureConfig_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -448,14 +452,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       conversationProfile_ = "";
-
       participantRole_ = 0;
-
-      if (suggestionFeatureConfigBuilder_ == null) {
-        suggestionFeatureConfig_ = null;
-      } else {
-        suggestionFeatureConfig_ = null;
+      suggestionFeatureConfig_ = null;
+      if (suggestionFeatureConfigBuilder_ != null) {
+        suggestionFeatureConfigBuilder_.dispose();
         suggestionFeatureConfigBuilder_ = null;
       }
       return this;
@@ -486,17 +488,30 @@ public com.google.cloud.dialogflow.v2.SetSuggestionFeatureConfigRequest build()
     public com.google.cloud.dialogflow.v2.SetSuggestionFeatureConfigRequest buildPartial() {
       com.google.cloud.dialogflow.v2.SetSuggestionFeatureConfigRequest result =
           new com.google.cloud.dialogflow.v2.SetSuggestionFeatureConfigRequest(this);
-      result.conversationProfile_ = conversationProfile_;
-      result.participantRole_ = participantRole_;
-      if (suggestionFeatureConfigBuilder_ == null) {
-        result.suggestionFeatureConfig_ = suggestionFeatureConfig_;
-      } else {
-        result.suggestionFeatureConfig_ = suggestionFeatureConfigBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.SetSuggestionFeatureConfigRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversationProfile_ = conversationProfile_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.participantRole_ = participantRole_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.suggestionFeatureConfig_ =
+            suggestionFeatureConfigBuilder_ == null
+                ? suggestionFeatureConfig_
+                : suggestionFeatureConfigBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -547,6 +562,7 @@ public Builder mergeFrom(
         return this;
       if (!other.getConversationProfile().isEmpty()) {
         conversationProfile_ = other.conversationProfile_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.participantRole_ != 0) {
@@ -584,20 +600,20 @@ public Builder mergeFrom(
             case 10:
               {
                 conversationProfile_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 participantRole_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 input.readMessage(
                     getSuggestionFeatureConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -617,6 +633,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object conversationProfile_ = "";
     /**
      *
@@ -684,8 +702,8 @@ public Builder setConversationProfile(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversationProfile_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -703,8 +721,8 @@ public Builder setConversationProfile(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationProfile() {
-
       conversationProfile_ = getDefaultInstance().getConversationProfile();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -727,8 +745,8 @@ public Builder setConversationProfileBytes(com.google.protobuf.ByteString value)
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversationProfile_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -768,8 +786,8 @@ public int getParticipantRoleValue() {
      * @return This builder for chaining.
      */
     public Builder setParticipantRoleValue(int value) {
-
       participantRole_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -789,9 +807,8 @@ public Builder setParticipantRoleValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.Participant.Role getParticipantRole() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.Participant.Role result =
-          com.google.cloud.dialogflow.v2.Participant.Role.valueOf(participantRole_);
+          com.google.cloud.dialogflow.v2.Participant.Role.forNumber(participantRole_);
       return result == null ? com.google.cloud.dialogflow.v2.Participant.Role.UNRECOGNIZED : result;
     }
     /**
@@ -813,7 +830,7 @@ public Builder setParticipantRole(com.google.cloud.dialogflow.v2.Participant.Rol
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       participantRole_ = value.getNumber();
       onChanged();
       return this;
@@ -833,7 +850,7 @@ public Builder setParticipantRole(com.google.cloud.dialogflow.v2.Participant.Rol
      * @return This builder for chaining.
      */
     public Builder clearParticipantRole() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       participantRole_ = 0;
       onChanged();
       return this;
@@ -862,7 +879,7 @@ public Builder clearParticipantRole() {
      * @return Whether the suggestionFeatureConfig field is set.
      */
     public boolean hasSuggestionFeatureConfig() {
-      return suggestionFeatureConfigBuilder_ != null || suggestionFeatureConfig_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -906,11 +923,11 @@ public Builder setSuggestionFeatureConfig(
           throw new NullPointerException();
         }
         suggestionFeatureConfig_ = value;
-        onChanged();
       } else {
         suggestionFeatureConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -929,11 +946,11 @@ public Builder setSuggestionFeatureConfig(
             builderForValue) {
       if (suggestionFeatureConfigBuilder_ == null) {
         suggestionFeatureConfig_ = builderForValue.build();
-        onChanged();
       } else {
         suggestionFeatureConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -950,20 +967,20 @@ public Builder setSuggestionFeatureConfig(
     public Builder mergeSuggestionFeatureConfig(
         com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionFeatureConfig value) {
       if (suggestionFeatureConfigBuilder_ == null) {
-        if (suggestionFeatureConfig_ != null) {
-          suggestionFeatureConfig_ =
-              com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionFeatureConfig
-                  .newBuilder(suggestionFeatureConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && suggestionFeatureConfig_ != null
+            && suggestionFeatureConfig_
+                != com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionFeatureConfig
+                    .getDefaultInstance()) {
+          getSuggestionFeatureConfigBuilder().mergeFrom(value);
         } else {
           suggestionFeatureConfig_ = value;
         }
-        onChanged();
       } else {
         suggestionFeatureConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -978,14 +995,13 @@ public Builder mergeSuggestionFeatureConfig(
      * </code>
      */
     public Builder clearSuggestionFeatureConfig() {
-      if (suggestionFeatureConfigBuilder_ == null) {
-        suggestionFeatureConfig_ = null;
-        onChanged();
-      } else {
-        suggestionFeatureConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      suggestionFeatureConfig_ = null;
+      if (suggestionFeatureConfigBuilder_ != null) {
+        suggestionFeatureConfigBuilder_.dispose();
         suggestionFeatureConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1001,7 +1017,7 @@ public Builder clearSuggestionFeatureConfig() {
      */
     public com.google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionFeatureConfig.Builder
         getSuggestionFeatureConfigBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getSuggestionFeatureConfigFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SmartReplyAnswer.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SmartReplyAnswer.java
index a64a08b25930..14791fa7bc9f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SmartReplyAnswer.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SmartReplyAnswer.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int REPLY_FIELD_NUMBER = 1;
-  private volatile java.lang.Object reply_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object reply_ = "";
   /**
    *
    *
@@ -118,7 +120,7 @@ public com.google.protobuf.ByteString getReplyBytes() {
   }
 
   public static final int CONFIDENCE_FIELD_NUMBER = 2;
-  private float confidence_;
+  private float confidence_ = 0F;
   /**
    *
    *
@@ -139,7 +141,9 @@ public float getConfidence() {
   }
 
   public static final int ANSWER_RECORD_FIELD_NUMBER = 3;
-  private volatile java.lang.Object answerRecord_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object answerRecord_ = "";
   /**
    *
    *
@@ -407,12 +411,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       reply_ = "";
-
       confidence_ = 0F;
-
       answerRecord_ = "";
-
       return this;
     }
 
@@ -440,13 +442,26 @@ public com.google.cloud.dialogflow.v2.SmartReplyAnswer build() {
     public com.google.cloud.dialogflow.v2.SmartReplyAnswer buildPartial() {
       com.google.cloud.dialogflow.v2.SmartReplyAnswer result =
           new com.google.cloud.dialogflow.v2.SmartReplyAnswer(this);
-      result.reply_ = reply_;
-      result.confidence_ = confidence_;
-      result.answerRecord_ = answerRecord_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.SmartReplyAnswer result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.reply_ = reply_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.confidence_ = confidence_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.answerRecord_ = answerRecord_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -495,6 +510,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.SmartReplyAnswer other)
         return this;
       if (!other.getReply().isEmpty()) {
         reply_ = other.reply_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getConfidence() != 0F) {
@@ -502,6 +518,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.SmartReplyAnswer other)
       }
       if (!other.getAnswerRecord().isEmpty()) {
         answerRecord_ = other.answerRecord_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -533,19 +550,19 @@ public Builder mergeFrom(
             case 10:
               {
                 reply_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 21:
               {
                 confidence_ = input.readFloat();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 21
             case 26:
               {
                 answerRecord_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -565,6 +582,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object reply_ = "";
     /**
      *
@@ -626,8 +645,8 @@ public Builder setReply(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       reply_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -643,8 +662,8 @@ public Builder setReply(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearReply() {
-
       reply_ = getDefaultInstance().getReply();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -665,8 +684,8 @@ public Builder setReplyBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       reply_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -708,6 +727,7 @@ public float getConfidence() {
     public Builder setConfidence(float value) {
 
       confidence_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -726,7 +746,7 @@ public Builder setConfidence(float value) {
      * @return This builder for chaining.
      */
     public Builder clearConfidence() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       confidence_ = 0F;
       onChanged();
       return this;
@@ -799,8 +819,8 @@ public Builder setAnswerRecord(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       answerRecord_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -818,8 +838,8 @@ public Builder setAnswerRecord(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAnswerRecord() {
-
       answerRecord_ = getDefaultInstance().getAnswerRecord();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -842,8 +862,8 @@ public Builder setAnswerRecordBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       answerRecord_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SmartReplyMetrics.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SmartReplyMetrics.java
index fe3c9d3cccd8..3e0373284ee9 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SmartReplyMetrics.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SmartReplyMetrics.java
@@ -151,7 +151,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int N_FIELD_NUMBER = 1;
-    private int n_;
+    private int n_ = 0;
     /**
      *
      *
@@ -171,7 +171,7 @@ public int getN() {
     }
 
     public static final int RECALL_FIELD_NUMBER = 2;
-    private float recall_;
+    private float recall_ = 0F;
     /**
      *
      *
@@ -401,10 +401,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         n_ = 0;
-
         recall_ = 0F;
-
         return this;
       }
 
@@ -433,12 +432,24 @@ public com.google.cloud.dialogflow.v2.SmartReplyMetrics.TopNMetrics build() {
       public com.google.cloud.dialogflow.v2.SmartReplyMetrics.TopNMetrics buildPartial() {
         com.google.cloud.dialogflow.v2.SmartReplyMetrics.TopNMetrics result =
             new com.google.cloud.dialogflow.v2.SmartReplyMetrics.TopNMetrics(this);
-        result.n_ = n_;
-        result.recall_ = recall_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2.SmartReplyMetrics.TopNMetrics result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.n_ = n_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.recall_ = recall_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -523,13 +534,13 @@ public Builder mergeFrom(
               case 8:
                 {
                   n_ = input.readInt32();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 8
               case 21:
                 {
                   recall_ = input.readFloat();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 21
               default:
@@ -549,6 +560,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private int n_;
       /**
        *
@@ -584,6 +597,7 @@ public int getN() {
       public Builder setN(int value) {
 
         n_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -601,7 +615,7 @@ public Builder setN(int value) {
        * @return This builder for chaining.
        */
       public Builder clearN() {
-
+        bitField0_ = (bitField0_ & ~0x00000001);
         n_ = 0;
         onChanged();
         return this;
@@ -644,6 +658,7 @@ public float getRecall() {
       public Builder setRecall(float value) {
 
         recall_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -662,7 +677,7 @@ public Builder setRecall(float value) {
        * @return This builder for chaining.
        */
       public Builder clearRecall() {
-
+        bitField0_ = (bitField0_ & ~0x00000002);
         recall_ = 0F;
         onChanged();
         return this;
@@ -736,7 +751,7 @@ public com.google.protobuf.Parser<TopNMetrics> getParserForType() {
   }
 
   public static final int ALLOWLIST_COVERAGE_FIELD_NUMBER = 1;
-  private float allowlistCoverage_;
+  private float allowlistCoverage_ = 0F;
   /**
    *
    *
@@ -756,6 +771,8 @@ public float getAllowlistCoverage() {
   }
 
   public static final int TOP_N_METRICS_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.SmartReplyMetrics.TopNMetrics> topNMetrics_;
   /**
    *
@@ -833,7 +850,7 @@ public com.google.cloud.dialogflow.v2.SmartReplyMetrics.TopNMetrics getTopNMetri
   }
 
   public static final int CONVERSATION_COUNT_FIELD_NUMBER = 3;
-  private long conversationCount_;
+  private long conversationCount_ = 0L;
   /**
    *
    *
@@ -1068,17 +1085,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       allowlistCoverage_ = 0F;
-
       if (topNMetricsBuilder_ == null) {
         topNMetrics_ = java.util.Collections.emptyList();
       } else {
         topNMetrics_ = null;
         topNMetricsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       conversationCount_ = 0L;
-
       return this;
     }
 
@@ -1106,20 +1122,35 @@ public com.google.cloud.dialogflow.v2.SmartReplyMetrics build() {
     public com.google.cloud.dialogflow.v2.SmartReplyMetrics buildPartial() {
       com.google.cloud.dialogflow.v2.SmartReplyMetrics result =
           new com.google.cloud.dialogflow.v2.SmartReplyMetrics(this);
-      int from_bitField0_ = bitField0_;
-      result.allowlistCoverage_ = allowlistCoverage_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.SmartReplyMetrics result) {
       if (topNMetricsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           topNMetrics_ = java.util.Collections.unmodifiableList(topNMetrics_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.topNMetrics_ = topNMetrics_;
       } else {
         result.topNMetrics_ = topNMetricsBuilder_.build();
       }
-      result.conversationCount_ = conversationCount_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.SmartReplyMetrics result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.allowlistCoverage_ = allowlistCoverage_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.conversationCount_ = conversationCount_;
+      }
     }
 
     @java.lang.Override
@@ -1175,7 +1206,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.SmartReplyMetrics other)
         if (!other.topNMetrics_.isEmpty()) {
           if (topNMetrics_.isEmpty()) {
             topNMetrics_ = other.topNMetrics_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureTopNMetricsIsMutable();
             topNMetrics_.addAll(other.topNMetrics_);
@@ -1188,7 +1219,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.SmartReplyMetrics other)
             topNMetricsBuilder_.dispose();
             topNMetricsBuilder_ = null;
             topNMetrics_ = other.topNMetrics_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             topNMetricsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getTopNMetricsFieldBuilder()
@@ -1230,7 +1261,7 @@ public Builder mergeFrom(
             case 13:
               {
                 allowlistCoverage_ = input.readFloat();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 13
             case 18:
@@ -1250,7 +1281,7 @@ public Builder mergeFrom(
             case 24:
               {
                 conversationCount_ = input.readInt64();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             default:
@@ -1307,6 +1338,7 @@ public float getAllowlistCoverage() {
     public Builder setAllowlistCoverage(float value) {
 
       allowlistCoverage_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1324,7 +1356,7 @@ public Builder setAllowlistCoverage(float value) {
      * @return This builder for chaining.
      */
     public Builder clearAllowlistCoverage() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       allowlistCoverage_ = 0F;
       onChanged();
       return this;
@@ -1334,11 +1366,11 @@ public Builder clearAllowlistCoverage() {
         topNMetrics_ = java.util.Collections.emptyList();
 
     private void ensureTopNMetricsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         topNMetrics_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.SmartReplyMetrics.TopNMetrics>(
                 topNMetrics_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -1572,7 +1604,7 @@ public Builder addAllTopNMetrics(
     public Builder clearTopNMetrics() {
       if (topNMetricsBuilder_ == null) {
         topNMetrics_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         topNMetricsBuilder_.clear();
@@ -1709,7 +1741,7 @@ public Builder removeTopNMetrics(int index) {
                 com.google.cloud.dialogflow.v2.SmartReplyMetrics.TopNMetrics,
                 com.google.cloud.dialogflow.v2.SmartReplyMetrics.TopNMetrics.Builder,
                 com.google.cloud.dialogflow.v2.SmartReplyMetrics.TopNMetricsOrBuilder>(
-                topNMetrics_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                topNMetrics_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         topNMetrics_ = null;
       }
       return topNMetricsBuilder_;
@@ -1746,6 +1778,7 @@ public long getConversationCount() {
     public Builder setConversationCount(long value) {
 
       conversationCount_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1761,7 +1794,7 @@ public Builder setConversationCount(long value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationCount() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       conversationCount_ = 0L;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SmartReplyModelMetadata.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SmartReplyModelMetadata.java
index c71c2d34535e..69987262db50 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SmartReplyModelMetadata.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SmartReplyModelMetadata.java
@@ -68,12 +68,13 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int TRAINING_MODEL_TYPE_FIELD_NUMBER = 6;
-  private int trainingModelType_;
+  private int trainingModelType_ = 0;
   /**
    *
    *
    * <pre>
-   * Optional. Type of the smart reply model. If not provided, model_type is used.
+   * Optional. Type of the smart reply model. If not provided, model_type is
+   * used.
    * </pre>
    *
    * <code>
@@ -90,7 +91,8 @@ public int getTrainingModelTypeValue() {
    *
    *
    * <pre>
-   * Optional. Type of the smart reply model. If not provided, model_type is used.
+   * Optional. Type of the smart reply model. If not provided, model_type is
+   * used.
    * </pre>
    *
    * <code>
@@ -101,9 +103,8 @@ public int getTrainingModelTypeValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.ConversationModel.ModelType getTrainingModelType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.ConversationModel.ModelType result =
-        com.google.cloud.dialogflow.v2.ConversationModel.ModelType.valueOf(trainingModelType_);
+        com.google.cloud.dialogflow.v2.ConversationModel.ModelType.forNumber(trainingModelType_);
     return result == null
         ? com.google.cloud.dialogflow.v2.ConversationModel.ModelType.UNRECOGNIZED
         : result;
@@ -311,8 +312,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       trainingModelType_ = 0;
-
       return this;
     }
 
@@ -340,11 +341,20 @@ public com.google.cloud.dialogflow.v2.SmartReplyModelMetadata build() {
     public com.google.cloud.dialogflow.v2.SmartReplyModelMetadata buildPartial() {
       com.google.cloud.dialogflow.v2.SmartReplyModelMetadata result =
           new com.google.cloud.dialogflow.v2.SmartReplyModelMetadata(this);
-      result.trainingModelType_ = trainingModelType_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.SmartReplyModelMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.trainingModelType_ = trainingModelType_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -423,7 +433,7 @@ public Builder mergeFrom(
             case 48:
               {
                 trainingModelType_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 48
             default:
@@ -443,12 +453,15 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private int trainingModelType_ = 0;
     /**
      *
      *
      * <pre>
-     * Optional. Type of the smart reply model. If not provided, model_type is used.
+     * Optional. Type of the smart reply model. If not provided, model_type is
+     * used.
      * </pre>
      *
      * <code>
@@ -465,7 +478,8 @@ public int getTrainingModelTypeValue() {
      *
      *
      * <pre>
-     * Optional. Type of the smart reply model. If not provided, model_type is used.
+     * Optional. Type of the smart reply model. If not provided, model_type is
+     * used.
      * </pre>
      *
      * <code>
@@ -476,8 +490,8 @@ public int getTrainingModelTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setTrainingModelTypeValue(int value) {
-
       trainingModelType_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -485,7 +499,8 @@ public Builder setTrainingModelTypeValue(int value) {
      *
      *
      * <pre>
-     * Optional. Type of the smart reply model. If not provided, model_type is used.
+     * Optional. Type of the smart reply model. If not provided, model_type is
+     * used.
      * </pre>
      *
      * <code>
@@ -496,9 +511,8 @@ public Builder setTrainingModelTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.ConversationModel.ModelType getTrainingModelType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.ConversationModel.ModelType result =
-          com.google.cloud.dialogflow.v2.ConversationModel.ModelType.valueOf(trainingModelType_);
+          com.google.cloud.dialogflow.v2.ConversationModel.ModelType.forNumber(trainingModelType_);
       return result == null
           ? com.google.cloud.dialogflow.v2.ConversationModel.ModelType.UNRECOGNIZED
           : result;
@@ -507,7 +521,8 @@ public com.google.cloud.dialogflow.v2.ConversationModel.ModelType getTrainingMod
      *
      *
      * <pre>
-     * Optional. Type of the smart reply model. If not provided, model_type is used.
+     * Optional. Type of the smart reply model. If not provided, model_type is
+     * used.
      * </pre>
      *
      * <code>
@@ -522,7 +537,7 @@ public Builder setTrainingModelType(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       trainingModelType_ = value.getNumber();
       onChanged();
       return this;
@@ -531,7 +546,8 @@ public Builder setTrainingModelType(
      *
      *
      * <pre>
-     * Optional. Type of the smart reply model. If not provided, model_type is used.
+     * Optional. Type of the smart reply model. If not provided, model_type is
+     * used.
      * </pre>
      *
      * <code>
@@ -541,7 +557,7 @@ public Builder setTrainingModelType(
      * @return This builder for chaining.
      */
     public Builder clearTrainingModelType() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       trainingModelType_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SmartReplyModelMetadataOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SmartReplyModelMetadataOrBuilder.java
index ae60480c026b..baf504121eb9 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SmartReplyModelMetadataOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SmartReplyModelMetadataOrBuilder.java
@@ -27,7 +27,8 @@ public interface SmartReplyModelMetadataOrBuilder
    *
    *
    * <pre>
-   * Optional. Type of the smart reply model. If not provided, model_type is used.
+   * Optional. Type of the smart reply model. If not provided, model_type is
+   * used.
    * </pre>
    *
    * <code>
@@ -41,7 +42,8 @@ public interface SmartReplyModelMetadataOrBuilder
    *
    *
    * <pre>
-   * Optional. Type of the smart reply model. If not provided, model_type is used.
+   * Optional. Type of the smart reply model. If not provided, model_type is
+   * used.
    * </pre>
    *
    * <code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SpeechContext.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SpeechContext.java
index 0b176506b6ae..ba0e2b0649e7 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SpeechContext.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SpeechContext.java
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PHRASES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList phrases_;
   /**
    *
@@ -166,7 +168,7 @@ public com.google.protobuf.ByteString getPhrasesBytes(int index) {
   }
 
   public static final int BOOST_FIELD_NUMBER = 2;
-  private float boost_;
+  private float boost_ = 0F;
   /**
    *
    *
@@ -404,10 +406,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       phrases_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000001);
       boost_ = 0F;
-
       return this;
     }
 
@@ -435,15 +437,27 @@ public com.google.cloud.dialogflow.v2.SpeechContext build() {
     public com.google.cloud.dialogflow.v2.SpeechContext buildPartial() {
       com.google.cloud.dialogflow.v2.SpeechContext result =
           new com.google.cloud.dialogflow.v2.SpeechContext(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.cloud.dialogflow.v2.SpeechContext result) {
       if (((bitField0_ & 0x00000001) != 0)) {
         phrases_ = phrases_.getUnmodifiableView();
         bitField0_ = (bitField0_ & ~0x00000001);
       }
       result.phrases_ = phrases_;
-      result.boost_ = boost_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.SpeechContext result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.boost_ = boost_;
+      }
     }
 
     @java.lang.Override
@@ -540,7 +554,7 @@ public Builder mergeFrom(
             case 21:
               {
                 boost_ = input.readFloat();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 21
             default:
@@ -854,6 +868,7 @@ public float getBoost() {
     public Builder setBoost(float value) {
 
       boost_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -875,7 +890,7 @@ public Builder setBoost(float value) {
      * @return This builder for chaining.
      */
     public Builder clearBoost() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       boost_ = 0F;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SpeechModelVariant.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SpeechModelVariant.java
index 80f3014e756e..bcdc31b1c5a8 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SpeechModelVariant.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SpeechModelVariant.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * Variant of the specified [Speech model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
+ * Variant of the specified [Speech
+ * model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
  * See the [Cloud Speech
  * documentation](https://cloud.google.com/speech-to-text/docs/enhanced-models)
  * for which models have different variants. For example, the "phone_call" model
@@ -77,8 +78,8 @@ public enum SpeechModelVariant implements com.google.protobuf.ProtocolMessageEnu
    * <pre>
    * Use an enhanced model variant:
    * * If an enhanced variant does not exist for the given
-   *   [model][google.cloud.dialogflow.v2.InputAudioConfig.model] and request language, Dialogflow falls
-   *   back to the standard variant.
+   *   [model][google.cloud.dialogflow.v2.InputAudioConfig.model] and request
+   *   language, Dialogflow falls back to the standard variant.
    *   The [Cloud Speech
    *   documentation](https://cloud.google.com/speech-to-text/docs/enhanced-models)
    *   describes which models have enhanced variants.
@@ -138,8 +139,8 @@ public enum SpeechModelVariant implements com.google.protobuf.ProtocolMessageEnu
    * <pre>
    * Use an enhanced model variant:
    * * If an enhanced variant does not exist for the given
-   *   [model][google.cloud.dialogflow.v2.InputAudioConfig.model] and request language, Dialogflow falls
-   *   back to the standard variant.
+   *   [model][google.cloud.dialogflow.v2.InputAudioConfig.model] and request
+   *   language, Dialogflow falls back to the standard variant.
    *   The [Cloud Speech
    *   documentation](https://cloud.google.com/speech-to-text/docs/enhanced-models)
    *   describes which models have enhanced variants.
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SpeechToTextConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SpeechToTextConfig.java
index fff262c82a86..a61bb19825bf 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SpeechToTextConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SpeechToTextConfig.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * Configures speech transcription for [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile].
+ * Configures speech transcription for
+ * [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.SpeechToTextConfig}
@@ -69,18 +70,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SPEECH_MODEL_VARIANT_FIELD_NUMBER = 1;
-  private int speechModelVariant_;
+  private int speechModelVariant_ = 0;
   /**
    *
    *
    * <pre>
    * The speech model used in speech to text.
    * `SPEECH_MODEL_VARIANT_UNSPECIFIED`, `USE_BEST_AVAILABLE` will be treated as
-   * `USE_ENHANCED`. It can be overridden in [AnalyzeContentRequest][google.cloud.dialogflow.v2.AnalyzeContentRequest] and
-   * [StreamingAnalyzeContentRequest][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest] request.
-   * If enhanced model variant is specified and an enhanced
-   * version of the specified model for the language does not exist, then it
-   * would emit an error.
+   * `USE_ENHANCED`. It can be overridden in
+   * [AnalyzeContentRequest][google.cloud.dialogflow.v2.AnalyzeContentRequest]
+   * and
+   * [StreamingAnalyzeContentRequest][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest]
+   * request. If enhanced model variant is specified and an enhanced version of
+   * the specified model for the language does not exist, then it would emit an
+   * error.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.SpeechModelVariant speech_model_variant = 1;</code>
@@ -97,11 +100,13 @@ public int getSpeechModelVariantValue() {
    * <pre>
    * The speech model used in speech to text.
    * `SPEECH_MODEL_VARIANT_UNSPECIFIED`, `USE_BEST_AVAILABLE` will be treated as
-   * `USE_ENHANCED`. It can be overridden in [AnalyzeContentRequest][google.cloud.dialogflow.v2.AnalyzeContentRequest] and
-   * [StreamingAnalyzeContentRequest][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest] request.
-   * If enhanced model variant is specified and an enhanced
-   * version of the specified model for the language does not exist, then it
-   * would emit an error.
+   * `USE_ENHANCED`. It can be overridden in
+   * [AnalyzeContentRequest][google.cloud.dialogflow.v2.AnalyzeContentRequest]
+   * and
+   * [StreamingAnalyzeContentRequest][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest]
+   * request. If enhanced model variant is specified and an enhanced version of
+   * the specified model for the language does not exist, then it would emit an
+   * error.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.SpeechModelVariant speech_model_variant = 1;</code>
@@ -110,14 +115,15 @@ public int getSpeechModelVariantValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.SpeechModelVariant getSpeechModelVariant() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.SpeechModelVariant result =
-        com.google.cloud.dialogflow.v2.SpeechModelVariant.valueOf(speechModelVariant_);
+        com.google.cloud.dialogflow.v2.SpeechModelVariant.forNumber(speechModelVariant_);
     return result == null ? com.google.cloud.dialogflow.v2.SpeechModelVariant.UNRECOGNIZED : result;
   }
 
   public static final int MODEL_FIELD_NUMBER = 2;
-  private volatile java.lang.Object model_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object model_ = "";
   /**
    *
    *
@@ -353,7 +359,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Configures speech transcription for [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile].
+   * Configures speech transcription for
+   * [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.SpeechToTextConfig}
@@ -387,10 +394,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       speechModelVariant_ = 0;
-
       model_ = "";
-
       return this;
     }
 
@@ -418,12 +424,23 @@ public com.google.cloud.dialogflow.v2.SpeechToTextConfig build() {
     public com.google.cloud.dialogflow.v2.SpeechToTextConfig buildPartial() {
       com.google.cloud.dialogflow.v2.SpeechToTextConfig result =
           new com.google.cloud.dialogflow.v2.SpeechToTextConfig(this);
-      result.speechModelVariant_ = speechModelVariant_;
-      result.model_ = model_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.SpeechToTextConfig result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.speechModelVariant_ = speechModelVariant_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.model_ = model_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -475,6 +492,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.SpeechToTextConfig other
       }
       if (!other.getModel().isEmpty()) {
         model_ = other.model_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -506,13 +524,13 @@ public Builder mergeFrom(
             case 8:
               {
                 speechModelVariant_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 18:
               {
                 model_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -532,6 +550,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private int speechModelVariant_ = 0;
     /**
      *
@@ -539,11 +559,13 @@ public Builder mergeFrom(
      * <pre>
      * The speech model used in speech to text.
      * `SPEECH_MODEL_VARIANT_UNSPECIFIED`, `USE_BEST_AVAILABLE` will be treated as
-     * `USE_ENHANCED`. It can be overridden in [AnalyzeContentRequest][google.cloud.dialogflow.v2.AnalyzeContentRequest] and
-     * [StreamingAnalyzeContentRequest][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest] request.
-     * If enhanced model variant is specified and an enhanced
-     * version of the specified model for the language does not exist, then it
-     * would emit an error.
+     * `USE_ENHANCED`. It can be overridden in
+     * [AnalyzeContentRequest][google.cloud.dialogflow.v2.AnalyzeContentRequest]
+     * and
+     * [StreamingAnalyzeContentRequest][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest]
+     * request. If enhanced model variant is specified and an enhanced version of
+     * the specified model for the language does not exist, then it would emit an
+     * error.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.SpeechModelVariant speech_model_variant = 1;</code>
@@ -560,11 +582,13 @@ public int getSpeechModelVariantValue() {
      * <pre>
      * The speech model used in speech to text.
      * `SPEECH_MODEL_VARIANT_UNSPECIFIED`, `USE_BEST_AVAILABLE` will be treated as
-     * `USE_ENHANCED`. It can be overridden in [AnalyzeContentRequest][google.cloud.dialogflow.v2.AnalyzeContentRequest] and
-     * [StreamingAnalyzeContentRequest][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest] request.
-     * If enhanced model variant is specified and an enhanced
-     * version of the specified model for the language does not exist, then it
-     * would emit an error.
+     * `USE_ENHANCED`. It can be overridden in
+     * [AnalyzeContentRequest][google.cloud.dialogflow.v2.AnalyzeContentRequest]
+     * and
+     * [StreamingAnalyzeContentRequest][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest]
+     * request. If enhanced model variant is specified and an enhanced version of
+     * the specified model for the language does not exist, then it would emit an
+     * error.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.SpeechModelVariant speech_model_variant = 1;</code>
@@ -573,8 +597,8 @@ public int getSpeechModelVariantValue() {
      * @return This builder for chaining.
      */
     public Builder setSpeechModelVariantValue(int value) {
-
       speechModelVariant_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -584,11 +608,13 @@ public Builder setSpeechModelVariantValue(int value) {
      * <pre>
      * The speech model used in speech to text.
      * `SPEECH_MODEL_VARIANT_UNSPECIFIED`, `USE_BEST_AVAILABLE` will be treated as
-     * `USE_ENHANCED`. It can be overridden in [AnalyzeContentRequest][google.cloud.dialogflow.v2.AnalyzeContentRequest] and
-     * [StreamingAnalyzeContentRequest][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest] request.
-     * If enhanced model variant is specified and an enhanced
-     * version of the specified model for the language does not exist, then it
-     * would emit an error.
+     * `USE_ENHANCED`. It can be overridden in
+     * [AnalyzeContentRequest][google.cloud.dialogflow.v2.AnalyzeContentRequest]
+     * and
+     * [StreamingAnalyzeContentRequest][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest]
+     * request. If enhanced model variant is specified and an enhanced version of
+     * the specified model for the language does not exist, then it would emit an
+     * error.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.SpeechModelVariant speech_model_variant = 1;</code>
@@ -597,9 +623,8 @@ public Builder setSpeechModelVariantValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.SpeechModelVariant getSpeechModelVariant() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.SpeechModelVariant result =
-          com.google.cloud.dialogflow.v2.SpeechModelVariant.valueOf(speechModelVariant_);
+          com.google.cloud.dialogflow.v2.SpeechModelVariant.forNumber(speechModelVariant_);
       return result == null
           ? com.google.cloud.dialogflow.v2.SpeechModelVariant.UNRECOGNIZED
           : result;
@@ -610,11 +635,13 @@ public com.google.cloud.dialogflow.v2.SpeechModelVariant getSpeechModelVariant()
      * <pre>
      * The speech model used in speech to text.
      * `SPEECH_MODEL_VARIANT_UNSPECIFIED`, `USE_BEST_AVAILABLE` will be treated as
-     * `USE_ENHANCED`. It can be overridden in [AnalyzeContentRequest][google.cloud.dialogflow.v2.AnalyzeContentRequest] and
-     * [StreamingAnalyzeContentRequest][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest] request.
-     * If enhanced model variant is specified and an enhanced
-     * version of the specified model for the language does not exist, then it
-     * would emit an error.
+     * `USE_ENHANCED`. It can be overridden in
+     * [AnalyzeContentRequest][google.cloud.dialogflow.v2.AnalyzeContentRequest]
+     * and
+     * [StreamingAnalyzeContentRequest][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest]
+     * request. If enhanced model variant is specified and an enhanced version of
+     * the specified model for the language does not exist, then it would emit an
+     * error.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.SpeechModelVariant speech_model_variant = 1;</code>
@@ -626,7 +653,7 @@ public Builder setSpeechModelVariant(com.google.cloud.dialogflow.v2.SpeechModelV
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       speechModelVariant_ = value.getNumber();
       onChanged();
       return this;
@@ -637,11 +664,13 @@ public Builder setSpeechModelVariant(com.google.cloud.dialogflow.v2.SpeechModelV
      * <pre>
      * The speech model used in speech to text.
      * `SPEECH_MODEL_VARIANT_UNSPECIFIED`, `USE_BEST_AVAILABLE` will be treated as
-     * `USE_ENHANCED`. It can be overridden in [AnalyzeContentRequest][google.cloud.dialogflow.v2.AnalyzeContentRequest] and
-     * [StreamingAnalyzeContentRequest][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest] request.
-     * If enhanced model variant is specified and an enhanced
-     * version of the specified model for the language does not exist, then it
-     * would emit an error.
+     * `USE_ENHANCED`. It can be overridden in
+     * [AnalyzeContentRequest][google.cloud.dialogflow.v2.AnalyzeContentRequest]
+     * and
+     * [StreamingAnalyzeContentRequest][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest]
+     * request. If enhanced model variant is specified and an enhanced version of
+     * the specified model for the language does not exist, then it would emit an
+     * error.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.SpeechModelVariant speech_model_variant = 1;</code>
@@ -649,7 +678,7 @@ public Builder setSpeechModelVariant(com.google.cloud.dialogflow.v2.SpeechModelV
      * @return This builder for chaining.
      */
     public Builder clearSpeechModelVariant() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       speechModelVariant_ = 0;
       onChanged();
       return this;
@@ -734,8 +763,8 @@ public Builder setModel(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       model_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -757,8 +786,8 @@ public Builder setModel(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearModel() {
-
       model_ = getDefaultInstance().getModel();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -785,8 +814,8 @@ public Builder setModelBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       model_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SpeechToTextConfigOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SpeechToTextConfigOrBuilder.java
index 41989829784c..cbef45274f31 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SpeechToTextConfigOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SpeechToTextConfigOrBuilder.java
@@ -29,11 +29,13 @@ public interface SpeechToTextConfigOrBuilder
    * <pre>
    * The speech model used in speech to text.
    * `SPEECH_MODEL_VARIANT_UNSPECIFIED`, `USE_BEST_AVAILABLE` will be treated as
-   * `USE_ENHANCED`. It can be overridden in [AnalyzeContentRequest][google.cloud.dialogflow.v2.AnalyzeContentRequest] and
-   * [StreamingAnalyzeContentRequest][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest] request.
-   * If enhanced model variant is specified and an enhanced
-   * version of the specified model for the language does not exist, then it
-   * would emit an error.
+   * `USE_ENHANCED`. It can be overridden in
+   * [AnalyzeContentRequest][google.cloud.dialogflow.v2.AnalyzeContentRequest]
+   * and
+   * [StreamingAnalyzeContentRequest][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest]
+   * request. If enhanced model variant is specified and an enhanced version of
+   * the specified model for the language does not exist, then it would emit an
+   * error.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.SpeechModelVariant speech_model_variant = 1;</code>
@@ -47,11 +49,13 @@ public interface SpeechToTextConfigOrBuilder
    * <pre>
    * The speech model used in speech to text.
    * `SPEECH_MODEL_VARIANT_UNSPECIFIED`, `USE_BEST_AVAILABLE` will be treated as
-   * `USE_ENHANCED`. It can be overridden in [AnalyzeContentRequest][google.cloud.dialogflow.v2.AnalyzeContentRequest] and
-   * [StreamingAnalyzeContentRequest][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest] request.
-   * If enhanced model variant is specified and an enhanced
-   * version of the specified model for the language does not exist, then it
-   * would emit an error.
+   * `USE_ENHANCED`. It can be overridden in
+   * [AnalyzeContentRequest][google.cloud.dialogflow.v2.AnalyzeContentRequest]
+   * and
+   * [StreamingAnalyzeContentRequest][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest]
+   * request. If enhanced model variant is specified and an enhanced version of
+   * the specified model for the language does not exist, then it would emit an
+   * error.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.SpeechModelVariant speech_model_variant = 1;</code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SpeechWordInfo.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SpeechWordInfo.java
index 4973b4202d84..b3dbe0b5de98 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SpeechWordInfo.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SpeechWordInfo.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int WORD_FIELD_NUMBER = 3;
-  private volatile java.lang.Object word_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object word_ = "";
   /**
    *
    *
@@ -165,7 +167,7 @@ public com.google.protobuf.Duration getStartOffset() {
    */
   @java.lang.Override
   public com.google.protobuf.DurationOrBuilder getStartOffsetOrBuilder() {
-    return getStartOffset();
+    return startOffset_ == null ? com.google.protobuf.Duration.getDefaultInstance() : startOffset_;
   }
 
   public static final int END_OFFSET_FIELD_NUMBER = 2;
@@ -217,11 +219,11 @@ public com.google.protobuf.Duration getEndOffset() {
    */
   @java.lang.Override
   public com.google.protobuf.DurationOrBuilder getEndOffsetOrBuilder() {
-    return getEndOffset();
+    return endOffset_ == null ? com.google.protobuf.Duration.getDefaultInstance() : endOffset_;
   }
 
   public static final int CONFIDENCE_FIELD_NUMBER = 4;
-  private float confidence_;
+  private float confidence_ = 0F;
   /**
    *
    *
@@ -478,22 +480,19 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       word_ = "";
-
-      if (startOffsetBuilder_ == null) {
-        startOffset_ = null;
-      } else {
-        startOffset_ = null;
+      startOffset_ = null;
+      if (startOffsetBuilder_ != null) {
+        startOffsetBuilder_.dispose();
         startOffsetBuilder_ = null;
       }
-      if (endOffsetBuilder_ == null) {
-        endOffset_ = null;
-      } else {
-        endOffset_ = null;
+      endOffset_ = null;
+      if (endOffsetBuilder_ != null) {
+        endOffsetBuilder_.dispose();
         endOffsetBuilder_ = null;
       }
       confidence_ = 0F;
-
       return this;
     }
 
@@ -521,22 +520,30 @@ public com.google.cloud.dialogflow.v2.SpeechWordInfo build() {
     public com.google.cloud.dialogflow.v2.SpeechWordInfo buildPartial() {
       com.google.cloud.dialogflow.v2.SpeechWordInfo result =
           new com.google.cloud.dialogflow.v2.SpeechWordInfo(this);
-      result.word_ = word_;
-      if (startOffsetBuilder_ == null) {
-        result.startOffset_ = startOffset_;
-      } else {
-        result.startOffset_ = startOffsetBuilder_.build();
-      }
-      if (endOffsetBuilder_ == null) {
-        result.endOffset_ = endOffset_;
-      } else {
-        result.endOffset_ = endOffsetBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.confidence_ = confidence_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.SpeechWordInfo result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.word_ = word_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.startOffset_ =
+            startOffsetBuilder_ == null ? startOffset_ : startOffsetBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.endOffset_ = endOffsetBuilder_ == null ? endOffset_ : endOffsetBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.confidence_ = confidence_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -584,6 +591,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.SpeechWordInfo other) {
       if (other == com.google.cloud.dialogflow.v2.SpeechWordInfo.getDefaultInstance()) return this;
       if (!other.getWord().isEmpty()) {
         word_ = other.word_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasStartOffset()) {
@@ -624,25 +632,25 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getStartOffsetFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getEndOffsetFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 18
             case 26:
               {
                 word_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 26
             case 37:
               {
                 confidence_ = input.readFloat();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 37
             default:
@@ -662,6 +670,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object word_ = "";
     /**
      *
@@ -723,8 +733,8 @@ public Builder setWord(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       word_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -740,8 +750,8 @@ public Builder setWord(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearWord() {
-
       word_ = getDefaultInstance().getWord();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -762,8 +772,8 @@ public Builder setWordBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       word_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -788,7 +798,7 @@ public Builder setWordBytes(com.google.protobuf.ByteString value) {
      * @return Whether the startOffset field is set.
      */
     public boolean hasStartOffset() {
-      return startOffsetBuilder_ != null || startOffset_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -829,11 +839,11 @@ public Builder setStartOffset(com.google.protobuf.Duration value) {
           throw new NullPointerException();
         }
         startOffset_ = value;
-        onChanged();
       } else {
         startOffsetBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -850,11 +860,11 @@ public Builder setStartOffset(com.google.protobuf.Duration value) {
     public Builder setStartOffset(com.google.protobuf.Duration.Builder builderForValue) {
       if (startOffsetBuilder_ == null) {
         startOffset_ = builderForValue.build();
-        onChanged();
       } else {
         startOffsetBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -870,17 +880,18 @@ public Builder setStartOffset(com.google.protobuf.Duration.Builder builderForVal
      */
     public Builder mergeStartOffset(com.google.protobuf.Duration value) {
       if (startOffsetBuilder_ == null) {
-        if (startOffset_ != null) {
-          startOffset_ =
-              com.google.protobuf.Duration.newBuilder(startOffset_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && startOffset_ != null
+            && startOffset_ != com.google.protobuf.Duration.getDefaultInstance()) {
+          getStartOffsetBuilder().mergeFrom(value);
         } else {
           startOffset_ = value;
         }
-        onChanged();
       } else {
         startOffsetBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -895,14 +906,13 @@ public Builder mergeStartOffset(com.google.protobuf.Duration value) {
      * <code>.google.protobuf.Duration start_offset = 1;</code>
      */
     public Builder clearStartOffset() {
-      if (startOffsetBuilder_ == null) {
-        startOffset_ = null;
-        onChanged();
-      } else {
-        startOffset_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      startOffset_ = null;
+      if (startOffsetBuilder_ != null) {
+        startOffsetBuilder_.dispose();
         startOffsetBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -917,7 +927,7 @@ public Builder clearStartOffset() {
      * <code>.google.protobuf.Duration start_offset = 1;</code>
      */
     public com.google.protobuf.Duration.Builder getStartOffsetBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getStartOffsetFieldBuilder().getBuilder();
     }
@@ -989,7 +999,7 @@ public com.google.protobuf.DurationOrBuilder getStartOffsetOrBuilder() {
      * @return Whether the endOffset field is set.
      */
     public boolean hasEndOffset() {
-      return endOffsetBuilder_ != null || endOffset_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1028,11 +1038,11 @@ public Builder setEndOffset(com.google.protobuf.Duration value) {
           throw new NullPointerException();
         }
         endOffset_ = value;
-        onChanged();
       } else {
         endOffsetBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1049,11 +1059,11 @@ public Builder setEndOffset(com.google.protobuf.Duration value) {
     public Builder setEndOffset(com.google.protobuf.Duration.Builder builderForValue) {
       if (endOffsetBuilder_ == null) {
         endOffset_ = builderForValue.build();
-        onChanged();
       } else {
         endOffsetBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1069,17 +1079,18 @@ public Builder setEndOffset(com.google.protobuf.Duration.Builder builderForValue
      */
     public Builder mergeEndOffset(com.google.protobuf.Duration value) {
       if (endOffsetBuilder_ == null) {
-        if (endOffset_ != null) {
-          endOffset_ =
-              com.google.protobuf.Duration.newBuilder(endOffset_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && endOffset_ != null
+            && endOffset_ != com.google.protobuf.Duration.getDefaultInstance()) {
+          getEndOffsetBuilder().mergeFrom(value);
         } else {
           endOffset_ = value;
         }
-        onChanged();
       } else {
         endOffsetBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1094,14 +1105,13 @@ public Builder mergeEndOffset(com.google.protobuf.Duration value) {
      * <code>.google.protobuf.Duration end_offset = 2;</code>
      */
     public Builder clearEndOffset() {
-      if (endOffsetBuilder_ == null) {
-        endOffset_ = null;
-        onChanged();
-      } else {
-        endOffset_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      endOffset_ = null;
+      if (endOffsetBuilder_ != null) {
+        endOffsetBuilder_.dispose();
         endOffsetBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1116,7 +1126,7 @@ public Builder clearEndOffset() {
      * <code>.google.protobuf.Duration end_offset = 2;</code>
      */
     public com.google.protobuf.Duration.Builder getEndOffsetBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getEndOffsetFieldBuilder().getBuilder();
     }
@@ -1207,6 +1217,7 @@ public float getConfidence() {
     public Builder setConfidence(float value) {
 
       confidence_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1227,7 +1238,7 @@ public Builder setConfidence(float value) {
      * @return This builder for chaining.
      */
     public Builder clearConfidence() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       confidence_ = 0F;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingAnalyzeContentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingAnalyzeContentRequest.java
index 961444d7efaf..1d638a82fbbd 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingAnalyzeContentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingAnalyzeContentRequest.java
@@ -23,28 +23,36 @@
  *
  * <pre>
  * The top-level message sent by the client to the
- * [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent] method.
+ * [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent]
+ * method.
  * Multiple request messages should be sent in order:
  * 1.  The first message must contain
  *     [participant][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.participant],
- *     [config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.config] and optionally
- *     [query_params][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.query_params]. If you want
- *     to receive an audio response, it should also contain
+ *     [config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.config]
+ *     and optionally
+ *     [query_params][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.query_params].
+ *     If you want to receive an audio response, it should also contain
  *     [reply_audio_config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.reply_audio_config].
  *     The message must not contain
  *     [input][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.input].
- * 2.  If [config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.config] in the first message
- *     was set to [audio_config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.audio_config],
+ * 2.  If
+ * [config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.config] in
+ * the first message
+ *     was set to
+ *     [audio_config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.audio_config],
  *     all subsequent messages must contain
- *     [input_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.input_audio] to continue
- *     with Speech recognition.
- *     However, note that:
+ *     [input_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.input_audio]
+ *     to continue with Speech recognition. However, note that:
  *     * Dialogflow will bill you for the audio so far.
  *     * Dialogflow discards all Speech recognition results in favor of the
  *       text input.
- *  3. If [StreamingAnalyzeContentRequest.config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.config] in the first message was set
- *    to [StreamingAnalyzeContentRequest.text_config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.text_config], then the second message
- *    must contain only [input_text][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.input_text].
+ *  3. If
+ *  [StreamingAnalyzeContentRequest.config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.config]
+ *  in the first message was set
+ *    to
+ *    [StreamingAnalyzeContentRequest.text_config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.text_config],
+ *    then the second message must contain only
+ *    [input_text][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.input_text].
  *    Moreover, you must not send more than two messages.
  *  After you sent all input, you must half-close or abort the request stream.
  * </pre>
@@ -190,7 +198,9 @@ public InputCase getInputCase() {
   }
 
   public static final int PARTICIPANT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object participant_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object participant_ = "";
   /**
    *
    *
@@ -405,7 +415,9 @@ public com.google.cloud.dialogflow.v2.OutputAudioConfig getReplyAudioConfig() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.OutputAudioConfigOrBuilder getReplyAudioConfigOrBuilder() {
-    return getReplyAudioConfig();
+    return replyAudioConfig_ == null
+        ? com.google.cloud.dialogflow.v2.OutputAudioConfig.getDefaultInstance()
+        : replyAudioConfig_;
   }
 
   public static final int INPUT_AUDIO_FIELD_NUMBER = 5;
@@ -628,7 +640,9 @@ public com.google.cloud.dialogflow.v2.QueryParameters getQueryParams() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.QueryParametersOrBuilder getQueryParamsOrBuilder() {
-    return getQueryParams();
+    return queryParams_ == null
+        ? com.google.cloud.dialogflow.v2.QueryParameters.getDefaultInstance()
+        : queryParams_;
   }
 
   public static final int ASSIST_QUERY_PARAMS_FIELD_NUMBER = 8;
@@ -677,7 +691,9 @@ public com.google.cloud.dialogflow.v2.AssistQueryParameters getAssistQueryParams
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.AssistQueryParametersOrBuilder
       getAssistQueryParamsOrBuilder() {
-    return getAssistQueryParams();
+    return assistQueryParams_ == null
+        ? com.google.cloud.dialogflow.v2.AssistQueryParameters.getDefaultInstance()
+        : assistQueryParams_;
   }
 
   public static final int CX_PARAMETERS_FIELD_NUMBER = 13;
@@ -735,11 +751,11 @@ public com.google.protobuf.Struct getCxParameters() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getCxParametersOrBuilder() {
-    return getCxParameters();
+    return cxParameters_ == null ? com.google.protobuf.Struct.getDefaultInstance() : cxParameters_;
   }
 
   public static final int ENABLE_PARTIAL_AUTOMATED_AGENT_REPLY_FIELD_NUMBER = 12;
-  private boolean enablePartialAutomatedAgentReply_;
+  private boolean enablePartialAutomatedAgentReply_ = false;
   /**
    *
    *
@@ -1085,28 +1101,36 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * The top-level message sent by the client to the
-   * [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent] method.
+   * [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent]
+   * method.
    * Multiple request messages should be sent in order:
    * 1.  The first message must contain
    *     [participant][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.participant],
-   *     [config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.config] and optionally
-   *     [query_params][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.query_params]. If you want
-   *     to receive an audio response, it should also contain
+   *     [config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.config]
+   *     and optionally
+   *     [query_params][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.query_params].
+   *     If you want to receive an audio response, it should also contain
    *     [reply_audio_config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.reply_audio_config].
    *     The message must not contain
    *     [input][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.input].
-   * 2.  If [config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.config] in the first message
-   *     was set to [audio_config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.audio_config],
+   * 2.  If
+   * [config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.config] in
+   * the first message
+   *     was set to
+   *     [audio_config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.audio_config],
    *     all subsequent messages must contain
-   *     [input_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.input_audio] to continue
-   *     with Speech recognition.
-   *     However, note that:
+   *     [input_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.input_audio]
+   *     to continue with Speech recognition. However, note that:
    *     * Dialogflow will bill you for the audio so far.
    *     * Dialogflow discards all Speech recognition results in favor of the
    *       text input.
-   *  3. If [StreamingAnalyzeContentRequest.config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.config] in the first message was set
-   *    to [StreamingAnalyzeContentRequest.text_config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.text_config], then the second message
-   *    must contain only [input_text][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.input_text].
+   *  3. If
+   *  [StreamingAnalyzeContentRequest.config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.config]
+   *  in the first message was set
+   *    to
+   *    [StreamingAnalyzeContentRequest.text_config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.text_config],
+   *    then the second message must contain only
+   *    [input_text][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.input_text].
    *    Moreover, you must not send more than two messages.
    *  After you sent all input, you must half-close or abort the request stream.
    * </pre>
@@ -1142,43 +1166,38 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       participant_ = "";
-
       if (audioConfigBuilder_ != null) {
         audioConfigBuilder_.clear();
       }
       if (textConfigBuilder_ != null) {
         textConfigBuilder_.clear();
       }
-      if (replyAudioConfigBuilder_ == null) {
-        replyAudioConfig_ = null;
-      } else {
-        replyAudioConfig_ = null;
+      replyAudioConfig_ = null;
+      if (replyAudioConfigBuilder_ != null) {
+        replyAudioConfigBuilder_.dispose();
         replyAudioConfigBuilder_ = null;
       }
       if (inputDtmfBuilder_ != null) {
         inputDtmfBuilder_.clear();
       }
-      if (queryParamsBuilder_ == null) {
-        queryParams_ = null;
-      } else {
-        queryParams_ = null;
+      queryParams_ = null;
+      if (queryParamsBuilder_ != null) {
+        queryParamsBuilder_.dispose();
         queryParamsBuilder_ = null;
       }
-      if (assistQueryParamsBuilder_ == null) {
-        assistQueryParams_ = null;
-      } else {
-        assistQueryParams_ = null;
+      assistQueryParams_ = null;
+      if (assistQueryParamsBuilder_ != null) {
+        assistQueryParamsBuilder_.dispose();
         assistQueryParamsBuilder_ = null;
       }
-      if (cxParametersBuilder_ == null) {
-        cxParameters_ = null;
-      } else {
-        cxParameters_ = null;
+      cxParameters_ = null;
+      if (cxParametersBuilder_ != null) {
+        cxParametersBuilder_.dispose();
         cxParametersBuilder_ = null;
       }
       enablePartialAutomatedAgentReply_ = false;
-
       configCase_ = 0;
       config_ = null;
       inputCase_ = 0;
@@ -1211,59 +1230,58 @@ public com.google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest build() {
     public com.google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest result =
           new com.google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest(this);
-      result.participant_ = participant_;
-      if (configCase_ == 2) {
-        if (audioConfigBuilder_ == null) {
-          result.config_ = config_;
-        } else {
-          result.config_ = audioConfigBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (configCase_ == 3) {
-        if (textConfigBuilder_ == null) {
-          result.config_ = config_;
-        } else {
-          result.config_ = textConfigBuilder_.build();
-        }
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.participant_ = participant_;
       }
-      if (replyAudioConfigBuilder_ == null) {
-        result.replyAudioConfig_ = replyAudioConfig_;
-      } else {
-        result.replyAudioConfig_ = replyAudioConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.replyAudioConfig_ =
+            replyAudioConfigBuilder_ == null ? replyAudioConfig_ : replyAudioConfigBuilder_.build();
       }
-      if (inputCase_ == 5) {
-        result.input_ = input_;
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.queryParams_ =
+            queryParamsBuilder_ == null ? queryParams_ : queryParamsBuilder_.build();
       }
-      if (inputCase_ == 6) {
-        result.input_ = input_;
+      if (((from_bitField0_ & 0x00000100) != 0)) {
+        result.assistQueryParams_ =
+            assistQueryParamsBuilder_ == null
+                ? assistQueryParams_
+                : assistQueryParamsBuilder_.build();
       }
-      if (inputCase_ == 9) {
-        if (inputDtmfBuilder_ == null) {
-          result.input_ = input_;
-        } else {
-          result.input_ = inputDtmfBuilder_.build();
-        }
+      if (((from_bitField0_ & 0x00000200) != 0)) {
+        result.cxParameters_ =
+            cxParametersBuilder_ == null ? cxParameters_ : cxParametersBuilder_.build();
       }
-      if (queryParamsBuilder_ == null) {
-        result.queryParams_ = queryParams_;
-      } else {
-        result.queryParams_ = queryParamsBuilder_.build();
+      if (((from_bitField0_ & 0x00000400) != 0)) {
+        result.enablePartialAutomatedAgentReply_ = enablePartialAutomatedAgentReply_;
       }
-      if (assistQueryParamsBuilder_ == null) {
-        result.assistQueryParams_ = assistQueryParams_;
-      } else {
-        result.assistQueryParams_ = assistQueryParamsBuilder_.build();
+    }
+
+    private void buildPartialOneofs(
+        com.google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest result) {
+      result.configCase_ = configCase_;
+      result.config_ = this.config_;
+      if (configCase_ == 2 && audioConfigBuilder_ != null) {
+        result.config_ = audioConfigBuilder_.build();
       }
-      if (cxParametersBuilder_ == null) {
-        result.cxParameters_ = cxParameters_;
-      } else {
-        result.cxParameters_ = cxParametersBuilder_.build();
+      if (configCase_ == 3 && textConfigBuilder_ != null) {
+        result.config_ = textConfigBuilder_.build();
       }
-      result.enablePartialAutomatedAgentReply_ = enablePartialAutomatedAgentReply_;
-      result.configCase_ = configCase_;
       result.inputCase_ = inputCase_;
-      onBuilt();
-      return result;
+      result.input_ = this.input_;
+      if (inputCase_ == 9 && inputDtmfBuilder_ != null) {
+        result.input_ = inputDtmfBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -1315,6 +1333,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.StreamingAnalyzeContentR
         return this;
       if (!other.getParticipant().isEmpty()) {
         participant_ = other.participant_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasReplyAudioConfig()) {
@@ -1400,7 +1419,7 @@ public Builder mergeFrom(
             case 10:
               {
                 participant_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -1419,7 +1438,7 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getReplyAudioConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 42:
@@ -1438,14 +1457,14 @@ public Builder mergeFrom(
             case 58:
               {
                 input.readMessage(getQueryParamsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 58
             case 66:
               {
                 input.readMessage(
                     getAssistQueryParamsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000100;
                 break;
               } // case 66
             case 74:
@@ -1457,13 +1476,13 @@ public Builder mergeFrom(
             case 96:
               {
                 enablePartialAutomatedAgentReply_ = input.readBool();
-
+                bitField0_ |= 0x00000400;
                 break;
               } // case 96
             case 106:
               {
                 input.readMessage(getCxParametersFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000200;
                 break;
               } // case 106
             default:
@@ -1511,6 +1530,8 @@ public Builder clearInput() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object participant_ = "";
     /**
      *
@@ -1584,8 +1605,8 @@ public Builder setParticipant(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       participant_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1605,8 +1626,8 @@ public Builder setParticipant(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParticipant() {
-
       participant_ = getDefaultInstance().getParticipant();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1631,8 +1652,8 @@ public Builder setParticipantBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       participant_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1843,7 +1864,6 @@ public com.google.cloud.dialogflow.v2.InputAudioConfigOrBuilder getAudioConfigOr
       }
       configCase_ = 2;
       onChanged();
-      ;
       return audioConfigBuilder_;
     }
 
@@ -2053,7 +2073,6 @@ public com.google.cloud.dialogflow.v2.InputTextConfigOrBuilder getTextConfigOrBu
       }
       configCase_ = 3;
       onChanged();
-      ;
       return textConfigBuilder_;
     }
 
@@ -2079,7 +2098,7 @@ public com.google.cloud.dialogflow.v2.InputTextConfigOrBuilder getTextConfigOrBu
      * @return Whether the replyAudioConfig field is set.
      */
     public boolean hasReplyAudioConfig() {
-      return replyAudioConfigBuilder_ != null || replyAudioConfig_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -2124,11 +2143,11 @@ public Builder setReplyAudioConfig(com.google.cloud.dialogflow.v2.OutputAudioCon
           throw new NullPointerException();
         }
         replyAudioConfig_ = value;
-        onChanged();
       } else {
         replyAudioConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -2148,11 +2167,11 @@ public Builder setReplyAudioConfig(
         com.google.cloud.dialogflow.v2.OutputAudioConfig.Builder builderForValue) {
       if (replyAudioConfigBuilder_ == null) {
         replyAudioConfig_ = builderForValue.build();
-        onChanged();
       } else {
         replyAudioConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -2170,19 +2189,19 @@ public Builder setReplyAudioConfig(
      */
     public Builder mergeReplyAudioConfig(com.google.cloud.dialogflow.v2.OutputAudioConfig value) {
       if (replyAudioConfigBuilder_ == null) {
-        if (replyAudioConfig_ != null) {
-          replyAudioConfig_ =
-              com.google.cloud.dialogflow.v2.OutputAudioConfig.newBuilder(replyAudioConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && replyAudioConfig_ != null
+            && replyAudioConfig_
+                != com.google.cloud.dialogflow.v2.OutputAudioConfig.getDefaultInstance()) {
+          getReplyAudioConfigBuilder().mergeFrom(value);
         } else {
           replyAudioConfig_ = value;
         }
-        onChanged();
       } else {
         replyAudioConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -2199,14 +2218,13 @@ public Builder mergeReplyAudioConfig(com.google.cloud.dialogflow.v2.OutputAudioC
      * <code>.google.cloud.dialogflow.v2.OutputAudioConfig reply_audio_config = 4;</code>
      */
     public Builder clearReplyAudioConfig() {
-      if (replyAudioConfigBuilder_ == null) {
-        replyAudioConfig_ = null;
-        onChanged();
-      } else {
-        replyAudioConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      replyAudioConfig_ = null;
+      if (replyAudioConfigBuilder_ != null) {
+        replyAudioConfigBuilder_.dispose();
         replyAudioConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2223,7 +2241,7 @@ public Builder clearReplyAudioConfig() {
      * <code>.google.cloud.dialogflow.v2.OutputAudioConfig reply_audio_config = 4;</code>
      */
     public com.google.cloud.dialogflow.v2.OutputAudioConfig.Builder getReplyAudioConfigBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getReplyAudioConfigFieldBuilder().getBuilder();
     }
@@ -2736,7 +2754,6 @@ public com.google.cloud.dialogflow.v2.TelephonyDtmfEventsOrBuilder getInputDtmfO
       }
       inputCase_ = 9;
       onChanged();
-      ;
       return inputDtmfBuilder_;
     }
 
@@ -2758,7 +2775,7 @@ public com.google.cloud.dialogflow.v2.TelephonyDtmfEventsOrBuilder getInputDtmfO
      * @return Whether the queryParams field is set.
      */
     public boolean hasQueryParams() {
-      return queryParamsBuilder_ != null || queryParams_ != null;
+      return ((bitField0_ & 0x00000080) != 0);
     }
     /**
      *
@@ -2795,11 +2812,11 @@ public Builder setQueryParams(com.google.cloud.dialogflow.v2.QueryParameters val
           throw new NullPointerException();
         }
         queryParams_ = value;
-        onChanged();
       } else {
         queryParamsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2815,11 +2832,11 @@ public Builder setQueryParams(
         com.google.cloud.dialogflow.v2.QueryParameters.Builder builderForValue) {
       if (queryParamsBuilder_ == null) {
         queryParams_ = builderForValue.build();
-        onChanged();
       } else {
         queryParamsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2833,19 +2850,19 @@ public Builder setQueryParams(
      */
     public Builder mergeQueryParams(com.google.cloud.dialogflow.v2.QueryParameters value) {
       if (queryParamsBuilder_ == null) {
-        if (queryParams_ != null) {
-          queryParams_ =
-              com.google.cloud.dialogflow.v2.QueryParameters.newBuilder(queryParams_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000080) != 0)
+            && queryParams_ != null
+            && queryParams_
+                != com.google.cloud.dialogflow.v2.QueryParameters.getDefaultInstance()) {
+          getQueryParamsBuilder().mergeFrom(value);
         } else {
           queryParams_ = value;
         }
-        onChanged();
       } else {
         queryParamsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2858,14 +2875,13 @@ public Builder mergeQueryParams(com.google.cloud.dialogflow.v2.QueryParameters v
      * <code>.google.cloud.dialogflow.v2.QueryParameters query_params = 7;</code>
      */
     public Builder clearQueryParams() {
-      if (queryParamsBuilder_ == null) {
-        queryParams_ = null;
-        onChanged();
-      } else {
-        queryParams_ = null;
+      bitField0_ = (bitField0_ & ~0x00000080);
+      queryParams_ = null;
+      if (queryParamsBuilder_ != null) {
+        queryParamsBuilder_.dispose();
         queryParamsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2878,7 +2894,7 @@ public Builder clearQueryParams() {
      * <code>.google.cloud.dialogflow.v2.QueryParameters query_params = 7;</code>
      */
     public com.google.cloud.dialogflow.v2.QueryParameters.Builder getQueryParamsBuilder() {
-
+      bitField0_ |= 0x00000080;
       onChanged();
       return getQueryParamsFieldBuilder().getBuilder();
     }
@@ -2944,7 +2960,7 @@ public com.google.cloud.dialogflow.v2.QueryParametersOrBuilder getQueryParamsOrB
      * @return Whether the assistQueryParams field is set.
      */
     public boolean hasAssistQueryParams() {
-      return assistQueryParamsBuilder_ != null || assistQueryParams_ != null;
+      return ((bitField0_ & 0x00000100) != 0);
     }
     /**
      *
@@ -2982,11 +2998,11 @@ public Builder setAssistQueryParams(
           throw new NullPointerException();
         }
         assistQueryParams_ = value;
-        onChanged();
       } else {
         assistQueryParamsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -3002,11 +3018,11 @@ public Builder setAssistQueryParams(
         com.google.cloud.dialogflow.v2.AssistQueryParameters.Builder builderForValue) {
       if (assistQueryParamsBuilder_ == null) {
         assistQueryParams_ = builderForValue.build();
-        onChanged();
       } else {
         assistQueryParamsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -3021,19 +3037,19 @@ public Builder setAssistQueryParams(
     public Builder mergeAssistQueryParams(
         com.google.cloud.dialogflow.v2.AssistQueryParameters value) {
       if (assistQueryParamsBuilder_ == null) {
-        if (assistQueryParams_ != null) {
-          assistQueryParams_ =
-              com.google.cloud.dialogflow.v2.AssistQueryParameters.newBuilder(assistQueryParams_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000100) != 0)
+            && assistQueryParams_ != null
+            && assistQueryParams_
+                != com.google.cloud.dialogflow.v2.AssistQueryParameters.getDefaultInstance()) {
+          getAssistQueryParamsBuilder().mergeFrom(value);
         } else {
           assistQueryParams_ = value;
         }
-        onChanged();
       } else {
         assistQueryParamsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -3046,14 +3062,13 @@ public Builder mergeAssistQueryParams(
      * <code>.google.cloud.dialogflow.v2.AssistQueryParameters assist_query_params = 8;</code>
      */
     public Builder clearAssistQueryParams() {
-      if (assistQueryParamsBuilder_ == null) {
-        assistQueryParams_ = null;
-        onChanged();
-      } else {
-        assistQueryParams_ = null;
+      bitField0_ = (bitField0_ & ~0x00000100);
+      assistQueryParams_ = null;
+      if (assistQueryParamsBuilder_ != null) {
+        assistQueryParamsBuilder_.dispose();
         assistQueryParamsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3067,7 +3082,7 @@ public Builder clearAssistQueryParams() {
      */
     public com.google.cloud.dialogflow.v2.AssistQueryParameters.Builder
         getAssistQueryParamsBuilder() {
-
+      bitField0_ |= 0x00000100;
       onChanged();
       return getAssistQueryParamsFieldBuilder().getBuilder();
     }
@@ -3138,7 +3153,7 @@ public Builder clearAssistQueryParams() {
      * @return Whether the cxParameters field is set.
      */
     public boolean hasCxParameters() {
-      return cxParametersBuilder_ != null || cxParameters_ != null;
+      return ((bitField0_ & 0x00000200) != 0);
     }
     /**
      *
@@ -3183,11 +3198,11 @@ public Builder setCxParameters(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         cxParameters_ = value;
-        onChanged();
       } else {
         cxParametersBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -3206,11 +3221,11 @@ public Builder setCxParameters(com.google.protobuf.Struct value) {
     public Builder setCxParameters(com.google.protobuf.Struct.Builder builderForValue) {
       if (cxParametersBuilder_ == null) {
         cxParameters_ = builderForValue.build();
-        onChanged();
       } else {
         cxParametersBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -3228,17 +3243,18 @@ public Builder setCxParameters(com.google.protobuf.Struct.Builder builderForValu
      */
     public Builder mergeCxParameters(com.google.protobuf.Struct value) {
       if (cxParametersBuilder_ == null) {
-        if (cxParameters_ != null) {
-          cxParameters_ =
-              com.google.protobuf.Struct.newBuilder(cxParameters_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000200) != 0)
+            && cxParameters_ != null
+            && cxParameters_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getCxParametersBuilder().mergeFrom(value);
         } else {
           cxParameters_ = value;
         }
-        onChanged();
       } else {
         cxParametersBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -3255,14 +3271,13 @@ public Builder mergeCxParameters(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct cx_parameters = 13;</code>
      */
     public Builder clearCxParameters() {
-      if (cxParametersBuilder_ == null) {
-        cxParameters_ = null;
-        onChanged();
-      } else {
-        cxParameters_ = null;
+      bitField0_ = (bitField0_ & ~0x00000200);
+      cxParameters_ = null;
+      if (cxParametersBuilder_ != null) {
+        cxParametersBuilder_.dispose();
         cxParametersBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3279,7 +3294,7 @@ public Builder clearCxParameters() {
      * <code>.google.protobuf.Struct cx_parameters = 13;</code>
      */
     public com.google.protobuf.Struct.Builder getCxParametersBuilder() {
-
+      bitField0_ |= 0x00000200;
       onChanged();
       return getCxParametersFieldBuilder().getBuilder();
     }
@@ -3372,6 +3387,7 @@ public boolean getEnablePartialAutomatedAgentReply() {
     public Builder setEnablePartialAutomatedAgentReply(boolean value) {
 
       enablePartialAutomatedAgentReply_ = value;
+      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -3390,7 +3406,7 @@ public Builder setEnablePartialAutomatedAgentReply(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearEnablePartialAutomatedAgentReply() {
-
+      bitField0_ = (bitField0_ & ~0x00000400);
       enablePartialAutomatedAgentReply_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingAnalyzeContentResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingAnalyzeContentResponse.java
index ae03fa48090a..63e03234b162 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingAnalyzeContentResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingAnalyzeContentResponse.java
@@ -133,11 +133,15 @@ public com.google.cloud.dialogflow.v2.StreamingRecognitionResult getRecognitionR
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.StreamingRecognitionResultOrBuilder
       getRecognitionResultOrBuilder() {
-    return getRecognitionResult();
+    return recognitionResult_ == null
+        ? com.google.cloud.dialogflow.v2.StreamingRecognitionResult.getDefaultInstance()
+        : recognitionResult_;
   }
 
   public static final int REPLY_TEXT_FIELD_NUMBER = 2;
-  private volatile java.lang.Object replyText_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object replyText_ = "";
   /**
    *
    *
@@ -256,7 +260,9 @@ public com.google.cloud.dialogflow.v2.OutputAudio getReplyAudio() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.OutputAudioOrBuilder getReplyAudioOrBuilder() {
-    return getReplyAudio();
+    return replyAudio_ == null
+        ? com.google.cloud.dialogflow.v2.OutputAudio.getDefaultInstance()
+        : replyAudio_;
   }
 
   public static final int AUTOMATED_AGENT_REPLY_FIELD_NUMBER = 4;
@@ -268,7 +274,9 @@ public com.google.cloud.dialogflow.v2.OutputAudioOrBuilder getReplyAudioOrBuilde
    * Only set if a Dialogflow automated agent has responded.
    * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
    * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-   * are always empty, use [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio] instead.
+   * are always empty, use
+   * [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio]
+   * instead.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 4;</code>
@@ -286,7 +294,9 @@ public boolean hasAutomatedAgentReply() {
    * Only set if a Dialogflow automated agent has responded.
    * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
    * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-   * are always empty, use [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio] instead.
+   * are always empty, use
+   * [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio]
+   * instead.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 4;</code>
@@ -306,7 +316,9 @@ public com.google.cloud.dialogflow.v2.AutomatedAgentReply getAutomatedAgentReply
    * Only set if a Dialogflow automated agent has responded.
    * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
    * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-   * are always empty, use [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio] instead.
+   * are always empty, use
+   * [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio]
+   * instead.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 4;</code>
@@ -314,7 +326,9 @@ public com.google.cloud.dialogflow.v2.AutomatedAgentReply getAutomatedAgentReply
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.AutomatedAgentReplyOrBuilder
       getAutomatedAgentReplyOrBuilder() {
-    return getAutomatedAgentReply();
+    return automatedAgentReply_ == null
+        ? com.google.cloud.dialogflow.v2.AutomatedAgentReply.getDefaultInstance()
+        : automatedAgentReply_;
   }
 
   public static final int MESSAGE_FIELD_NUMBER = 6;
@@ -362,10 +376,14 @@ public com.google.cloud.dialogflow.v2.Message getMessage() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.MessageOrBuilder getMessageOrBuilder() {
-    return getMessage();
+    return message_ == null
+        ? com.google.cloud.dialogflow.v2.Message.getDefaultInstance()
+        : message_;
   }
 
   public static final int HUMAN_AGENT_SUGGESTION_RESULTS_FIELD_NUMBER = 7;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.SuggestionResult>
       humanAgentSuggestionResults_;
   /**
@@ -373,7 +391,8 @@ public com.google.cloud.dialogflow.v2.MessageOrBuilder getMessageOrBuilder() {
    *
    * <pre>
    * The suggestions for most recent human agent. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
    * </pre>
    *
@@ -390,7 +409,8 @@ public com.google.cloud.dialogflow.v2.MessageOrBuilder getMessageOrBuilder() {
    *
    * <pre>
    * The suggestions for most recent human agent. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
    * </pre>
    *
@@ -407,7 +427,8 @@ public com.google.cloud.dialogflow.v2.MessageOrBuilder getMessageOrBuilder() {
    *
    * <pre>
    * The suggestions for most recent human agent. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
    * </pre>
    *
@@ -423,7 +444,8 @@ public int getHumanAgentSuggestionResultsCount() {
    *
    * <pre>
    * The suggestions for most recent human agent. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
    * </pre>
    *
@@ -439,7 +461,8 @@ public com.google.cloud.dialogflow.v2.SuggestionResult getHumanAgentSuggestionRe
    *
    * <pre>
    * The suggestions for most recent human agent. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
    * </pre>
    *
@@ -453,13 +476,16 @@ public com.google.cloud.dialogflow.v2.SuggestionResult getHumanAgentSuggestionRe
   }
 
   public static final int END_USER_SUGGESTION_RESULTS_FIELD_NUMBER = 8;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.SuggestionResult> endUserSuggestionResults_;
   /**
    *
    *
    * <pre>
    * The suggestions for end user. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
    * </pre>
    *
@@ -476,7 +502,8 @@ public com.google.cloud.dialogflow.v2.SuggestionResult getHumanAgentSuggestionRe
    *
    * <pre>
    * The suggestions for end user. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
    * </pre>
    *
@@ -493,7 +520,8 @@ public com.google.cloud.dialogflow.v2.SuggestionResult getHumanAgentSuggestionRe
    *
    * <pre>
    * The suggestions for end user. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
    * </pre>
    *
@@ -509,7 +537,8 @@ public int getEndUserSuggestionResultsCount() {
    *
    * <pre>
    * The suggestions for end user. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
    * </pre>
    *
@@ -525,7 +554,8 @@ public com.google.cloud.dialogflow.v2.SuggestionResult getEndUserSuggestionResul
    *
    * <pre>
    * The suggestions for end user. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
    * </pre>
    *
@@ -583,7 +613,9 @@ public com.google.cloud.dialogflow.v2.DtmfParameters getDtmfParameters() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.DtmfParametersOrBuilder getDtmfParametersOrBuilder() {
-    return getDtmfParameters();
+    return dtmfParameters_ == null
+        ? com.google.cloud.dialogflow.v2.DtmfParameters.getDefaultInstance()
+        : dtmfParameters_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -899,30 +931,26 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (recognitionResultBuilder_ == null) {
-        recognitionResult_ = null;
-      } else {
-        recognitionResult_ = null;
+      bitField0_ = 0;
+      recognitionResult_ = null;
+      if (recognitionResultBuilder_ != null) {
+        recognitionResultBuilder_.dispose();
         recognitionResultBuilder_ = null;
       }
       replyText_ = "";
-
-      if (replyAudioBuilder_ == null) {
-        replyAudio_ = null;
-      } else {
-        replyAudio_ = null;
+      replyAudio_ = null;
+      if (replyAudioBuilder_ != null) {
+        replyAudioBuilder_.dispose();
         replyAudioBuilder_ = null;
       }
-      if (automatedAgentReplyBuilder_ == null) {
-        automatedAgentReply_ = null;
-      } else {
-        automatedAgentReply_ = null;
+      automatedAgentReply_ = null;
+      if (automatedAgentReplyBuilder_ != null) {
+        automatedAgentReplyBuilder_.dispose();
         automatedAgentReplyBuilder_ = null;
       }
-      if (messageBuilder_ == null) {
-        message_ = null;
-      } else {
-        message_ = null;
+      message_ = null;
+      if (messageBuilder_ != null) {
+        messageBuilder_.dispose();
         messageBuilder_ = null;
       }
       if (humanAgentSuggestionResultsBuilder_ == null) {
@@ -931,18 +959,17 @@ public Builder clear() {
         humanAgentSuggestionResults_ = null;
         humanAgentSuggestionResultsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000020);
       if (endUserSuggestionResultsBuilder_ == null) {
         endUserSuggestionResults_ = java.util.Collections.emptyList();
       } else {
         endUserSuggestionResults_ = null;
         endUserSuggestionResultsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
-      if (dtmfParametersBuilder_ == null) {
-        dtmfParameters_ = null;
-      } else {
-        dtmfParameters_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      dtmfParameters_ = null;
+      if (dtmfParametersBuilder_ != null) {
+        dtmfParametersBuilder_.dispose();
         dtmfParametersBuilder_ = null;
       }
       return this;
@@ -973,55 +1000,66 @@ public com.google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse build() {
     public com.google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse buildPartial() {
       com.google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse result =
           new com.google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse(this);
-      int from_bitField0_ = bitField0_;
-      if (recognitionResultBuilder_ == null) {
-        result.recognitionResult_ = recognitionResult_;
-      } else {
-        result.recognitionResult_ = recognitionResultBuilder_.build();
-      }
-      result.replyText_ = replyText_;
-      if (replyAudioBuilder_ == null) {
-        result.replyAudio_ = replyAudio_;
-      } else {
-        result.replyAudio_ = replyAudioBuilder_.build();
-      }
-      if (automatedAgentReplyBuilder_ == null) {
-        result.automatedAgentReply_ = automatedAgentReply_;
-      } else {
-        result.automatedAgentReply_ = automatedAgentReplyBuilder_.build();
-      }
-      if (messageBuilder_ == null) {
-        result.message_ = message_;
-      } else {
-        result.message_ = messageBuilder_.build();
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse result) {
       if (humanAgentSuggestionResultsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000020) != 0)) {
           humanAgentSuggestionResults_ =
               java.util.Collections.unmodifiableList(humanAgentSuggestionResults_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000020);
         }
         result.humanAgentSuggestionResults_ = humanAgentSuggestionResults_;
       } else {
         result.humanAgentSuggestionResults_ = humanAgentSuggestionResultsBuilder_.build();
       }
       if (endUserSuggestionResultsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000040) != 0)) {
           endUserSuggestionResults_ =
               java.util.Collections.unmodifiableList(endUserSuggestionResults_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000040);
         }
         result.endUserSuggestionResults_ = endUserSuggestionResults_;
       } else {
         result.endUserSuggestionResults_ = endUserSuggestionResultsBuilder_.build();
       }
-      if (dtmfParametersBuilder_ == null) {
-        result.dtmfParameters_ = dtmfParameters_;
-      } else {
-        result.dtmfParameters_ = dtmfParametersBuilder_.build();
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.recognitionResult_ =
+            recognitionResultBuilder_ == null
+                ? recognitionResult_
+                : recognitionResultBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.replyText_ = replyText_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.replyAudio_ = replyAudioBuilder_ == null ? replyAudio_ : replyAudioBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.automatedAgentReply_ =
+            automatedAgentReplyBuilder_ == null
+                ? automatedAgentReply_
+                : automatedAgentReplyBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.message_ = messageBuilder_ == null ? message_ : messageBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.dtmfParameters_ =
+            dtmfParametersBuilder_ == null ? dtmfParameters_ : dtmfParametersBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -1076,6 +1114,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.StreamingAnalyzeContentR
       }
       if (!other.getReplyText().isEmpty()) {
         replyText_ = other.replyText_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasReplyAudio()) {
@@ -1091,7 +1130,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.StreamingAnalyzeContentR
         if (!other.humanAgentSuggestionResults_.isEmpty()) {
           if (humanAgentSuggestionResults_.isEmpty()) {
             humanAgentSuggestionResults_ = other.humanAgentSuggestionResults_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000020);
           } else {
             ensureHumanAgentSuggestionResultsIsMutable();
             humanAgentSuggestionResults_.addAll(other.humanAgentSuggestionResults_);
@@ -1104,7 +1143,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.StreamingAnalyzeContentR
             humanAgentSuggestionResultsBuilder_.dispose();
             humanAgentSuggestionResultsBuilder_ = null;
             humanAgentSuggestionResults_ = other.humanAgentSuggestionResults_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000020);
             humanAgentSuggestionResultsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getHumanAgentSuggestionResultsFieldBuilder()
@@ -1118,7 +1157,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.StreamingAnalyzeContentR
         if (!other.endUserSuggestionResults_.isEmpty()) {
           if (endUserSuggestionResults_.isEmpty()) {
             endUserSuggestionResults_ = other.endUserSuggestionResults_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000040);
           } else {
             ensureEndUserSuggestionResultsIsMutable();
             endUserSuggestionResults_.addAll(other.endUserSuggestionResults_);
@@ -1131,7 +1170,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.StreamingAnalyzeContentR
             endUserSuggestionResultsBuilder_.dispose();
             endUserSuggestionResultsBuilder_ = null;
             endUserSuggestionResults_ = other.endUserSuggestionResults_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000040);
             endUserSuggestionResultsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getEndUserSuggestionResultsFieldBuilder()
@@ -1174,32 +1213,32 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getRecognitionResultFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 replyText_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getReplyAudioFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(
                     getAutomatedAgentReplyFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 50:
               {
                 input.readMessage(getMessageFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 50
             case 58:
@@ -1233,7 +1272,7 @@ public Builder mergeFrom(
             case 82:
               {
                 input.readMessage(getDtmfParametersFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 82
             default:
@@ -1273,7 +1312,7 @@ public Builder mergeFrom(
      * @return Whether the recognitionResult field is set.
      */
     public boolean hasRecognitionResult() {
-      return recognitionResultBuilder_ != null || recognitionResult_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -1311,11 +1350,11 @@ public Builder setRecognitionResult(
           throw new NullPointerException();
         }
         recognitionResult_ = value;
-        onChanged();
       } else {
         recognitionResultBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -1331,11 +1370,11 @@ public Builder setRecognitionResult(
         com.google.cloud.dialogflow.v2.StreamingRecognitionResult.Builder builderForValue) {
       if (recognitionResultBuilder_ == null) {
         recognitionResult_ = builderForValue.build();
-        onChanged();
       } else {
         recognitionResultBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -1350,20 +1389,19 @@ public Builder setRecognitionResult(
     public Builder mergeRecognitionResult(
         com.google.cloud.dialogflow.v2.StreamingRecognitionResult value) {
       if (recognitionResultBuilder_ == null) {
-        if (recognitionResult_ != null) {
-          recognitionResult_ =
-              com.google.cloud.dialogflow.v2.StreamingRecognitionResult.newBuilder(
-                      recognitionResult_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && recognitionResult_ != null
+            && recognitionResult_
+                != com.google.cloud.dialogflow.v2.StreamingRecognitionResult.getDefaultInstance()) {
+          getRecognitionResultBuilder().mergeFrom(value);
         } else {
           recognitionResult_ = value;
         }
-        onChanged();
       } else {
         recognitionResultBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -1376,14 +1414,13 @@ public Builder mergeRecognitionResult(
      * <code>.google.cloud.dialogflow.v2.StreamingRecognitionResult recognition_result = 1;</code>
      */
     public Builder clearRecognitionResult() {
-      if (recognitionResultBuilder_ == null) {
-        recognitionResult_ = null;
-        onChanged();
-      } else {
-        recognitionResult_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      recognitionResult_ = null;
+      if (recognitionResultBuilder_ != null) {
+        recognitionResultBuilder_.dispose();
         recognitionResultBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1397,7 +1434,7 @@ public Builder clearRecognitionResult() {
      */
     public com.google.cloud.dialogflow.v2.StreamingRecognitionResult.Builder
         getRecognitionResultBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getRecognitionResultFieldBuilder().getBuilder();
     }
@@ -1510,8 +1547,8 @@ public Builder setReplyText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       replyText_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1528,8 +1565,8 @@ public Builder setReplyText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearReplyText() {
-
       replyText_ = getDefaultInstance().getReplyText();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1551,8 +1588,8 @@ public Builder setReplyTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       replyText_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1583,7 +1620,7 @@ public Builder setReplyTextBytes(com.google.protobuf.ByteString value) {
      * @return Whether the replyAudio field is set.
      */
     public boolean hasReplyAudio() {
-      return replyAudioBuilder_ != null || replyAudio_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1636,11 +1673,11 @@ public Builder setReplyAudio(com.google.cloud.dialogflow.v2.OutputAudio value) {
           throw new NullPointerException();
         }
         replyAudio_ = value;
-        onChanged();
       } else {
         replyAudioBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1664,11 +1701,11 @@ public Builder setReplyAudio(
         com.google.cloud.dialogflow.v2.OutputAudio.Builder builderForValue) {
       if (replyAudioBuilder_ == null) {
         replyAudio_ = builderForValue.build();
-        onChanged();
       } else {
         replyAudioBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1690,19 +1727,18 @@ public Builder setReplyAudio(
      */
     public Builder mergeReplyAudio(com.google.cloud.dialogflow.v2.OutputAudio value) {
       if (replyAudioBuilder_ == null) {
-        if (replyAudio_ != null) {
-          replyAudio_ =
-              com.google.cloud.dialogflow.v2.OutputAudio.newBuilder(replyAudio_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && replyAudio_ != null
+            && replyAudio_ != com.google.cloud.dialogflow.v2.OutputAudio.getDefaultInstance()) {
+          getReplyAudioBuilder().mergeFrom(value);
         } else {
           replyAudio_ = value;
         }
-        onChanged();
       } else {
         replyAudioBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1723,14 +1759,13 @@ public Builder mergeReplyAudio(com.google.cloud.dialogflow.v2.OutputAudio value)
      * <code>.google.cloud.dialogflow.v2.OutputAudio reply_audio = 3;</code>
      */
     public Builder clearReplyAudio() {
-      if (replyAudioBuilder_ == null) {
-        replyAudio_ = null;
-        onChanged();
-      } else {
-        replyAudio_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      replyAudio_ = null;
+      if (replyAudioBuilder_ != null) {
+        replyAudioBuilder_.dispose();
         replyAudioBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1751,7 +1786,7 @@ public Builder clearReplyAudio() {
      * <code>.google.cloud.dialogflow.v2.OutputAudio reply_audio = 3;</code>
      */
     public com.google.cloud.dialogflow.v2.OutputAudio.Builder getReplyAudioBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getReplyAudioFieldBuilder().getBuilder();
     }
@@ -1828,7 +1863,9 @@ public com.google.cloud.dialogflow.v2.OutputAudioOrBuilder getReplyAudioOrBuilde
      * Only set if a Dialogflow automated agent has responded.
      * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
      * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-     * are always empty, use [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio] instead.
+     * are always empty, use
+     * [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio]
+     * instead.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 4;</code>
@@ -1836,7 +1873,7 @@ public com.google.cloud.dialogflow.v2.OutputAudioOrBuilder getReplyAudioOrBuilde
      * @return Whether the automatedAgentReply field is set.
      */
     public boolean hasAutomatedAgentReply() {
-      return automatedAgentReplyBuilder_ != null || automatedAgentReply_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1845,7 +1882,9 @@ public boolean hasAutomatedAgentReply() {
      * Only set if a Dialogflow automated agent has responded.
      * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
      * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-     * are always empty, use [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio] instead.
+     * are always empty, use
+     * [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio]
+     * instead.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 4;</code>
@@ -1868,7 +1907,9 @@ public com.google.cloud.dialogflow.v2.AutomatedAgentReply getAutomatedAgentReply
      * Only set if a Dialogflow automated agent has responded.
      * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
      * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-     * are always empty, use [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio] instead.
+     * are always empty, use
+     * [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio]
+     * instead.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 4;</code>
@@ -1880,11 +1921,11 @@ public Builder setAutomatedAgentReply(
           throw new NullPointerException();
         }
         automatedAgentReply_ = value;
-        onChanged();
       } else {
         automatedAgentReplyBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1894,7 +1935,9 @@ public Builder setAutomatedAgentReply(
      * Only set if a Dialogflow automated agent has responded.
      * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
      * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-     * are always empty, use [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio] instead.
+     * are always empty, use
+     * [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio]
+     * instead.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 4;</code>
@@ -1903,11 +1946,11 @@ public Builder setAutomatedAgentReply(
         com.google.cloud.dialogflow.v2.AutomatedAgentReply.Builder builderForValue) {
       if (automatedAgentReplyBuilder_ == null) {
         automatedAgentReply_ = builderForValue.build();
-        onChanged();
       } else {
         automatedAgentReplyBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1917,7 +1960,9 @@ public Builder setAutomatedAgentReply(
      * Only set if a Dialogflow automated agent has responded.
      * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
      * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-     * are always empty, use [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio] instead.
+     * are always empty, use
+     * [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio]
+     * instead.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 4;</code>
@@ -1925,19 +1970,19 @@ public Builder setAutomatedAgentReply(
     public Builder mergeAutomatedAgentReply(
         com.google.cloud.dialogflow.v2.AutomatedAgentReply value) {
       if (automatedAgentReplyBuilder_ == null) {
-        if (automatedAgentReply_ != null) {
-          automatedAgentReply_ =
-              com.google.cloud.dialogflow.v2.AutomatedAgentReply.newBuilder(automatedAgentReply_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && automatedAgentReply_ != null
+            && automatedAgentReply_
+                != com.google.cloud.dialogflow.v2.AutomatedAgentReply.getDefaultInstance()) {
+          getAutomatedAgentReplyBuilder().mergeFrom(value);
         } else {
           automatedAgentReply_ = value;
         }
-        onChanged();
       } else {
         automatedAgentReplyBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1947,20 +1992,21 @@ public Builder mergeAutomatedAgentReply(
      * Only set if a Dialogflow automated agent has responded.
      * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
      * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-     * are always empty, use [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio] instead.
+     * are always empty, use
+     * [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio]
+     * instead.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 4;</code>
      */
     public Builder clearAutomatedAgentReply() {
-      if (automatedAgentReplyBuilder_ == null) {
-        automatedAgentReply_ = null;
-        onChanged();
-      } else {
-        automatedAgentReply_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      automatedAgentReply_ = null;
+      if (automatedAgentReplyBuilder_ != null) {
+        automatedAgentReplyBuilder_.dispose();
         automatedAgentReplyBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1970,14 +2016,16 @@ public Builder clearAutomatedAgentReply() {
      * Only set if a Dialogflow automated agent has responded.
      * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
      * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-     * are always empty, use [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio] instead.
+     * are always empty, use
+     * [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio]
+     * instead.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 4;</code>
      */
     public com.google.cloud.dialogflow.v2.AutomatedAgentReply.Builder
         getAutomatedAgentReplyBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getAutomatedAgentReplyFieldBuilder().getBuilder();
     }
@@ -1988,7 +2036,9 @@ public Builder clearAutomatedAgentReply() {
      * Only set if a Dialogflow automated agent has responded.
      * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
      * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-     * are always empty, use [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio] instead.
+     * are always empty, use
+     * [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio]
+     * instead.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 4;</code>
@@ -2010,7 +2060,9 @@ public Builder clearAutomatedAgentReply() {
      * Only set if a Dialogflow automated agent has responded.
      * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
      * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-     * are always empty, use [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio] instead.
+     * are always empty, use
+     * [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio]
+     * instead.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 4;</code>
@@ -2050,7 +2102,7 @@ public Builder clearAutomatedAgentReply() {
      * @return Whether the message field is set.
      */
     public boolean hasMessage() {
-      return messageBuilder_ != null || message_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -2087,11 +2139,11 @@ public Builder setMessage(com.google.cloud.dialogflow.v2.Message value) {
           throw new NullPointerException();
         }
         message_ = value;
-        onChanged();
       } else {
         messageBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2106,11 +2158,11 @@ public Builder setMessage(com.google.cloud.dialogflow.v2.Message value) {
     public Builder setMessage(com.google.cloud.dialogflow.v2.Message.Builder builderForValue) {
       if (messageBuilder_ == null) {
         message_ = builderForValue.build();
-        onChanged();
       } else {
         messageBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2124,19 +2176,18 @@ public Builder setMessage(com.google.cloud.dialogflow.v2.Message.Builder builder
      */
     public Builder mergeMessage(com.google.cloud.dialogflow.v2.Message value) {
       if (messageBuilder_ == null) {
-        if (message_ != null) {
-          message_ =
-              com.google.cloud.dialogflow.v2.Message.newBuilder(message_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && message_ != null
+            && message_ != com.google.cloud.dialogflow.v2.Message.getDefaultInstance()) {
+          getMessageBuilder().mergeFrom(value);
         } else {
           message_ = value;
         }
-        onChanged();
       } else {
         messageBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2149,14 +2200,13 @@ public Builder mergeMessage(com.google.cloud.dialogflow.v2.Message value) {
      * <code>.google.cloud.dialogflow.v2.Message message = 6;</code>
      */
     public Builder clearMessage() {
-      if (messageBuilder_ == null) {
-        message_ = null;
-        onChanged();
-      } else {
-        message_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      message_ = null;
+      if (messageBuilder_ != null) {
+        messageBuilder_.dispose();
         messageBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2169,7 +2219,7 @@ public Builder clearMessage() {
      * <code>.google.cloud.dialogflow.v2.Message message = 6;</code>
      */
     public com.google.cloud.dialogflow.v2.Message.Builder getMessageBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getMessageFieldBuilder().getBuilder();
     }
@@ -2221,11 +2271,11 @@ public com.google.cloud.dialogflow.v2.MessageOrBuilder getMessageOrBuilder() {
         humanAgentSuggestionResults_ = java.util.Collections.emptyList();
 
     private void ensureHumanAgentSuggestionResultsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000020) != 0)) {
         humanAgentSuggestionResults_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.SuggestionResult>(
                 humanAgentSuggestionResults_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000020;
       }
     }
 
@@ -2240,7 +2290,8 @@ private void ensureHumanAgentSuggestionResultsIsMutable() {
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * </pre>
      *
@@ -2261,7 +2312,8 @@ private void ensureHumanAgentSuggestionResultsIsMutable() {
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * </pre>
      *
@@ -2281,7 +2333,8 @@ public int getHumanAgentSuggestionResultsCount() {
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * </pre>
      *
@@ -2302,7 +2355,8 @@ public com.google.cloud.dialogflow.v2.SuggestionResult getHumanAgentSuggestionRe
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * </pre>
      *
@@ -2329,7 +2383,8 @@ public Builder setHumanAgentSuggestionResults(
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * </pre>
      *
@@ -2353,7 +2408,8 @@ public Builder setHumanAgentSuggestionResults(
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * </pre>
      *
@@ -2380,7 +2436,8 @@ public Builder addHumanAgentSuggestionResults(
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * </pre>
      *
@@ -2407,7 +2464,8 @@ public Builder addHumanAgentSuggestionResults(
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * </pre>
      *
@@ -2431,7 +2489,8 @@ public Builder addHumanAgentSuggestionResults(
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * </pre>
      *
@@ -2455,7 +2514,8 @@ public Builder addHumanAgentSuggestionResults(
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * </pre>
      *
@@ -2480,7 +2540,8 @@ public Builder addAllHumanAgentSuggestionResults(
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * </pre>
      *
@@ -2491,7 +2552,7 @@ public Builder addAllHumanAgentSuggestionResults(
     public Builder clearHumanAgentSuggestionResults() {
       if (humanAgentSuggestionResultsBuilder_ == null) {
         humanAgentSuggestionResults_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000020);
         onChanged();
       } else {
         humanAgentSuggestionResultsBuilder_.clear();
@@ -2503,7 +2564,8 @@ public Builder clearHumanAgentSuggestionResults() {
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * </pre>
      *
@@ -2526,7 +2588,8 @@ public Builder removeHumanAgentSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * </pre>
      *
@@ -2543,7 +2606,8 @@ public Builder removeHumanAgentSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * </pre>
      *
@@ -2564,7 +2628,8 @@ public Builder removeHumanAgentSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * </pre>
      *
@@ -2585,7 +2650,8 @@ public Builder removeHumanAgentSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * </pre>
      *
@@ -2603,7 +2669,8 @@ public Builder removeHumanAgentSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * </pre>
      *
@@ -2621,7 +2688,8 @@ public Builder removeHumanAgentSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for most recent human agent. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
      * </pre>
      *
@@ -2646,7 +2714,7 @@ public Builder removeHumanAgentSuggestionResults(int index) {
                 com.google.cloud.dialogflow.v2.SuggestionResult.Builder,
                 com.google.cloud.dialogflow.v2.SuggestionResultOrBuilder>(
                 humanAgentSuggestionResults_,
-                ((bitField0_ & 0x00000001) != 0),
+                ((bitField0_ & 0x00000020) != 0),
                 getParentForChildren(),
                 isClean());
         humanAgentSuggestionResults_ = null;
@@ -2658,11 +2726,11 @@ public Builder removeHumanAgentSuggestionResults(int index) {
         endUserSuggestionResults_ = java.util.Collections.emptyList();
 
     private void ensureEndUserSuggestionResultsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000040) != 0)) {
         endUserSuggestionResults_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.SuggestionResult>(
                 endUserSuggestionResults_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000040;
       }
     }
 
@@ -2677,7 +2745,8 @@ private void ensureEndUserSuggestionResultsIsMutable() {
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * </pre>
      *
@@ -2697,7 +2766,8 @@ private void ensureEndUserSuggestionResultsIsMutable() {
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * </pre>
      *
@@ -2716,7 +2786,8 @@ public int getEndUserSuggestionResultsCount() {
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * </pre>
      *
@@ -2735,7 +2806,8 @@ public com.google.cloud.dialogflow.v2.SuggestionResult getEndUserSuggestionResul
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * </pre>
      *
@@ -2761,7 +2833,8 @@ public Builder setEndUserSuggestionResults(
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * </pre>
      *
@@ -2784,7 +2857,8 @@ public Builder setEndUserSuggestionResults(
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * </pre>
      *
@@ -2810,7 +2884,8 @@ public Builder addEndUserSuggestionResults(
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * </pre>
      *
@@ -2836,7 +2911,8 @@ public Builder addEndUserSuggestionResults(
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * </pre>
      *
@@ -2859,7 +2935,8 @@ public Builder addEndUserSuggestionResults(
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * </pre>
      *
@@ -2882,7 +2959,8 @@ public Builder addEndUserSuggestionResults(
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * </pre>
      *
@@ -2905,7 +2983,8 @@ public Builder addAllEndUserSuggestionResults(
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * </pre>
      *
@@ -2915,7 +2994,7 @@ public Builder addAllEndUserSuggestionResults(
     public Builder clearEndUserSuggestionResults() {
       if (endUserSuggestionResultsBuilder_ == null) {
         endUserSuggestionResults_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000040);
         onChanged();
       } else {
         endUserSuggestionResultsBuilder_.clear();
@@ -2927,7 +3006,8 @@ public Builder clearEndUserSuggestionResults() {
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * </pre>
      *
@@ -2949,7 +3029,8 @@ public Builder removeEndUserSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * </pre>
      *
@@ -2965,7 +3046,8 @@ public Builder removeEndUserSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * </pre>
      *
@@ -2985,7 +3067,8 @@ public Builder removeEndUserSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * </pre>
      *
@@ -3005,7 +3088,8 @@ public Builder removeEndUserSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * </pre>
      *
@@ -3022,7 +3106,8 @@ public Builder removeEndUserSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * </pre>
      *
@@ -3039,7 +3124,8 @@ public Builder removeEndUserSuggestionResults(int index) {
      *
      * <pre>
      * The suggestions for end user. The order is the same as
-     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+     * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+     * of
      * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
      * </pre>
      *
@@ -3063,7 +3149,7 @@ public Builder removeEndUserSuggestionResults(int index) {
                 com.google.cloud.dialogflow.v2.SuggestionResult.Builder,
                 com.google.cloud.dialogflow.v2.SuggestionResultOrBuilder>(
                 endUserSuggestionResults_,
-                ((bitField0_ & 0x00000002) != 0),
+                ((bitField0_ & 0x00000040) != 0),
                 getParentForChildren(),
                 isClean());
         endUserSuggestionResults_ = null;
@@ -3089,7 +3175,7 @@ public Builder removeEndUserSuggestionResults(int index) {
      * @return Whether the dtmfParameters field is set.
      */
     public boolean hasDtmfParameters() {
-      return dtmfParametersBuilder_ != null || dtmfParameters_ != null;
+      return ((bitField0_ & 0x00000080) != 0);
     }
     /**
      *
@@ -3126,11 +3212,11 @@ public Builder setDtmfParameters(com.google.cloud.dialogflow.v2.DtmfParameters v
           throw new NullPointerException();
         }
         dtmfParameters_ = value;
-        onChanged();
       } else {
         dtmfParametersBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -3146,11 +3232,11 @@ public Builder setDtmfParameters(
         com.google.cloud.dialogflow.v2.DtmfParameters.Builder builderForValue) {
       if (dtmfParametersBuilder_ == null) {
         dtmfParameters_ = builderForValue.build();
-        onChanged();
       } else {
         dtmfParametersBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -3164,19 +3250,19 @@ public Builder setDtmfParameters(
      */
     public Builder mergeDtmfParameters(com.google.cloud.dialogflow.v2.DtmfParameters value) {
       if (dtmfParametersBuilder_ == null) {
-        if (dtmfParameters_ != null) {
-          dtmfParameters_ =
-              com.google.cloud.dialogflow.v2.DtmfParameters.newBuilder(dtmfParameters_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000080) != 0)
+            && dtmfParameters_ != null
+            && dtmfParameters_
+                != com.google.cloud.dialogflow.v2.DtmfParameters.getDefaultInstance()) {
+          getDtmfParametersBuilder().mergeFrom(value);
         } else {
           dtmfParameters_ = value;
         }
-        onChanged();
       } else {
         dtmfParametersBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -3189,14 +3275,13 @@ public Builder mergeDtmfParameters(com.google.cloud.dialogflow.v2.DtmfParameters
      * <code>.google.cloud.dialogflow.v2.DtmfParameters dtmf_parameters = 10;</code>
      */
     public Builder clearDtmfParameters() {
-      if (dtmfParametersBuilder_ == null) {
-        dtmfParameters_ = null;
-        onChanged();
-      } else {
-        dtmfParameters_ = null;
+      bitField0_ = (bitField0_ & ~0x00000080);
+      dtmfParameters_ = null;
+      if (dtmfParametersBuilder_ != null) {
+        dtmfParametersBuilder_.dispose();
         dtmfParametersBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3209,7 +3294,7 @@ public Builder clearDtmfParameters() {
      * <code>.google.cloud.dialogflow.v2.DtmfParameters dtmf_parameters = 10;</code>
      */
     public com.google.cloud.dialogflow.v2.DtmfParameters.Builder getDtmfParametersBuilder() {
-
+      bitField0_ |= 0x00000080;
       onChanged();
       return getDtmfParametersFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingAnalyzeContentResponseOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingAnalyzeContentResponseOrBuilder.java
index 3afa1f21c7e3..baca25d422dd 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingAnalyzeContentResponseOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingAnalyzeContentResponseOrBuilder.java
@@ -152,7 +152,9 @@ public interface StreamingAnalyzeContentResponseOrBuilder
    * Only set if a Dialogflow automated agent has responded.
    * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
    * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-   * are always empty, use [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio] instead.
+   * are always empty, use
+   * [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio]
+   * instead.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 4;</code>
@@ -167,7 +169,9 @@ public interface StreamingAnalyzeContentResponseOrBuilder
    * Only set if a Dialogflow automated agent has responded.
    * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
    * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-   * are always empty, use [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio] instead.
+   * are always empty, use
+   * [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio]
+   * instead.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 4;</code>
@@ -182,7 +186,9 @@ public interface StreamingAnalyzeContentResponseOrBuilder
    * Only set if a Dialogflow automated agent has responded.
    * Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
    * and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-   * are always empty, use [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio] instead.
+   * are always empty, use
+   * [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio]
+   * instead.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.AutomatedAgentReply automated_agent_reply = 4;</code>
@@ -229,7 +235,8 @@ public interface StreamingAnalyzeContentResponseOrBuilder
    *
    * <pre>
    * The suggestions for most recent human agent. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
    * </pre>
    *
@@ -243,7 +250,8 @@ public interface StreamingAnalyzeContentResponseOrBuilder
    *
    * <pre>
    * The suggestions for most recent human agent. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
    * </pre>
    *
@@ -256,7 +264,8 @@ public interface StreamingAnalyzeContentResponseOrBuilder
    *
    * <pre>
    * The suggestions for most recent human agent. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
    * </pre>
    *
@@ -269,7 +278,8 @@ public interface StreamingAnalyzeContentResponseOrBuilder
    *
    * <pre>
    * The suggestions for most recent human agent. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
    * </pre>
    *
@@ -283,7 +293,8 @@ public interface StreamingAnalyzeContentResponseOrBuilder
    *
    * <pre>
    * The suggestions for most recent human agent. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
    * </pre>
    *
@@ -298,7 +309,8 @@ com.google.cloud.dialogflow.v2.SuggestionResultOrBuilder getHumanAgentSuggestion
    *
    * <pre>
    * The suggestions for end user. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
    * </pre>
    *
@@ -311,7 +323,8 @@ com.google.cloud.dialogflow.v2.SuggestionResultOrBuilder getHumanAgentSuggestion
    *
    * <pre>
    * The suggestions for end user. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
    * </pre>
    *
@@ -324,7 +337,8 @@ com.google.cloud.dialogflow.v2.SuggestionResultOrBuilder getHumanAgentSuggestion
    *
    * <pre>
    * The suggestions for end user. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
    * </pre>
    *
@@ -337,7 +351,8 @@ com.google.cloud.dialogflow.v2.SuggestionResultOrBuilder getHumanAgentSuggestion
    *
    * <pre>
    * The suggestions for end user. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
    * </pre>
    *
@@ -351,7 +366,8 @@ com.google.cloud.dialogflow.v2.SuggestionResultOrBuilder getHumanAgentSuggestion
    *
    * <pre>
    * The suggestions for end user. The order is the same as
-   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+   * [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+   * of
    * [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
    * </pre>
    *
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequest.java
index 570cb5ae641e..66349d87a8d4 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequest.java
@@ -23,23 +23,27 @@
  *
  * <pre>
  * The top-level message sent by the client to the
- * [Sessions.StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent] method.
+ * [Sessions.StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]
+ * method.
  * Multiple request messages should be sent in order:
  * 1.  The first message must contain
  * [session][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.session],
- *     [query_input][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.query_input] plus optionally
- *     [query_params][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.query_params]. If the client
- *     wants to receive an audio response, it should also contain
+ *     [query_input][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.query_input]
+ *     plus optionally
+ *     [query_params][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.query_params].
+ *     If the client wants to receive an audio response, it should also contain
  *     [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config].
  *     The message must not contain
  *     [input_audio][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.input_audio].
- * 2.  If [query_input][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.query_input] was set to
- *     [query_input.audio_config][google.cloud.dialogflow.v2.InputAudioConfig], all subsequent
- *     messages must contain
- *     [input_audio][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.input_audio] to continue with
- *     Speech recognition.
- *     If you decide to rather detect an intent from text input after you
- *     already started Speech recognition, please send a message with
+ * 2.  If
+ * [query_input][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.query_input]
+ * was set to
+ *     [query_input.audio_config][google.cloud.dialogflow.v2.InputAudioConfig],
+ *     all subsequent messages must contain
+ *     [input_audio][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.input_audio]
+ *     to continue with Speech recognition. If you decide to rather detect an
+ *     intent from text input after you already started Speech recognition,
+ *     please send a message with
  *     [query_input.text][google.cloud.dialogflow.v2.QueryInput.text].
  *     However, note that:
  *     * Dialogflow will bill you for the audio duration so far.
@@ -93,7 +97,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SESSION_FIELD_NUMBER = 1;
-  private volatile java.lang.Object session_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object session_ = "";
   /**
    *
    *
@@ -218,7 +224,9 @@ public com.google.cloud.dialogflow.v2.QueryParameters getQueryParams() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.QueryParametersOrBuilder getQueryParamsOrBuilder() {
-    return getQueryParams();
+    return queryParams_ == null
+        ? com.google.cloud.dialogflow.v2.QueryParameters.getDefaultInstance()
+        : queryParams_;
   }
 
   public static final int QUERY_INPUT_FIELD_NUMBER = 3;
@@ -284,29 +292,32 @@ public com.google.cloud.dialogflow.v2.QueryInput getQueryInput() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.QueryInputOrBuilder getQueryInputOrBuilder() {
-    return getQueryInput();
+    return queryInput_ == null
+        ? com.google.cloud.dialogflow.v2.QueryInput.getDefaultInstance()
+        : queryInput_;
   }
 
   public static final int SINGLE_UTTERANCE_FIELD_NUMBER = 4;
-  private boolean singleUtterance_;
+  private boolean singleUtterance_ = false;
   /**
    *
    *
    * <pre>
-   * Please use [InputAudioConfig.single_utterance][google.cloud.dialogflow.v2.InputAudioConfig.single_utterance] instead.
-   * If `false` (default), recognition does not cease until
-   * the client closes the stream. If `true`, the recognizer will detect a
-   * single spoken utterance in input audio. Recognition ceases when it detects
-   * the audio's voice has stopped or paused. In this case, once a detected
-   * intent is received, the client should close the stream and start a new
-   * request with a new stream as needed.
-   * This setting is ignored when `query_input` is a piece of text or an event.
+   * Please use
+   * [InputAudioConfig.single_utterance][google.cloud.dialogflow.v2.InputAudioConfig.single_utterance]
+   * instead. If `false` (default), recognition does not cease until the client
+   * closes the stream. If `true`, the recognizer will detect a single spoken
+   * utterance in input audio. Recognition ceases when it detects the audio's
+   * voice has stopped or paused. In this case, once a detected intent is
+   * received, the client should close the stream and start a new request with a
+   * new stream as needed. This setting is ignored when `query_input` is a piece
+   * of text or an event.
    * </pre>
    *
    * <code>bool single_utterance = 4 [deprecated = true];</code>
    *
    * @deprecated google.cloud.dialogflow.v2.StreamingDetectIntentRequest.single_utterance is
-   *     deprecated. See google/cloud/dialogflow/v2/session.proto;l=457
+   *     deprecated. See google/cloud/dialogflow/v2/session.proto;l=464
    * @return The singleUtterance.
    */
   @java.lang.Override
@@ -366,7 +377,9 @@ public com.google.cloud.dialogflow.v2.OutputAudioConfig getOutputAudioConfig() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.OutputAudioConfigOrBuilder getOutputAudioConfigOrBuilder() {
-    return getOutputAudioConfig();
+    return outputAudioConfig_ == null
+        ? com.google.cloud.dialogflow.v2.OutputAudioConfig.getDefaultInstance()
+        : outputAudioConfig_;
   }
 
   public static final int OUTPUT_AUDIO_CONFIG_MASK_FIELD_NUMBER = 7;
@@ -375,11 +388,13 @@ public com.google.cloud.dialogflow.v2.OutputAudioConfigOrBuilder getOutputAudioC
    *
    *
    * <pre>
-   * Mask for [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] indicating which settings in this
-   * request-level config should override speech synthesizer settings defined at
-   * agent-level.
-   * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] replaces the agent-level
-   * config in its entirety.
+   * Mask for
+   * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+   * indicating which settings in this request-level config should override
+   * speech synthesizer settings defined at agent-level.
+   * If unspecified or empty,
+   * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+   * replaces the agent-level config in its entirety.
    * </pre>
    *
    * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
@@ -394,11 +409,13 @@ public boolean hasOutputAudioConfigMask() {
    *
    *
    * <pre>
-   * Mask for [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] indicating which settings in this
-   * request-level config should override speech synthesizer settings defined at
-   * agent-level.
-   * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] replaces the agent-level
-   * config in its entirety.
+   * Mask for
+   * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+   * indicating which settings in this request-level config should override
+   * speech synthesizer settings defined at agent-level.
+   * If unspecified or empty,
+   * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+   * replaces the agent-level config in its entirety.
    * </pre>
    *
    * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
@@ -415,22 +432,26 @@ public com.google.protobuf.FieldMask getOutputAudioConfigMask() {
    *
    *
    * <pre>
-   * Mask for [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] indicating which settings in this
-   * request-level config should override speech synthesizer settings defined at
-   * agent-level.
-   * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] replaces the agent-level
-   * config in its entirety.
+   * Mask for
+   * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+   * indicating which settings in this request-level config should override
+   * speech synthesizer settings defined at agent-level.
+   * If unspecified or empty,
+   * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+   * replaces the agent-level config in its entirety.
    * </pre>
    *
    * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getOutputAudioConfigMaskOrBuilder() {
-    return getOutputAudioConfigMask();
+    return outputAudioConfigMask_ == null
+        ? com.google.protobuf.FieldMask.getDefaultInstance()
+        : outputAudioConfigMask_;
   }
 
   public static final int INPUT_AUDIO_FIELD_NUMBER = 6;
-  private com.google.protobuf.ByteString inputAudio_;
+  private com.google.protobuf.ByteString inputAudio_ = com.google.protobuf.ByteString.EMPTY;
   /**
    *
    *
@@ -689,23 +710,27 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * The top-level message sent by the client to the
-   * [Sessions.StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent] method.
+   * [Sessions.StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]
+   * method.
    * Multiple request messages should be sent in order:
    * 1.  The first message must contain
    * [session][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.session],
-   *     [query_input][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.query_input] plus optionally
-   *     [query_params][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.query_params]. If the client
-   *     wants to receive an audio response, it should also contain
+   *     [query_input][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.query_input]
+   *     plus optionally
+   *     [query_params][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.query_params].
+   *     If the client wants to receive an audio response, it should also contain
    *     [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config].
    *     The message must not contain
    *     [input_audio][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.input_audio].
-   * 2.  If [query_input][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.query_input] was set to
-   *     [query_input.audio_config][google.cloud.dialogflow.v2.InputAudioConfig], all subsequent
-   *     messages must contain
-   *     [input_audio][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.input_audio] to continue with
-   *     Speech recognition.
-   *     If you decide to rather detect an intent from text input after you
-   *     already started Speech recognition, please send a message with
+   * 2.  If
+   * [query_input][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.query_input]
+   * was set to
+   *     [query_input.audio_config][google.cloud.dialogflow.v2.InputAudioConfig],
+   *     all subsequent messages must contain
+   *     [input_audio][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.input_audio]
+   *     to continue with Speech recognition. If you decide to rather detect an
+   *     intent from text input after you already started Speech recognition,
+   *     please send a message with
    *     [query_input.text][google.cloud.dialogflow.v2.QueryInput.text].
    *     However, note that:
    *     * Dialogflow will bill you for the audio duration so far.
@@ -746,36 +771,30 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       session_ = "";
-
-      if (queryParamsBuilder_ == null) {
-        queryParams_ = null;
-      } else {
-        queryParams_ = null;
+      queryParams_ = null;
+      if (queryParamsBuilder_ != null) {
+        queryParamsBuilder_.dispose();
         queryParamsBuilder_ = null;
       }
-      if (queryInputBuilder_ == null) {
-        queryInput_ = null;
-      } else {
-        queryInput_ = null;
+      queryInput_ = null;
+      if (queryInputBuilder_ != null) {
+        queryInputBuilder_.dispose();
         queryInputBuilder_ = null;
       }
       singleUtterance_ = false;
-
-      if (outputAudioConfigBuilder_ == null) {
-        outputAudioConfig_ = null;
-      } else {
-        outputAudioConfig_ = null;
+      outputAudioConfig_ = null;
+      if (outputAudioConfigBuilder_ != null) {
+        outputAudioConfigBuilder_.dispose();
         outputAudioConfigBuilder_ = null;
       }
-      if (outputAudioConfigMaskBuilder_ == null) {
-        outputAudioConfigMask_ = null;
-      } else {
-        outputAudioConfigMask_ = null;
+      outputAudioConfigMask_ = null;
+      if (outputAudioConfigMaskBuilder_ != null) {
+        outputAudioConfigMaskBuilder_.dispose();
         outputAudioConfigMaskBuilder_ = null;
       }
       inputAudio_ = com.google.protobuf.ByteString.EMPTY;
-
       return this;
     }
 
@@ -803,31 +822,43 @@ public com.google.cloud.dialogflow.v2.StreamingDetectIntentRequest build() {
     public com.google.cloud.dialogflow.v2.StreamingDetectIntentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.StreamingDetectIntentRequest result =
           new com.google.cloud.dialogflow.v2.StreamingDetectIntentRequest(this);
-      result.session_ = session_;
-      if (queryParamsBuilder_ == null) {
-        result.queryParams_ = queryParams_;
-      } else {
-        result.queryParams_ = queryParamsBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (queryInputBuilder_ == null) {
-        result.queryInput_ = queryInput_;
-      } else {
-        result.queryInput_ = queryInputBuilder_.build();
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.StreamingDetectIntentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.session_ = session_;
       }
-      result.singleUtterance_ = singleUtterance_;
-      if (outputAudioConfigBuilder_ == null) {
-        result.outputAudioConfig_ = outputAudioConfig_;
-      } else {
-        result.outputAudioConfig_ = outputAudioConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.queryParams_ =
+            queryParamsBuilder_ == null ? queryParams_ : queryParamsBuilder_.build();
       }
-      if (outputAudioConfigMaskBuilder_ == null) {
-        result.outputAudioConfigMask_ = outputAudioConfigMask_;
-      } else {
-        result.outputAudioConfigMask_ = outputAudioConfigMaskBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.queryInput_ = queryInputBuilder_ == null ? queryInput_ : queryInputBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.singleUtterance_ = singleUtterance_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.outputAudioConfig_ =
+            outputAudioConfigBuilder_ == null
+                ? outputAudioConfig_
+                : outputAudioConfigBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.outputAudioConfigMask_ =
+            outputAudioConfigMaskBuilder_ == null
+                ? outputAudioConfigMask_
+                : outputAudioConfigMaskBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.inputAudio_ = inputAudio_;
       }
-      result.inputAudio_ = inputAudio_;
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -878,6 +909,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.StreamingDetectIntentReq
         return this;
       if (!other.getSession().isEmpty()) {
         session_ = other.session_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasQueryParams()) {
@@ -927,45 +959,45 @@ public Builder mergeFrom(
             case 10:
               {
                 session_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getQueryParamsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getQueryInputFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 32:
               {
                 singleUtterance_ = input.readBool();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 32
             case 42:
               {
                 input.readMessage(
                     getOutputAudioConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             case 50:
               {
                 inputAudio_ = input.readBytes();
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 50
             case 58:
               {
                 input.readMessage(
                     getOutputAudioConfigMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 58
             default:
@@ -985,6 +1017,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object session_ = "";
     /**
      *
@@ -1094,8 +1128,8 @@ public Builder setSession(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       session_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1127,8 +1161,8 @@ public Builder setSession(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSession() {
-
       session_ = getDefaultInstance().getSession();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1165,8 +1199,8 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       session_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1189,7 +1223,7 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
      * @return Whether the queryParams field is set.
      */
     public boolean hasQueryParams() {
-      return queryParamsBuilder_ != null || queryParams_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -1226,11 +1260,11 @@ public Builder setQueryParams(com.google.cloud.dialogflow.v2.QueryParameters val
           throw new NullPointerException();
         }
         queryParams_ = value;
-        onChanged();
       } else {
         queryParamsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1246,11 +1280,11 @@ public Builder setQueryParams(
         com.google.cloud.dialogflow.v2.QueryParameters.Builder builderForValue) {
       if (queryParamsBuilder_ == null) {
         queryParams_ = builderForValue.build();
-        onChanged();
       } else {
         queryParamsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1264,19 +1298,19 @@ public Builder setQueryParams(
      */
     public Builder mergeQueryParams(com.google.cloud.dialogflow.v2.QueryParameters value) {
       if (queryParamsBuilder_ == null) {
-        if (queryParams_ != null) {
-          queryParams_ =
-              com.google.cloud.dialogflow.v2.QueryParameters.newBuilder(queryParams_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && queryParams_ != null
+            && queryParams_
+                != com.google.cloud.dialogflow.v2.QueryParameters.getDefaultInstance()) {
+          getQueryParamsBuilder().mergeFrom(value);
         } else {
           queryParams_ = value;
         }
-        onChanged();
       } else {
         queryParamsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1289,14 +1323,13 @@ public Builder mergeQueryParams(com.google.cloud.dialogflow.v2.QueryParameters v
      * <code>.google.cloud.dialogflow.v2.QueryParameters query_params = 2;</code>
      */
     public Builder clearQueryParams() {
-      if (queryParamsBuilder_ == null) {
-        queryParams_ = null;
-        onChanged();
-      } else {
-        queryParams_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      queryParams_ = null;
+      if (queryParamsBuilder_ != null) {
+        queryParamsBuilder_.dispose();
         queryParamsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1309,7 +1342,7 @@ public Builder clearQueryParams() {
      * <code>.google.cloud.dialogflow.v2.QueryParameters query_params = 2;</code>
      */
     public com.google.cloud.dialogflow.v2.QueryParameters.Builder getQueryParamsBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getQueryParamsFieldBuilder().getBuilder();
     }
@@ -1381,7 +1414,7 @@ public com.google.cloud.dialogflow.v2.QueryParametersOrBuilder getQueryParamsOrB
      * @return Whether the queryInput field is set.
      */
     public boolean hasQueryInput() {
-      return queryInputBuilder_ != null || queryInput_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1430,11 +1463,11 @@ public Builder setQueryInput(com.google.cloud.dialogflow.v2.QueryInput value) {
           throw new NullPointerException();
         }
         queryInput_ = value;
-        onChanged();
       } else {
         queryInputBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1456,11 +1489,11 @@ public Builder setQueryInput(
         com.google.cloud.dialogflow.v2.QueryInput.Builder builderForValue) {
       if (queryInputBuilder_ == null) {
         queryInput_ = builderForValue.build();
-        onChanged();
       } else {
         queryInputBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1480,19 +1513,18 @@ public Builder setQueryInput(
      */
     public Builder mergeQueryInput(com.google.cloud.dialogflow.v2.QueryInput value) {
       if (queryInputBuilder_ == null) {
-        if (queryInput_ != null) {
-          queryInput_ =
-              com.google.cloud.dialogflow.v2.QueryInput.newBuilder(queryInput_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && queryInput_ != null
+            && queryInput_ != com.google.cloud.dialogflow.v2.QueryInput.getDefaultInstance()) {
+          getQueryInputBuilder().mergeFrom(value);
         } else {
           queryInput_ = value;
         }
-        onChanged();
       } else {
         queryInputBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1511,14 +1543,13 @@ public Builder mergeQueryInput(com.google.cloud.dialogflow.v2.QueryInput value)
      * </code>
      */
     public Builder clearQueryInput() {
-      if (queryInputBuilder_ == null) {
-        queryInput_ = null;
-        onChanged();
-      } else {
-        queryInput_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      queryInput_ = null;
+      if (queryInputBuilder_ != null) {
+        queryInputBuilder_.dispose();
         queryInputBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1537,7 +1568,7 @@ public Builder clearQueryInput() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.QueryInput.Builder getQueryInputBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getQueryInputFieldBuilder().getBuilder();
     }
@@ -1602,20 +1633,21 @@ public com.google.cloud.dialogflow.v2.QueryInputOrBuilder getQueryInputOrBuilder
      *
      *
      * <pre>
-     * Please use [InputAudioConfig.single_utterance][google.cloud.dialogflow.v2.InputAudioConfig.single_utterance] instead.
-     * If `false` (default), recognition does not cease until
-     * the client closes the stream. If `true`, the recognizer will detect a
-     * single spoken utterance in input audio. Recognition ceases when it detects
-     * the audio's voice has stopped or paused. In this case, once a detected
-     * intent is received, the client should close the stream and start a new
-     * request with a new stream as needed.
-     * This setting is ignored when `query_input` is a piece of text or an event.
+     * Please use
+     * [InputAudioConfig.single_utterance][google.cloud.dialogflow.v2.InputAudioConfig.single_utterance]
+     * instead. If `false` (default), recognition does not cease until the client
+     * closes the stream. If `true`, the recognizer will detect a single spoken
+     * utterance in input audio. Recognition ceases when it detects the audio's
+     * voice has stopped or paused. In this case, once a detected intent is
+     * received, the client should close the stream and start a new request with a
+     * new stream as needed. This setting is ignored when `query_input` is a piece
+     * of text or an event.
      * </pre>
      *
      * <code>bool single_utterance = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.dialogflow.v2.StreamingDetectIntentRequest.single_utterance is
-     *     deprecated. See google/cloud/dialogflow/v2/session.proto;l=457
+     *     deprecated. See google/cloud/dialogflow/v2/session.proto;l=464
      * @return The singleUtterance.
      */
     @java.lang.Override
@@ -1627,20 +1659,21 @@ public boolean getSingleUtterance() {
      *
      *
      * <pre>
-     * Please use [InputAudioConfig.single_utterance][google.cloud.dialogflow.v2.InputAudioConfig.single_utterance] instead.
-     * If `false` (default), recognition does not cease until
-     * the client closes the stream. If `true`, the recognizer will detect a
-     * single spoken utterance in input audio. Recognition ceases when it detects
-     * the audio's voice has stopped or paused. In this case, once a detected
-     * intent is received, the client should close the stream and start a new
-     * request with a new stream as needed.
-     * This setting is ignored when `query_input` is a piece of text or an event.
+     * Please use
+     * [InputAudioConfig.single_utterance][google.cloud.dialogflow.v2.InputAudioConfig.single_utterance]
+     * instead. If `false` (default), recognition does not cease until the client
+     * closes the stream. If `true`, the recognizer will detect a single spoken
+     * utterance in input audio. Recognition ceases when it detects the audio's
+     * voice has stopped or paused. In this case, once a detected intent is
+     * received, the client should close the stream and start a new request with a
+     * new stream as needed. This setting is ignored when `query_input` is a piece
+     * of text or an event.
      * </pre>
      *
      * <code>bool single_utterance = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.dialogflow.v2.StreamingDetectIntentRequest.single_utterance is
-     *     deprecated. See google/cloud/dialogflow/v2/session.proto;l=457
+     *     deprecated. See google/cloud/dialogflow/v2/session.proto;l=464
      * @param value The singleUtterance to set.
      * @return This builder for chaining.
      */
@@ -1648,6 +1681,7 @@ public boolean getSingleUtterance() {
     public Builder setSingleUtterance(boolean value) {
 
       singleUtterance_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1655,25 +1689,26 @@ public Builder setSingleUtterance(boolean value) {
      *
      *
      * <pre>
-     * Please use [InputAudioConfig.single_utterance][google.cloud.dialogflow.v2.InputAudioConfig.single_utterance] instead.
-     * If `false` (default), recognition does not cease until
-     * the client closes the stream. If `true`, the recognizer will detect a
-     * single spoken utterance in input audio. Recognition ceases when it detects
-     * the audio's voice has stopped or paused. In this case, once a detected
-     * intent is received, the client should close the stream and start a new
-     * request with a new stream as needed.
-     * This setting is ignored when `query_input` is a piece of text or an event.
+     * Please use
+     * [InputAudioConfig.single_utterance][google.cloud.dialogflow.v2.InputAudioConfig.single_utterance]
+     * instead. If `false` (default), recognition does not cease until the client
+     * closes the stream. If `true`, the recognizer will detect a single spoken
+     * utterance in input audio. Recognition ceases when it detects the audio's
+     * voice has stopped or paused. In this case, once a detected intent is
+     * received, the client should close the stream and start a new request with a
+     * new stream as needed. This setting is ignored when `query_input` is a piece
+     * of text or an event.
      * </pre>
      *
      * <code>bool single_utterance = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.dialogflow.v2.StreamingDetectIntentRequest.single_utterance is
-     *     deprecated. See google/cloud/dialogflow/v2/session.proto;l=457
+     *     deprecated. See google/cloud/dialogflow/v2/session.proto;l=464
      * @return This builder for chaining.
      */
     @java.lang.Deprecated
     public Builder clearSingleUtterance() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       singleUtterance_ = false;
       onChanged();
       return this;
@@ -1699,7 +1734,7 @@ public Builder clearSingleUtterance() {
      * @return Whether the outputAudioConfig field is set.
      */
     public boolean hasOutputAudioConfig() {
-      return outputAudioConfigBuilder_ != null || outputAudioConfig_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -1740,11 +1775,11 @@ public Builder setOutputAudioConfig(com.google.cloud.dialogflow.v2.OutputAudioCo
           throw new NullPointerException();
         }
         outputAudioConfig_ = value;
-        onChanged();
       } else {
         outputAudioConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1762,11 +1797,11 @@ public Builder setOutputAudioConfig(
         com.google.cloud.dialogflow.v2.OutputAudioConfig.Builder builderForValue) {
       if (outputAudioConfigBuilder_ == null) {
         outputAudioConfig_ = builderForValue.build();
-        onChanged();
       } else {
         outputAudioConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1782,19 +1817,19 @@ public Builder setOutputAudioConfig(
      */
     public Builder mergeOutputAudioConfig(com.google.cloud.dialogflow.v2.OutputAudioConfig value) {
       if (outputAudioConfigBuilder_ == null) {
-        if (outputAudioConfig_ != null) {
-          outputAudioConfig_ =
-              com.google.cloud.dialogflow.v2.OutputAudioConfig.newBuilder(outputAudioConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && outputAudioConfig_ != null
+            && outputAudioConfig_
+                != com.google.cloud.dialogflow.v2.OutputAudioConfig.getDefaultInstance()) {
+          getOutputAudioConfigBuilder().mergeFrom(value);
         } else {
           outputAudioConfig_ = value;
         }
-        onChanged();
       } else {
         outputAudioConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1809,14 +1844,13 @@ public Builder mergeOutputAudioConfig(com.google.cloud.dialogflow.v2.OutputAudio
      * <code>.google.cloud.dialogflow.v2.OutputAudioConfig output_audio_config = 5;</code>
      */
     public Builder clearOutputAudioConfig() {
-      if (outputAudioConfigBuilder_ == null) {
-        outputAudioConfig_ = null;
-        onChanged();
-      } else {
-        outputAudioConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      outputAudioConfig_ = null;
+      if (outputAudioConfigBuilder_ != null) {
+        outputAudioConfigBuilder_.dispose();
         outputAudioConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1831,7 +1865,7 @@ public Builder clearOutputAudioConfig() {
      * <code>.google.cloud.dialogflow.v2.OutputAudioConfig output_audio_config = 5;</code>
      */
     public com.google.cloud.dialogflow.v2.OutputAudioConfig.Builder getOutputAudioConfigBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getOutputAudioConfigFieldBuilder().getBuilder();
     }
@@ -1894,11 +1928,13 @@ public com.google.cloud.dialogflow.v2.OutputAudioConfig.Builder getOutputAudioCo
      *
      *
      * <pre>
-     * Mask for [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] indicating which settings in this
-     * request-level config should override speech synthesizer settings defined at
-     * agent-level.
-     * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] replaces the agent-level
-     * config in its entirety.
+     * Mask for
+     * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+     * indicating which settings in this request-level config should override
+     * speech synthesizer settings defined at agent-level.
+     * If unspecified or empty,
+     * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+     * replaces the agent-level config in its entirety.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
@@ -1906,17 +1942,19 @@ public com.google.cloud.dialogflow.v2.OutputAudioConfig.Builder getOutputAudioCo
      * @return Whether the outputAudioConfigMask field is set.
      */
     public boolean hasOutputAudioConfigMask() {
-      return outputAudioConfigMaskBuilder_ != null || outputAudioConfigMask_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
      *
      * <pre>
-     * Mask for [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] indicating which settings in this
-     * request-level config should override speech synthesizer settings defined at
-     * agent-level.
-     * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] replaces the agent-level
-     * config in its entirety.
+     * Mask for
+     * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+     * indicating which settings in this request-level config should override
+     * speech synthesizer settings defined at agent-level.
+     * If unspecified or empty,
+     * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+     * replaces the agent-level config in its entirety.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
@@ -1936,11 +1974,13 @@ public com.google.protobuf.FieldMask getOutputAudioConfigMask() {
      *
      *
      * <pre>
-     * Mask for [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] indicating which settings in this
-     * request-level config should override speech synthesizer settings defined at
-     * agent-level.
-     * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] replaces the agent-level
-     * config in its entirety.
+     * Mask for
+     * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+     * indicating which settings in this request-level config should override
+     * speech synthesizer settings defined at agent-level.
+     * If unspecified or empty,
+     * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+     * replaces the agent-level config in its entirety.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
@@ -1951,22 +1991,24 @@ public Builder setOutputAudioConfigMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         outputAudioConfigMask_ = value;
-        onChanged();
       } else {
         outputAudioConfigMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Mask for [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] indicating which settings in this
-     * request-level config should override speech synthesizer settings defined at
-     * agent-level.
-     * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] replaces the agent-level
-     * config in its entirety.
+     * Mask for
+     * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+     * indicating which settings in this request-level config should override
+     * speech synthesizer settings defined at agent-level.
+     * If unspecified or empty,
+     * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+     * replaces the agent-level config in its entirety.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
@@ -1974,82 +2016,86 @@ public Builder setOutputAudioConfigMask(com.google.protobuf.FieldMask value) {
     public Builder setOutputAudioConfigMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (outputAudioConfigMaskBuilder_ == null) {
         outputAudioConfigMask_ = builderForValue.build();
-        onChanged();
       } else {
         outputAudioConfigMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Mask for [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] indicating which settings in this
-     * request-level config should override speech synthesizer settings defined at
-     * agent-level.
-     * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] replaces the agent-level
-     * config in its entirety.
+     * Mask for
+     * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+     * indicating which settings in this request-level config should override
+     * speech synthesizer settings defined at agent-level.
+     * If unspecified or empty,
+     * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+     * replaces the agent-level config in its entirety.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
      */
     public Builder mergeOutputAudioConfigMask(com.google.protobuf.FieldMask value) {
       if (outputAudioConfigMaskBuilder_ == null) {
-        if (outputAudioConfigMask_ != null) {
-          outputAudioConfigMask_ =
-              com.google.protobuf.FieldMask.newBuilder(outputAudioConfigMask_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && outputAudioConfigMask_ != null
+            && outputAudioConfigMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getOutputAudioConfigMaskBuilder().mergeFrom(value);
         } else {
           outputAudioConfigMask_ = value;
         }
-        onChanged();
       } else {
         outputAudioConfigMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Mask for [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] indicating which settings in this
-     * request-level config should override speech synthesizer settings defined at
-     * agent-level.
-     * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] replaces the agent-level
-     * config in its entirety.
+     * Mask for
+     * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+     * indicating which settings in this request-level config should override
+     * speech synthesizer settings defined at agent-level.
+     * If unspecified or empty,
+     * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+     * replaces the agent-level config in its entirety.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
      */
     public Builder clearOutputAudioConfigMask() {
-      if (outputAudioConfigMaskBuilder_ == null) {
-        outputAudioConfigMask_ = null;
-        onChanged();
-      } else {
-        outputAudioConfigMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      outputAudioConfigMask_ = null;
+      if (outputAudioConfigMaskBuilder_ != null) {
+        outputAudioConfigMaskBuilder_.dispose();
         outputAudioConfigMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Mask for [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] indicating which settings in this
-     * request-level config should override speech synthesizer settings defined at
-     * agent-level.
-     * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] replaces the agent-level
-     * config in its entirety.
+     * Mask for
+     * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+     * indicating which settings in this request-level config should override
+     * speech synthesizer settings defined at agent-level.
+     * If unspecified or empty,
+     * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+     * replaces the agent-level config in its entirety.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
      */
     public com.google.protobuf.FieldMask.Builder getOutputAudioConfigMaskBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getOutputAudioConfigMaskFieldBuilder().getBuilder();
     }
@@ -2057,11 +2103,13 @@ public com.google.protobuf.FieldMask.Builder getOutputAudioConfigMaskBuilder() {
      *
      *
      * <pre>
-     * Mask for [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] indicating which settings in this
-     * request-level config should override speech synthesizer settings defined at
-     * agent-level.
-     * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] replaces the agent-level
-     * config in its entirety.
+     * Mask for
+     * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+     * indicating which settings in this request-level config should override
+     * speech synthesizer settings defined at agent-level.
+     * If unspecified or empty,
+     * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+     * replaces the agent-level config in its entirety.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
@@ -2079,11 +2127,13 @@ public com.google.protobuf.FieldMaskOrBuilder getOutputAudioConfigMaskOrBuilder(
      *
      *
      * <pre>
-     * Mask for [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] indicating which settings in this
-     * request-level config should override speech synthesizer settings defined at
-     * agent-level.
-     * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] replaces the agent-level
-     * config in its entirety.
+     * Mask for
+     * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+     * indicating which settings in this request-level config should override
+     * speech synthesizer settings defined at agent-level.
+     * If unspecified or empty,
+     * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+     * replaces the agent-level config in its entirety.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
@@ -2141,8 +2191,8 @@ public Builder setInputAudio(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       inputAudio_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2160,7 +2210,7 @@ public Builder setInputAudio(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearInputAudio() {
-
+      bitField0_ = (bitField0_ & ~0x00000040);
       inputAudio_ = getDefaultInstance().getInputAudio();
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequestOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequestOrBuilder.java
index ea23b9c81331..0ebdca07c96d 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequestOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequestOrBuilder.java
@@ -172,20 +172,21 @@ public interface StreamingDetectIntentRequestOrBuilder
    *
    *
    * <pre>
-   * Please use [InputAudioConfig.single_utterance][google.cloud.dialogflow.v2.InputAudioConfig.single_utterance] instead.
-   * If `false` (default), recognition does not cease until
-   * the client closes the stream. If `true`, the recognizer will detect a
-   * single spoken utterance in input audio. Recognition ceases when it detects
-   * the audio's voice has stopped or paused. In this case, once a detected
-   * intent is received, the client should close the stream and start a new
-   * request with a new stream as needed.
-   * This setting is ignored when `query_input` is a piece of text or an event.
+   * Please use
+   * [InputAudioConfig.single_utterance][google.cloud.dialogflow.v2.InputAudioConfig.single_utterance]
+   * instead. If `false` (default), recognition does not cease until the client
+   * closes the stream. If `true`, the recognizer will detect a single spoken
+   * utterance in input audio. Recognition ceases when it detects the audio's
+   * voice has stopped or paused. In this case, once a detected intent is
+   * received, the client should close the stream and start a new request with a
+   * new stream as needed. This setting is ignored when `query_input` is a piece
+   * of text or an event.
    * </pre>
    *
    * <code>bool single_utterance = 4 [deprecated = true];</code>
    *
    * @deprecated google.cloud.dialogflow.v2.StreamingDetectIntentRequest.single_utterance is
-   *     deprecated. See google/cloud/dialogflow/v2/session.proto;l=457
+   *     deprecated. See google/cloud/dialogflow/v2/session.proto;l=464
    * @return The singleUtterance.
    */
   @java.lang.Deprecated
@@ -236,11 +237,13 @@ public interface StreamingDetectIntentRequestOrBuilder
    *
    *
    * <pre>
-   * Mask for [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] indicating which settings in this
-   * request-level config should override speech synthesizer settings defined at
-   * agent-level.
-   * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] replaces the agent-level
-   * config in its entirety.
+   * Mask for
+   * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+   * indicating which settings in this request-level config should override
+   * speech synthesizer settings defined at agent-level.
+   * If unspecified or empty,
+   * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+   * replaces the agent-level config in its entirety.
    * </pre>
    *
    * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
@@ -252,11 +255,13 @@ public interface StreamingDetectIntentRequestOrBuilder
    *
    *
    * <pre>
-   * Mask for [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] indicating which settings in this
-   * request-level config should override speech synthesizer settings defined at
-   * agent-level.
-   * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] replaces the agent-level
-   * config in its entirety.
+   * Mask for
+   * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+   * indicating which settings in this request-level config should override
+   * speech synthesizer settings defined at agent-level.
+   * If unspecified or empty,
+   * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+   * replaces the agent-level config in its entirety.
    * </pre>
    *
    * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
@@ -268,11 +273,13 @@ public interface StreamingDetectIntentRequestOrBuilder
    *
    *
    * <pre>
-   * Mask for [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] indicating which settings in this
-   * request-level config should override speech synthesizer settings defined at
-   * agent-level.
-   * If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] replaces the agent-level
-   * config in its entirety.
+   * Mask for
+   * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+   * indicating which settings in this request-level config should override
+   * speech synthesizer settings defined at agent-level.
+   * If unspecified or empty,
+   * [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+   * replaces the agent-level config in its entirety.
    * </pre>
    *
    * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentResponse.java
index 03f2c83cedcc..4d16333559ad 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentResponse.java
@@ -28,8 +28,9 @@
  * 1.  If the `StreamingDetectIntentRequest.input_audio` field was
  *     set, the `recognition_result` field is populated for one
  *     or more messages.
- *     See the [StreamingRecognitionResult][google.cloud.dialogflow.v2.StreamingRecognitionResult] message for details
- *     about the result message sequence.
+ *     See the
+ *     [StreamingRecognitionResult][google.cloud.dialogflow.v2.StreamingRecognitionResult]
+ *     message for details about the result message sequence.
  * 2.  The next message contains `response_id`, `query_result`
  *     and optionally `webhook_status` if a WebHook was called.
  * </pre>
@@ -78,7 +79,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RESPONSE_ID_FIELD_NUMBER = 1;
-  private volatile java.lang.Object responseId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object responseId_ = "";
   /**
    *
    *
@@ -174,7 +177,9 @@ public com.google.cloud.dialogflow.v2.StreamingRecognitionResult getRecognitionR
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.StreamingRecognitionResultOrBuilder
       getRecognitionResultOrBuilder() {
-    return getRecognitionResult();
+    return recognitionResult_ == null
+        ? com.google.cloud.dialogflow.v2.StreamingRecognitionResult.getDefaultInstance()
+        : recognitionResult_;
   }
 
   public static final int QUERY_RESULT_FIELD_NUMBER = 3;
@@ -222,7 +227,9 @@ public com.google.cloud.dialogflow.v2.QueryResult getQueryResult() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.QueryResultOrBuilder getQueryResultOrBuilder() {
-    return getQueryResult();
+    return queryResult_ == null
+        ? com.google.cloud.dialogflow.v2.QueryResult.getDefaultInstance()
+        : queryResult_;
   }
 
   public static final int WEBHOOK_STATUS_FIELD_NUMBER = 4;
@@ -268,11 +275,11 @@ public com.google.rpc.Status getWebhookStatus() {
    */
   @java.lang.Override
   public com.google.rpc.StatusOrBuilder getWebhookStatusOrBuilder() {
-    return getWebhookStatus();
+    return webhookStatus_ == null ? com.google.rpc.Status.getDefaultInstance() : webhookStatus_;
   }
 
   public static final int OUTPUT_AUDIO_FIELD_NUMBER = 5;
-  private com.google.protobuf.ByteString outputAudio_;
+  private com.google.protobuf.ByteString outputAudio_ = com.google.protobuf.ByteString.EMPTY;
   /**
    *
    *
@@ -342,7 +349,9 @@ public com.google.cloud.dialogflow.v2.OutputAudioConfig getOutputAudioConfig() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.OutputAudioConfigOrBuilder getOutputAudioConfigOrBuilder() {
-    return getOutputAudioConfig();
+    return outputAudioConfig_ == null
+        ? com.google.cloud.dialogflow.v2.OutputAudioConfig.getDefaultInstance()
+        : outputAudioConfig_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -580,8 +589,9 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * 1.  If the `StreamingDetectIntentRequest.input_audio` field was
    *     set, the `recognition_result` field is populated for one
    *     or more messages.
-   *     See the [StreamingRecognitionResult][google.cloud.dialogflow.v2.StreamingRecognitionResult] message for details
-   *     about the result message sequence.
+   *     See the
+   *     [StreamingRecognitionResult][google.cloud.dialogflow.v2.StreamingRecognitionResult]
+   *     message for details about the result message sequence.
    * 2.  The next message contains `response_id`, `query_result`
    *     and optionally `webhook_status` if a WebHook was called.
    * </pre>
@@ -617,32 +627,27 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       responseId_ = "";
-
-      if (recognitionResultBuilder_ == null) {
-        recognitionResult_ = null;
-      } else {
-        recognitionResult_ = null;
+      recognitionResult_ = null;
+      if (recognitionResultBuilder_ != null) {
+        recognitionResultBuilder_.dispose();
         recognitionResultBuilder_ = null;
       }
-      if (queryResultBuilder_ == null) {
-        queryResult_ = null;
-      } else {
-        queryResult_ = null;
+      queryResult_ = null;
+      if (queryResultBuilder_ != null) {
+        queryResultBuilder_.dispose();
         queryResultBuilder_ = null;
       }
-      if (webhookStatusBuilder_ == null) {
-        webhookStatus_ = null;
-      } else {
-        webhookStatus_ = null;
+      webhookStatus_ = null;
+      if (webhookStatusBuilder_ != null) {
+        webhookStatusBuilder_.dispose();
         webhookStatusBuilder_ = null;
       }
       outputAudio_ = com.google.protobuf.ByteString.EMPTY;
-
-      if (outputAudioConfigBuilder_ == null) {
-        outputAudioConfig_ = null;
-      } else {
-        outputAudioConfig_ = null;
+      outputAudioConfig_ = null;
+      if (outputAudioConfigBuilder_ != null) {
+        outputAudioConfigBuilder_.dispose();
         outputAudioConfigBuilder_ = null;
       }
       return this;
@@ -673,30 +678,42 @@ public com.google.cloud.dialogflow.v2.StreamingDetectIntentResponse build() {
     public com.google.cloud.dialogflow.v2.StreamingDetectIntentResponse buildPartial() {
       com.google.cloud.dialogflow.v2.StreamingDetectIntentResponse result =
           new com.google.cloud.dialogflow.v2.StreamingDetectIntentResponse(this);
-      result.responseId_ = responseId_;
-      if (recognitionResultBuilder_ == null) {
-        result.recognitionResult_ = recognitionResult_;
-      } else {
-        result.recognitionResult_ = recognitionResultBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (queryResultBuilder_ == null) {
-        result.queryResult_ = queryResult_;
-      } else {
-        result.queryResult_ = queryResultBuilder_.build();
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.StreamingDetectIntentResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.responseId_ = responseId_;
       }
-      if (webhookStatusBuilder_ == null) {
-        result.webhookStatus_ = webhookStatus_;
-      } else {
-        result.webhookStatus_ = webhookStatusBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.recognitionResult_ =
+            recognitionResultBuilder_ == null
+                ? recognitionResult_
+                : recognitionResultBuilder_.build();
       }
-      result.outputAudio_ = outputAudio_;
-      if (outputAudioConfigBuilder_ == null) {
-        result.outputAudioConfig_ = outputAudioConfig_;
-      } else {
-        result.outputAudioConfig_ = outputAudioConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.queryResult_ =
+            queryResultBuilder_ == null ? queryResult_ : queryResultBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.webhookStatus_ =
+            webhookStatusBuilder_ == null ? webhookStatus_ : webhookStatusBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.outputAudio_ = outputAudio_;
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.outputAudioConfig_ =
+            outputAudioConfigBuilder_ == null
+                ? outputAudioConfig_
+                : outputAudioConfigBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -748,6 +765,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.StreamingDetectIntentRes
         return this;
       if (!other.getResponseId().isEmpty()) {
         responseId_ = other.responseId_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasRecognitionResult()) {
@@ -794,39 +812,39 @@ public Builder mergeFrom(
             case 10:
               {
                 responseId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(
                     getRecognitionResultFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getQueryResultFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(getWebhookStatusFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 42:
               {
                 outputAudio_ = input.readBytes();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             case 50:
               {
                 input.readMessage(
                     getOutputAudioConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 50
             default:
@@ -846,6 +864,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object responseId_ = "";
     /**
      *
@@ -910,8 +930,8 @@ public Builder setResponseId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       responseId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -928,8 +948,8 @@ public Builder setResponseId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearResponseId() {
-
       responseId_ = getDefaultInstance().getResponseId();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -951,8 +971,8 @@ public Builder setResponseIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       responseId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -975,7 +995,7 @@ public Builder setResponseIdBytes(com.google.protobuf.ByteString value) {
      * @return Whether the recognitionResult field is set.
      */
     public boolean hasRecognitionResult() {
-      return recognitionResultBuilder_ != null || recognitionResult_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -1013,11 +1033,11 @@ public Builder setRecognitionResult(
           throw new NullPointerException();
         }
         recognitionResult_ = value;
-        onChanged();
       } else {
         recognitionResultBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1033,11 +1053,11 @@ public Builder setRecognitionResult(
         com.google.cloud.dialogflow.v2.StreamingRecognitionResult.Builder builderForValue) {
       if (recognitionResultBuilder_ == null) {
         recognitionResult_ = builderForValue.build();
-        onChanged();
       } else {
         recognitionResultBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1052,20 +1072,19 @@ public Builder setRecognitionResult(
     public Builder mergeRecognitionResult(
         com.google.cloud.dialogflow.v2.StreamingRecognitionResult value) {
       if (recognitionResultBuilder_ == null) {
-        if (recognitionResult_ != null) {
-          recognitionResult_ =
-              com.google.cloud.dialogflow.v2.StreamingRecognitionResult.newBuilder(
-                      recognitionResult_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && recognitionResult_ != null
+            && recognitionResult_
+                != com.google.cloud.dialogflow.v2.StreamingRecognitionResult.getDefaultInstance()) {
+          getRecognitionResultBuilder().mergeFrom(value);
         } else {
           recognitionResult_ = value;
         }
-        onChanged();
       } else {
         recognitionResultBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1078,14 +1097,13 @@ public Builder mergeRecognitionResult(
      * <code>.google.cloud.dialogflow.v2.StreamingRecognitionResult recognition_result = 2;</code>
      */
     public Builder clearRecognitionResult() {
-      if (recognitionResultBuilder_ == null) {
-        recognitionResult_ = null;
-        onChanged();
-      } else {
-        recognitionResult_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      recognitionResult_ = null;
+      if (recognitionResultBuilder_ != null) {
+        recognitionResultBuilder_.dispose();
         recognitionResultBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1099,7 +1117,7 @@ public Builder clearRecognitionResult() {
      */
     public com.google.cloud.dialogflow.v2.StreamingRecognitionResult.Builder
         getRecognitionResultBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getRecognitionResultFieldBuilder().getBuilder();
     }
@@ -1166,7 +1184,7 @@ public Builder clearRecognitionResult() {
      * @return Whether the queryResult field is set.
      */
     public boolean hasQueryResult() {
-      return queryResultBuilder_ != null || queryResult_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1203,11 +1221,11 @@ public Builder setQueryResult(com.google.cloud.dialogflow.v2.QueryResult value)
           throw new NullPointerException();
         }
         queryResult_ = value;
-        onChanged();
       } else {
         queryResultBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1223,11 +1241,11 @@ public Builder setQueryResult(
         com.google.cloud.dialogflow.v2.QueryResult.Builder builderForValue) {
       if (queryResultBuilder_ == null) {
         queryResult_ = builderForValue.build();
-        onChanged();
       } else {
         queryResultBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1241,19 +1259,18 @@ public Builder setQueryResult(
      */
     public Builder mergeQueryResult(com.google.cloud.dialogflow.v2.QueryResult value) {
       if (queryResultBuilder_ == null) {
-        if (queryResult_ != null) {
-          queryResult_ =
-              com.google.cloud.dialogflow.v2.QueryResult.newBuilder(queryResult_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && queryResult_ != null
+            && queryResult_ != com.google.cloud.dialogflow.v2.QueryResult.getDefaultInstance()) {
+          getQueryResultBuilder().mergeFrom(value);
         } else {
           queryResult_ = value;
         }
-        onChanged();
       } else {
         queryResultBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1266,14 +1283,13 @@ public Builder mergeQueryResult(com.google.cloud.dialogflow.v2.QueryResult value
      * <code>.google.cloud.dialogflow.v2.QueryResult query_result = 3;</code>
      */
     public Builder clearQueryResult() {
-      if (queryResultBuilder_ == null) {
-        queryResult_ = null;
-        onChanged();
-      } else {
-        queryResult_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      queryResult_ = null;
+      if (queryResultBuilder_ != null) {
+        queryResultBuilder_.dispose();
         queryResultBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1286,7 +1302,7 @@ public Builder clearQueryResult() {
      * <code>.google.cloud.dialogflow.v2.QueryResult query_result = 3;</code>
      */
     public com.google.cloud.dialogflow.v2.QueryResult.Builder getQueryResultBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getQueryResultFieldBuilder().getBuilder();
     }
@@ -1350,7 +1366,7 @@ public com.google.cloud.dialogflow.v2.QueryResultOrBuilder getQueryResultOrBuild
      * @return Whether the webhookStatus field is set.
      */
     public boolean hasWebhookStatus() {
-      return webhookStatusBuilder_ != null || webhookStatus_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1385,11 +1401,11 @@ public Builder setWebhookStatus(com.google.rpc.Status value) {
           throw new NullPointerException();
         }
         webhookStatus_ = value;
-        onChanged();
       } else {
         webhookStatusBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1404,11 +1420,11 @@ public Builder setWebhookStatus(com.google.rpc.Status value) {
     public Builder setWebhookStatus(com.google.rpc.Status.Builder builderForValue) {
       if (webhookStatusBuilder_ == null) {
         webhookStatus_ = builderForValue.build();
-        onChanged();
       } else {
         webhookStatusBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1422,17 +1438,18 @@ public Builder setWebhookStatus(com.google.rpc.Status.Builder builderForValue) {
      */
     public Builder mergeWebhookStatus(com.google.rpc.Status value) {
       if (webhookStatusBuilder_ == null) {
-        if (webhookStatus_ != null) {
-          webhookStatus_ =
-              com.google.rpc.Status.newBuilder(webhookStatus_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && webhookStatus_ != null
+            && webhookStatus_ != com.google.rpc.Status.getDefaultInstance()) {
+          getWebhookStatusBuilder().mergeFrom(value);
         } else {
           webhookStatus_ = value;
         }
-        onChanged();
       } else {
         webhookStatusBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1445,14 +1462,13 @@ public Builder mergeWebhookStatus(com.google.rpc.Status value) {
      * <code>.google.rpc.Status webhook_status = 4;</code>
      */
     public Builder clearWebhookStatus() {
-      if (webhookStatusBuilder_ == null) {
-        webhookStatus_ = null;
-        onChanged();
-      } else {
-        webhookStatus_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      webhookStatus_ = null;
+      if (webhookStatusBuilder_ != null) {
+        webhookStatusBuilder_.dispose();
         webhookStatusBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1465,7 +1481,7 @@ public Builder clearWebhookStatus() {
      * <code>.google.rpc.Status webhook_status = 4;</code>
      */
     public com.google.rpc.Status.Builder getWebhookStatusBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getWebhookStatusFieldBuilder().getBuilder();
     }
@@ -1557,8 +1573,8 @@ public Builder setOutputAudio(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       outputAudio_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1582,7 +1598,7 @@ public Builder setOutputAudio(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearOutputAudio() {
-
+      bitField0_ = (bitField0_ & ~0x00000010);
       outputAudio_ = getDefaultInstance().getOutputAudio();
       onChanged();
       return this;
@@ -1606,7 +1622,7 @@ public Builder clearOutputAudio() {
      * @return Whether the outputAudioConfig field is set.
      */
     public boolean hasOutputAudioConfig() {
-      return outputAudioConfigBuilder_ != null || outputAudioConfig_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -1643,11 +1659,11 @@ public Builder setOutputAudioConfig(com.google.cloud.dialogflow.v2.OutputAudioCo
           throw new NullPointerException();
         }
         outputAudioConfig_ = value;
-        onChanged();
       } else {
         outputAudioConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1663,11 +1679,11 @@ public Builder setOutputAudioConfig(
         com.google.cloud.dialogflow.v2.OutputAudioConfig.Builder builderForValue) {
       if (outputAudioConfigBuilder_ == null) {
         outputAudioConfig_ = builderForValue.build();
-        onChanged();
       } else {
         outputAudioConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1681,19 +1697,19 @@ public Builder setOutputAudioConfig(
      */
     public Builder mergeOutputAudioConfig(com.google.cloud.dialogflow.v2.OutputAudioConfig value) {
       if (outputAudioConfigBuilder_ == null) {
-        if (outputAudioConfig_ != null) {
-          outputAudioConfig_ =
-              com.google.cloud.dialogflow.v2.OutputAudioConfig.newBuilder(outputAudioConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && outputAudioConfig_ != null
+            && outputAudioConfig_
+                != com.google.cloud.dialogflow.v2.OutputAudioConfig.getDefaultInstance()) {
+          getOutputAudioConfigBuilder().mergeFrom(value);
         } else {
           outputAudioConfig_ = value;
         }
-        onChanged();
       } else {
         outputAudioConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1706,14 +1722,13 @@ public Builder mergeOutputAudioConfig(com.google.cloud.dialogflow.v2.OutputAudio
      * <code>.google.cloud.dialogflow.v2.OutputAudioConfig output_audio_config = 6;</code>
      */
     public Builder clearOutputAudioConfig() {
-      if (outputAudioConfigBuilder_ == null) {
-        outputAudioConfig_ = null;
-        onChanged();
-      } else {
-        outputAudioConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      outputAudioConfig_ = null;
+      if (outputAudioConfigBuilder_ != null) {
+        outputAudioConfigBuilder_.dispose();
         outputAudioConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1726,7 +1741,7 @@ public Builder clearOutputAudioConfig() {
      * <code>.google.cloud.dialogflow.v2.OutputAudioConfig output_audio_config = 6;</code>
      */
     public com.google.cloud.dialogflow.v2.OutputAudioConfig.Builder getOutputAudioConfigBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getOutputAudioConfigFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingRecognitionResult.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingRecognitionResult.java
index 7b78e484a434..acbc7658e552 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingRecognitionResult.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingRecognitionResult.java
@@ -136,11 +136,12 @@ public enum MessageType implements com.google.protobuf.ProtocolMessageEnum {
      * <pre>
      * Event indicates that the server has detected the end of the user's speech
      * utterance and expects no additional inputs.
-     * Therefore, the server will not process additional audio (although it may subsequently return additional results). The
-     * client should stop sending additional audio data, half-close the gRPC
-     * connection, and wait for any additional results until the server closes
-     * the gRPC connection. This message is only sent if `single_utterance` was
-     * set to `true`, and is not used otherwise.
+     * Therefore, the server will not process additional audio (although it may
+     * subsequently return additional results). The client should stop sending
+     * additional audio data, half-close the gRPC connection, and wait for any
+     * additional results until the server closes the gRPC connection. This
+     * message is only sent if `single_utterance` was set to `true`, and is not
+     * used otherwise.
      * </pre>
      *
      * <code>END_OF_SINGLE_UTTERANCE = 2;</code>
@@ -175,11 +176,12 @@ public enum MessageType implements com.google.protobuf.ProtocolMessageEnum {
      * <pre>
      * Event indicates that the server has detected the end of the user's speech
      * utterance and expects no additional inputs.
-     * Therefore, the server will not process additional audio (although it may subsequently return additional results). The
-     * client should stop sending additional audio data, half-close the gRPC
-     * connection, and wait for any additional results until the server closes
-     * the gRPC connection. This message is only sent if `single_utterance` was
-     * set to `true`, and is not used otherwise.
+     * Therefore, the server will not process additional audio (although it may
+     * subsequently return additional results). The client should stop sending
+     * additional audio data, half-close the gRPC connection, and wait for any
+     * additional results until the server closes the gRPC connection. This
+     * message is only sent if `single_utterance` was set to `true`, and is not
+     * used otherwise.
      * </pre>
      *
      * <code>END_OF_SINGLE_UTTERANCE = 2;</code>
@@ -272,7 +274,7 @@ private MessageType(int value) {
   }
 
   public static final int MESSAGE_TYPE_FIELD_NUMBER = 1;
-  private int messageType_;
+  private int messageType_ = 0;
   /**
    *
    *
@@ -303,16 +305,18 @@ public int getMessageTypeValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.StreamingRecognitionResult.MessageType getMessageType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.StreamingRecognitionResult.MessageType result =
-        com.google.cloud.dialogflow.v2.StreamingRecognitionResult.MessageType.valueOf(messageType_);
+        com.google.cloud.dialogflow.v2.StreamingRecognitionResult.MessageType.forNumber(
+            messageType_);
     return result == null
         ? com.google.cloud.dialogflow.v2.StreamingRecognitionResult.MessageType.UNRECOGNIZED
         : result;
   }
 
   public static final int TRANSCRIPT_FIELD_NUMBER = 2;
-  private volatile java.lang.Object transcript_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object transcript_ = "";
   /**
    *
    *
@@ -363,7 +367,7 @@ public com.google.protobuf.ByteString getTranscriptBytes() {
   }
 
   public static final int IS_FINAL_FIELD_NUMBER = 3;
-  private boolean isFinal_;
+  private boolean isFinal_ = false;
   /**
    *
    *
@@ -384,7 +388,7 @@ public boolean getIsFinal() {
   }
 
   public static final int CONFIDENCE_FIELD_NUMBER = 4;
-  private float confidence_;
+  private float confidence_ = 0F;
   /**
    *
    *
@@ -407,13 +411,16 @@ public float getConfidence() {
   }
 
   public static final int SPEECH_WORD_INFO_FIELD_NUMBER = 7;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.SpeechWordInfo> speechWordInfo_;
   /**
    *
    *
    * <pre>
    * Word-specific information for the words recognized by Speech in
-   * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+   * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+   * Populated if and only if `message_type` = `TRANSCRIPT` and
    * [InputAudioConfig.enable_word_info] is set.
    * </pre>
    *
@@ -428,7 +435,8 @@ public java.util.List<com.google.cloud.dialogflow.v2.SpeechWordInfo> getSpeechWo
    *
    * <pre>
    * Word-specific information for the words recognized by Speech in
-   * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+   * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+   * Populated if and only if `message_type` = `TRANSCRIPT` and
    * [InputAudioConfig.enable_word_info] is set.
    * </pre>
    *
@@ -444,7 +452,8 @@ public java.util.List<com.google.cloud.dialogflow.v2.SpeechWordInfo> getSpeechWo
    *
    * <pre>
    * Word-specific information for the words recognized by Speech in
-   * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+   * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+   * Populated if and only if `message_type` = `TRANSCRIPT` and
    * [InputAudioConfig.enable_word_info] is set.
    * </pre>
    *
@@ -459,7 +468,8 @@ public int getSpeechWordInfoCount() {
    *
    * <pre>
    * Word-specific information for the words recognized by Speech in
-   * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+   * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+   * Populated if and only if `message_type` = `TRANSCRIPT` and
    * [InputAudioConfig.enable_word_info] is set.
    * </pre>
    *
@@ -474,7 +484,8 @@ public com.google.cloud.dialogflow.v2.SpeechWordInfo getSpeechWordInfo(int index
    *
    * <pre>
    * Word-specific information for the words recognized by Speech in
-   * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+   * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+   * Populated if and only if `message_type` = `TRANSCRIPT` and
    * [InputAudioConfig.enable_word_info] is set.
    * </pre>
    *
@@ -534,11 +545,15 @@ public com.google.protobuf.Duration getSpeechEndOffset() {
    */
   @java.lang.Override
   public com.google.protobuf.DurationOrBuilder getSpeechEndOffsetOrBuilder() {
-    return getSpeechEndOffset();
+    return speechEndOffset_ == null
+        ? com.google.protobuf.Duration.getDefaultInstance()
+        : speechEndOffset_;
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 10;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -882,29 +897,24 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       messageType_ = 0;
-
       transcript_ = "";
-
       isFinal_ = false;
-
       confidence_ = 0F;
-
       if (speechWordInfoBuilder_ == null) {
         speechWordInfo_ = java.util.Collections.emptyList();
       } else {
         speechWordInfo_ = null;
         speechWordInfoBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
-      if (speechEndOffsetBuilder_ == null) {
-        speechEndOffset_ = null;
-      } else {
-        speechEndOffset_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      speechEndOffset_ = null;
+      if (speechEndOffsetBuilder_ != null) {
+        speechEndOffsetBuilder_.dispose();
         speechEndOffsetBuilder_ = null;
       }
       languageCode_ = "";
-
       return this;
     }
 
@@ -932,28 +942,48 @@ public com.google.cloud.dialogflow.v2.StreamingRecognitionResult build() {
     public com.google.cloud.dialogflow.v2.StreamingRecognitionResult buildPartial() {
       com.google.cloud.dialogflow.v2.StreamingRecognitionResult result =
           new com.google.cloud.dialogflow.v2.StreamingRecognitionResult(this);
-      int from_bitField0_ = bitField0_;
-      result.messageType_ = messageType_;
-      result.transcript_ = transcript_;
-      result.isFinal_ = isFinal_;
-      result.confidence_ = confidence_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.StreamingRecognitionResult result) {
       if (speechWordInfoBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000010) != 0)) {
           speechWordInfo_ = java.util.Collections.unmodifiableList(speechWordInfo_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000010);
         }
         result.speechWordInfo_ = speechWordInfo_;
       } else {
         result.speechWordInfo_ = speechWordInfoBuilder_.build();
       }
-      if (speechEndOffsetBuilder_ == null) {
-        result.speechEndOffset_ = speechEndOffset_;
-      } else {
-        result.speechEndOffset_ = speechEndOffsetBuilder_.build();
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.StreamingRecognitionResult result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.messageType_ = messageType_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.transcript_ = transcript_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.isFinal_ = isFinal_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.confidence_ = confidence_;
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.speechEndOffset_ =
+            speechEndOffsetBuilder_ == null ? speechEndOffset_ : speechEndOffsetBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.languageCode_ = languageCode_;
       }
-      result.languageCode_ = languageCode_;
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -1007,6 +1037,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.StreamingRecognitionResu
       }
       if (!other.getTranscript().isEmpty()) {
         transcript_ = other.transcript_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getIsFinal() != false) {
@@ -1019,7 +1050,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.StreamingRecognitionResu
         if (!other.speechWordInfo_.isEmpty()) {
           if (speechWordInfo_.isEmpty()) {
             speechWordInfo_ = other.speechWordInfo_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
             ensureSpeechWordInfoIsMutable();
             speechWordInfo_.addAll(other.speechWordInfo_);
@@ -1032,7 +1063,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.StreamingRecognitionResu
             speechWordInfoBuilder_.dispose();
             speechWordInfoBuilder_ = null;
             speechWordInfo_ = other.speechWordInfo_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
             speechWordInfoBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getSpeechWordInfoFieldBuilder()
@@ -1047,6 +1078,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.StreamingRecognitionResu
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000040;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -1078,25 +1110,25 @@ public Builder mergeFrom(
             case 8:
               {
                 messageType_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 18:
               {
                 transcript_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 isFinal_ = input.readBool();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 37:
               {
                 confidence_ = input.readFloat();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 37
             case 58:
@@ -1115,13 +1147,13 @@ public Builder mergeFrom(
             case 66:
               {
                 input.readMessage(getSpeechEndOffsetFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 66
             case 82:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 82
             default:
@@ -1174,8 +1206,8 @@ public int getMessageTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setMessageTypeValue(int value) {
-
       messageType_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1193,9 +1225,8 @@ public Builder setMessageTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.StreamingRecognitionResult.MessageType getMessageType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.StreamingRecognitionResult.MessageType result =
-          com.google.cloud.dialogflow.v2.StreamingRecognitionResult.MessageType.valueOf(
+          com.google.cloud.dialogflow.v2.StreamingRecognitionResult.MessageType.forNumber(
               messageType_);
       return result == null
           ? com.google.cloud.dialogflow.v2.StreamingRecognitionResult.MessageType.UNRECOGNIZED
@@ -1219,7 +1250,7 @@ public Builder setMessageType(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       messageType_ = value.getNumber();
       onChanged();
       return this;
@@ -1237,7 +1268,7 @@ public Builder setMessageType(
      * @return This builder for chaining.
      */
     public Builder clearMessageType() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       messageType_ = 0;
       onChanged();
       return this;
@@ -1307,8 +1338,8 @@ public Builder setTranscript(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       transcript_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1325,8 +1356,8 @@ public Builder setTranscript(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTranscript() {
-
       transcript_ = getDefaultInstance().getTranscript();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1348,8 +1379,8 @@ public Builder setTranscriptBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       transcript_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1391,6 +1422,7 @@ public boolean getIsFinal() {
     public Builder setIsFinal(boolean value) {
 
       isFinal_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1409,7 +1441,7 @@ public Builder setIsFinal(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearIsFinal() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       isFinal_ = false;
       onChanged();
       return this;
@@ -1456,6 +1488,7 @@ public float getConfidence() {
     public Builder setConfidence(float value) {
 
       confidence_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1476,7 +1509,7 @@ public Builder setConfidence(float value) {
      * @return This builder for chaining.
      */
     public Builder clearConfidence() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       confidence_ = 0F;
       onChanged();
       return this;
@@ -1486,10 +1519,10 @@ public Builder clearConfidence() {
         java.util.Collections.emptyList();
 
     private void ensureSpeechWordInfoIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         speechWordInfo_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.SpeechWordInfo>(speechWordInfo_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000010;
       }
     }
 
@@ -1504,7 +1537,8 @@ private void ensureSpeechWordInfoIsMutable() {
      *
      * <pre>
      * Word-specific information for the words recognized by Speech in
-     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+     * Populated if and only if `message_type` = `TRANSCRIPT` and
      * [InputAudioConfig.enable_word_info] is set.
      * </pre>
      *
@@ -1522,7 +1556,8 @@ public java.util.List<com.google.cloud.dialogflow.v2.SpeechWordInfo> getSpeechWo
      *
      * <pre>
      * Word-specific information for the words recognized by Speech in
-     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+     * Populated if and only if `message_type` = `TRANSCRIPT` and
      * [InputAudioConfig.enable_word_info] is set.
      * </pre>
      *
@@ -1540,7 +1575,8 @@ public int getSpeechWordInfoCount() {
      *
      * <pre>
      * Word-specific information for the words recognized by Speech in
-     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+     * Populated if and only if `message_type` = `TRANSCRIPT` and
      * [InputAudioConfig.enable_word_info] is set.
      * </pre>
      *
@@ -1558,7 +1594,8 @@ public com.google.cloud.dialogflow.v2.SpeechWordInfo getSpeechWordInfo(int index
      *
      * <pre>
      * Word-specific information for the words recognized by Speech in
-     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+     * Populated if and only if `message_type` = `TRANSCRIPT` and
      * [InputAudioConfig.enable_word_info] is set.
      * </pre>
      *
@@ -1583,7 +1620,8 @@ public Builder setSpeechWordInfo(
      *
      * <pre>
      * Word-specific information for the words recognized by Speech in
-     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+     * Populated if and only if `message_type` = `TRANSCRIPT` and
      * [InputAudioConfig.enable_word_info] is set.
      * </pre>
      *
@@ -1605,7 +1643,8 @@ public Builder setSpeechWordInfo(
      *
      * <pre>
      * Word-specific information for the words recognized by Speech in
-     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+     * Populated if and only if `message_type` = `TRANSCRIPT` and
      * [InputAudioConfig.enable_word_info] is set.
      * </pre>
      *
@@ -1629,7 +1668,8 @@ public Builder addSpeechWordInfo(com.google.cloud.dialogflow.v2.SpeechWordInfo v
      *
      * <pre>
      * Word-specific information for the words recognized by Speech in
-     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+     * Populated if and only if `message_type` = `TRANSCRIPT` and
      * [InputAudioConfig.enable_word_info] is set.
      * </pre>
      *
@@ -1654,7 +1694,8 @@ public Builder addSpeechWordInfo(
      *
      * <pre>
      * Word-specific information for the words recognized by Speech in
-     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+     * Populated if and only if `message_type` = `TRANSCRIPT` and
      * [InputAudioConfig.enable_word_info] is set.
      * </pre>
      *
@@ -1676,7 +1717,8 @@ public Builder addSpeechWordInfo(
      *
      * <pre>
      * Word-specific information for the words recognized by Speech in
-     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+     * Populated if and only if `message_type` = `TRANSCRIPT` and
      * [InputAudioConfig.enable_word_info] is set.
      * </pre>
      *
@@ -1698,7 +1740,8 @@ public Builder addSpeechWordInfo(
      *
      * <pre>
      * Word-specific information for the words recognized by Speech in
-     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+     * Populated if and only if `message_type` = `TRANSCRIPT` and
      * [InputAudioConfig.enable_word_info] is set.
      * </pre>
      *
@@ -1720,7 +1763,8 @@ public Builder addAllSpeechWordInfo(
      *
      * <pre>
      * Word-specific information for the words recognized by Speech in
-     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+     * Populated if and only if `message_type` = `TRANSCRIPT` and
      * [InputAudioConfig.enable_word_info] is set.
      * </pre>
      *
@@ -1729,7 +1773,7 @@ public Builder addAllSpeechWordInfo(
     public Builder clearSpeechWordInfo() {
       if (speechWordInfoBuilder_ == null) {
         speechWordInfo_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
       } else {
         speechWordInfoBuilder_.clear();
@@ -1741,7 +1785,8 @@ public Builder clearSpeechWordInfo() {
      *
      * <pre>
      * Word-specific information for the words recognized by Speech in
-     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+     * Populated if and only if `message_type` = `TRANSCRIPT` and
      * [InputAudioConfig.enable_word_info] is set.
      * </pre>
      *
@@ -1762,7 +1807,8 @@ public Builder removeSpeechWordInfo(int index) {
      *
      * <pre>
      * Word-specific information for the words recognized by Speech in
-     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+     * Populated if and only if `message_type` = `TRANSCRIPT` and
      * [InputAudioConfig.enable_word_info] is set.
      * </pre>
      *
@@ -1777,7 +1823,8 @@ public com.google.cloud.dialogflow.v2.SpeechWordInfo.Builder getSpeechWordInfoBu
      *
      * <pre>
      * Word-specific information for the words recognized by Speech in
-     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+     * Populated if and only if `message_type` = `TRANSCRIPT` and
      * [InputAudioConfig.enable_word_info] is set.
      * </pre>
      *
@@ -1796,7 +1843,8 @@ public com.google.cloud.dialogflow.v2.SpeechWordInfoOrBuilder getSpeechWordInfoO
      *
      * <pre>
      * Word-specific information for the words recognized by Speech in
-     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+     * Populated if and only if `message_type` = `TRANSCRIPT` and
      * [InputAudioConfig.enable_word_info] is set.
      * </pre>
      *
@@ -1815,7 +1863,8 @@ public com.google.cloud.dialogflow.v2.SpeechWordInfoOrBuilder getSpeechWordInfoO
      *
      * <pre>
      * Word-specific information for the words recognized by Speech in
-     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+     * Populated if and only if `message_type` = `TRANSCRIPT` and
      * [InputAudioConfig.enable_word_info] is set.
      * </pre>
      *
@@ -1830,7 +1879,8 @@ public com.google.cloud.dialogflow.v2.SpeechWordInfo.Builder addSpeechWordInfoBu
      *
      * <pre>
      * Word-specific information for the words recognized by Speech in
-     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+     * Populated if and only if `message_type` = `TRANSCRIPT` and
      * [InputAudioConfig.enable_word_info] is set.
      * </pre>
      *
@@ -1846,7 +1896,8 @@ public com.google.cloud.dialogflow.v2.SpeechWordInfo.Builder addSpeechWordInfoBu
      *
      * <pre>
      * Word-specific information for the words recognized by Speech in
-     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+     * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+     * Populated if and only if `message_type` = `TRANSCRIPT` and
      * [InputAudioConfig.enable_word_info] is set.
      * </pre>
      *
@@ -1869,7 +1920,7 @@ public com.google.cloud.dialogflow.v2.SpeechWordInfo.Builder addSpeechWordInfoBu
                 com.google.cloud.dialogflow.v2.SpeechWordInfo.Builder,
                 com.google.cloud.dialogflow.v2.SpeechWordInfoOrBuilder>(
                 speechWordInfo_,
-                ((bitField0_ & 0x00000001) != 0),
+                ((bitField0_ & 0x00000010) != 0),
                 getParentForChildren(),
                 isClean());
         speechWordInfo_ = null;
@@ -1896,7 +1947,7 @@ public com.google.cloud.dialogflow.v2.SpeechWordInfo.Builder addSpeechWordInfoBu
      * @return Whether the speechEndOffset field is set.
      */
     public boolean hasSpeechEndOffset() {
-      return speechEndOffsetBuilder_ != null || speechEndOffset_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -1935,11 +1986,11 @@ public Builder setSpeechEndOffset(com.google.protobuf.Duration value) {
           throw new NullPointerException();
         }
         speechEndOffset_ = value;
-        onChanged();
       } else {
         speechEndOffsetBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1955,11 +2006,11 @@ public Builder setSpeechEndOffset(com.google.protobuf.Duration value) {
     public Builder setSpeechEndOffset(com.google.protobuf.Duration.Builder builderForValue) {
       if (speechEndOffsetBuilder_ == null) {
         speechEndOffset_ = builderForValue.build();
-        onChanged();
       } else {
         speechEndOffsetBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1974,19 +2025,18 @@ public Builder setSpeechEndOffset(com.google.protobuf.Duration.Builder builderFo
      */
     public Builder mergeSpeechEndOffset(com.google.protobuf.Duration value) {
       if (speechEndOffsetBuilder_ == null) {
-        if (speechEndOffset_ != null) {
-          speechEndOffset_ =
-              com.google.protobuf.Duration.newBuilder(speechEndOffset_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && speechEndOffset_ != null
+            && speechEndOffset_ != com.google.protobuf.Duration.getDefaultInstance()) {
+          getSpeechEndOffsetBuilder().mergeFrom(value);
         } else {
           speechEndOffset_ = value;
         }
-        onChanged();
       } else {
         speechEndOffsetBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2000,14 +2050,13 @@ public Builder mergeSpeechEndOffset(com.google.protobuf.Duration value) {
      * <code>.google.protobuf.Duration speech_end_offset = 8;</code>
      */
     public Builder clearSpeechEndOffset() {
-      if (speechEndOffsetBuilder_ == null) {
-        speechEndOffset_ = null;
-        onChanged();
-      } else {
-        speechEndOffset_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      speechEndOffset_ = null;
+      if (speechEndOffsetBuilder_ != null) {
+        speechEndOffsetBuilder_.dispose();
         speechEndOffsetBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2021,7 +2070,7 @@ public Builder clearSpeechEndOffset() {
      * <code>.google.protobuf.Duration speech_end_offset = 8;</code>
      */
     public com.google.protobuf.Duration.Builder getSpeechEndOffsetBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getSpeechEndOffsetFieldBuilder().getBuilder();
     }
@@ -2132,8 +2181,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2149,8 +2198,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000040);
       onChanged();
       return this;
     }
@@ -2171,8 +2220,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingRecognitionResultOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingRecognitionResultOrBuilder.java
index c4234d6b0442..a71740b3328f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingRecognitionResultOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingRecognitionResultOrBuilder.java
@@ -116,7 +116,8 @@ public interface StreamingRecognitionResultOrBuilder
    *
    * <pre>
    * Word-specific information for the words recognized by Speech in
-   * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+   * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+   * Populated if and only if `message_type` = `TRANSCRIPT` and
    * [InputAudioConfig.enable_word_info] is set.
    * </pre>
    *
@@ -128,7 +129,8 @@ public interface StreamingRecognitionResultOrBuilder
    *
    * <pre>
    * Word-specific information for the words recognized by Speech in
-   * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+   * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+   * Populated if and only if `message_type` = `TRANSCRIPT` and
    * [InputAudioConfig.enable_word_info] is set.
    * </pre>
    *
@@ -140,7 +142,8 @@ public interface StreamingRecognitionResultOrBuilder
    *
    * <pre>
    * Word-specific information for the words recognized by Speech in
-   * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+   * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+   * Populated if and only if `message_type` = `TRANSCRIPT` and
    * [InputAudioConfig.enable_word_info] is set.
    * </pre>
    *
@@ -152,7 +155,8 @@ public interface StreamingRecognitionResultOrBuilder
    *
    * <pre>
    * Word-specific information for the words recognized by Speech in
-   * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+   * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+   * Populated if and only if `message_type` = `TRANSCRIPT` and
    * [InputAudioConfig.enable_word_info] is set.
    * </pre>
    *
@@ -165,7 +169,8 @@ public interface StreamingRecognitionResultOrBuilder
    *
    * <pre>
    * Word-specific information for the words recognized by Speech in
-   * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+   * [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+   * Populated if and only if `message_type` = `TRANSCRIPT` and
    * [InputAudioConfig.enable_word_info] is set.
    * </pre>
    *
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestArticlesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestArticlesRequest.java
index d663ba166718..39a7401be053 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestArticlesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestArticlesRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Participants.SuggestArticles][google.cloud.dialogflow.v2.Participants.SuggestArticles].
+ * The request message for
+ * [Participants.SuggestArticles][google.cloud.dialogflow.v2.Participants.SuggestArticles].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.SuggestArticlesRequest}
@@ -69,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -126,7 +129,9 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int LATEST_MESSAGE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object latestMessage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object latestMessage_ = "";
   /**
    *
    *
@@ -185,14 +190,15 @@ public com.google.protobuf.ByteString getLatestMessageBytes() {
   }
 
   public static final int CONTEXT_SIZE_FIELD_NUMBER = 3;
-  private int contextSize_;
+  private int contextSize_ = 0;
   /**
    *
    *
    * <pre>
    * Optional. Max number of messages prior to and including
-   * [latest_message][google.cloud.dialogflow.v2.SuggestArticlesRequest.latest_message] to use as context
-   * when compiling the suggestion. By default 20 and at most 50.
+   * [latest_message][google.cloud.dialogflow.v2.SuggestArticlesRequest.latest_message]
+   * to use as context when compiling the suggestion. By default 20 and at
+   * most 50.
    * </pre>
    *
    * <code>int32 context_size = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -250,7 +256,9 @@ public com.google.cloud.dialogflow.v2.AssistQueryParameters getAssistQueryParams
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.AssistQueryParametersOrBuilder
       getAssistQueryParamsOrBuilder() {
-    return getAssistQueryParams();
+    return assistQueryParams_ == null
+        ? com.google.cloud.dialogflow.v2.AssistQueryParameters.getDefaultInstance()
+        : assistQueryParams_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -449,7 +457,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Participants.SuggestArticles][google.cloud.dialogflow.v2.Participants.SuggestArticles].
+   * The request message for
+   * [Participants.SuggestArticles][google.cloud.dialogflow.v2.Participants.SuggestArticles].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.SuggestArticlesRequest}
@@ -483,16 +492,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       latestMessage_ = "";
-
       contextSize_ = 0;
-
-      if (assistQueryParamsBuilder_ == null) {
-        assistQueryParams_ = null;
-      } else {
-        assistQueryParams_ = null;
+      assistQueryParams_ = null;
+      if (assistQueryParamsBuilder_ != null) {
+        assistQueryParamsBuilder_.dispose();
         assistQueryParamsBuilder_ = null;
       }
       return this;
@@ -522,18 +528,32 @@ public com.google.cloud.dialogflow.v2.SuggestArticlesRequest build() {
     public com.google.cloud.dialogflow.v2.SuggestArticlesRequest buildPartial() {
       com.google.cloud.dialogflow.v2.SuggestArticlesRequest result =
           new com.google.cloud.dialogflow.v2.SuggestArticlesRequest(this);
-      result.parent_ = parent_;
-      result.latestMessage_ = latestMessage_;
-      result.contextSize_ = contextSize_;
-      if (assistQueryParamsBuilder_ == null) {
-        result.assistQueryParams_ = assistQueryParams_;
-      } else {
-        result.assistQueryParams_ = assistQueryParamsBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.SuggestArticlesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.latestMessage_ = latestMessage_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.contextSize_ = contextSize_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.assistQueryParams_ =
+            assistQueryParamsBuilder_ == null
+                ? assistQueryParams_
+                : assistQueryParamsBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -582,10 +602,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.SuggestArticlesRequest o
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLatestMessage().isEmpty()) {
         latestMessage_ = other.latestMessage_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getContextSize() != 0) {
@@ -623,26 +645,26 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 latestMessage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 contextSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 34:
               {
                 input.readMessage(
                     getAssistQueryParamsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -662,6 +684,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -735,8 +759,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -756,8 +780,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -782,8 +806,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -864,8 +888,8 @@ public Builder setLatestMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -886,8 +910,8 @@ public Builder setLatestMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLatestMessage() {
-
       latestMessage_ = getDefaultInstance().getLatestMessage();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -913,8 +937,8 @@ public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -925,8 +949,9 @@ public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
      *
      * <pre>
      * Optional. Max number of messages prior to and including
-     * [latest_message][google.cloud.dialogflow.v2.SuggestArticlesRequest.latest_message] to use as context
-     * when compiling the suggestion. By default 20 and at most 50.
+     * [latest_message][google.cloud.dialogflow.v2.SuggestArticlesRequest.latest_message]
+     * to use as context when compiling the suggestion. By default 20 and at
+     * most 50.
      * </pre>
      *
      * <code>int32 context_size = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -942,8 +967,9 @@ public int getContextSize() {
      *
      * <pre>
      * Optional. Max number of messages prior to and including
-     * [latest_message][google.cloud.dialogflow.v2.SuggestArticlesRequest.latest_message] to use as context
-     * when compiling the suggestion. By default 20 and at most 50.
+     * [latest_message][google.cloud.dialogflow.v2.SuggestArticlesRequest.latest_message]
+     * to use as context when compiling the suggestion. By default 20 and at
+     * most 50.
      * </pre>
      *
      * <code>int32 context_size = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -954,6 +980,7 @@ public int getContextSize() {
     public Builder setContextSize(int value) {
 
       contextSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -962,8 +989,9 @@ public Builder setContextSize(int value) {
      *
      * <pre>
      * Optional. Max number of messages prior to and including
-     * [latest_message][google.cloud.dialogflow.v2.SuggestArticlesRequest.latest_message] to use as context
-     * when compiling the suggestion. By default 20 and at most 50.
+     * [latest_message][google.cloud.dialogflow.v2.SuggestArticlesRequest.latest_message]
+     * to use as context when compiling the suggestion. By default 20 and at
+     * most 50.
      * </pre>
      *
      * <code>int32 context_size = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -971,7 +999,7 @@ public Builder setContextSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearContextSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       contextSize_ = 0;
       onChanged();
       return this;
@@ -995,7 +1023,7 @@ public Builder clearContextSize() {
      * @return Whether the assistQueryParams field is set.
      */
     public boolean hasAssistQueryParams() {
-      return assistQueryParamsBuilder_ != null || assistQueryParams_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1033,11 +1061,11 @@ public Builder setAssistQueryParams(
           throw new NullPointerException();
         }
         assistQueryParams_ = value;
-        onChanged();
       } else {
         assistQueryParamsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1053,11 +1081,11 @@ public Builder setAssistQueryParams(
         com.google.cloud.dialogflow.v2.AssistQueryParameters.Builder builderForValue) {
       if (assistQueryParamsBuilder_ == null) {
         assistQueryParams_ = builderForValue.build();
-        onChanged();
       } else {
         assistQueryParamsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1072,19 +1100,19 @@ public Builder setAssistQueryParams(
     public Builder mergeAssistQueryParams(
         com.google.cloud.dialogflow.v2.AssistQueryParameters value) {
       if (assistQueryParamsBuilder_ == null) {
-        if (assistQueryParams_ != null) {
-          assistQueryParams_ =
-              com.google.cloud.dialogflow.v2.AssistQueryParameters.newBuilder(assistQueryParams_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && assistQueryParams_ != null
+            && assistQueryParams_
+                != com.google.cloud.dialogflow.v2.AssistQueryParameters.getDefaultInstance()) {
+          getAssistQueryParamsBuilder().mergeFrom(value);
         } else {
           assistQueryParams_ = value;
         }
-        onChanged();
       } else {
         assistQueryParamsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1097,14 +1125,13 @@ public Builder mergeAssistQueryParams(
      * <code>.google.cloud.dialogflow.v2.AssistQueryParameters assist_query_params = 4;</code>
      */
     public Builder clearAssistQueryParams() {
-      if (assistQueryParamsBuilder_ == null) {
-        assistQueryParams_ = null;
-        onChanged();
-      } else {
-        assistQueryParams_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      assistQueryParams_ = null;
+      if (assistQueryParamsBuilder_ != null) {
+        assistQueryParamsBuilder_.dispose();
         assistQueryParamsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1118,7 +1145,7 @@ public Builder clearAssistQueryParams() {
      */
     public com.google.cloud.dialogflow.v2.AssistQueryParameters.Builder
         getAssistQueryParamsBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getAssistQueryParamsFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestArticlesRequestOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestArticlesRequestOrBuilder.java
index 30d0cc60bfeb..5c0cef325309 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestArticlesRequestOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestArticlesRequestOrBuilder.java
@@ -96,8 +96,9 @@ public interface SuggestArticlesRequestOrBuilder
    *
    * <pre>
    * Optional. Max number of messages prior to and including
-   * [latest_message][google.cloud.dialogflow.v2.SuggestArticlesRequest.latest_message] to use as context
-   * when compiling the suggestion. By default 20 and at most 50.
+   * [latest_message][google.cloud.dialogflow.v2.SuggestArticlesRequest.latest_message]
+   * to use as context when compiling the suggestion. By default 20 and at
+   * most 50.
    * </pre>
    *
    * <code>int32 context_size = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestArticlesResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestArticlesResponse.java
index ac26adf0788d..114fd84e3afa 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestArticlesResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestArticlesResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The response message for [Participants.SuggestArticles][google.cloud.dialogflow.v2.Participants.SuggestArticles].
+ * The response message for
+ * [Participants.SuggestArticles][google.cloud.dialogflow.v2.Participants.SuggestArticles].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.SuggestArticlesResponse}
@@ -69,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ARTICLE_ANSWERS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.ArticleAnswer> articleAnswers_;
   /**
    *
@@ -139,7 +142,9 @@ public com.google.cloud.dialogflow.v2.ArticleAnswerOrBuilder getArticleAnswersOr
   }
 
   public static final int LATEST_MESSAGE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object latestMessage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object latestMessage_ = "";
   /**
    *
    *
@@ -194,16 +199,17 @@ public com.google.protobuf.ByteString getLatestMessageBytes() {
   }
 
   public static final int CONTEXT_SIZE_FIELD_NUMBER = 3;
-  private int contextSize_;
+  private int contextSize_ = 0;
   /**
    *
    *
    * <pre>
    * Number of messages prior to and including
-   * [latest_message][google.cloud.dialogflow.v2.SuggestArticlesResponse.latest_message] to compile the
-   * suggestion. It may be smaller than the
-   * [SuggestArticlesRequest.context_size][google.cloud.dialogflow.v2.SuggestArticlesRequest.context_size] field in the request if there
-   * aren't that many messages in the conversation.
+   * [latest_message][google.cloud.dialogflow.v2.SuggestArticlesResponse.latest_message]
+   * to compile the suggestion. It may be smaller than the
+   * [SuggestArticlesRequest.context_size][google.cloud.dialogflow.v2.SuggestArticlesRequest.context_size]
+   * field in the request if there aren't that many messages in the
+   * conversation.
    * </pre>
    *
    * <code>int32 context_size = 3;</code>
@@ -399,7 +405,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The response message for [Participants.SuggestArticles][google.cloud.dialogflow.v2.Participants.SuggestArticles].
+   * The response message for
+   * [Participants.SuggestArticles][google.cloud.dialogflow.v2.Participants.SuggestArticles].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.SuggestArticlesResponse}
@@ -433,6 +440,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (articleAnswersBuilder_ == null) {
         articleAnswers_ = java.util.Collections.emptyList();
       } else {
@@ -441,9 +449,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       latestMessage_ = "";
-
       contextSize_ = 0;
-
       return this;
     }
 
@@ -471,7 +477,16 @@ public com.google.cloud.dialogflow.v2.SuggestArticlesResponse build() {
     public com.google.cloud.dialogflow.v2.SuggestArticlesResponse buildPartial() {
       com.google.cloud.dialogflow.v2.SuggestArticlesResponse result =
           new com.google.cloud.dialogflow.v2.SuggestArticlesResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.SuggestArticlesResponse result) {
       if (articleAnswersBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           articleAnswers_ = java.util.Collections.unmodifiableList(articleAnswers_);
@@ -481,10 +496,16 @@ public com.google.cloud.dialogflow.v2.SuggestArticlesResponse buildPartial() {
       } else {
         result.articleAnswers_ = articleAnswersBuilder_.build();
       }
-      result.latestMessage_ = latestMessage_;
-      result.contextSize_ = contextSize_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.SuggestArticlesResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.latestMessage_ = latestMessage_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.contextSize_ = contextSize_;
+      }
     }
 
     @java.lang.Override
@@ -562,6 +583,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.SuggestArticlesResponse
       }
       if (!other.getLatestMessage().isEmpty()) {
         latestMessage_ = other.latestMessage_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getContextSize() != 0) {
@@ -609,13 +631,13 @@ public Builder mergeFrom(
             case 18:
               {
                 latestMessage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 contextSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             default:
@@ -1066,8 +1088,8 @@ public Builder setLatestMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1086,8 +1108,8 @@ public Builder setLatestMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLatestMessage() {
-
       latestMessage_ = getDefaultInstance().getLatestMessage();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1111,8 +1133,8 @@ public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1123,10 +1145,11 @@ public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
      *
      * <pre>
      * Number of messages prior to and including
-     * [latest_message][google.cloud.dialogflow.v2.SuggestArticlesResponse.latest_message] to compile the
-     * suggestion. It may be smaller than the
-     * [SuggestArticlesRequest.context_size][google.cloud.dialogflow.v2.SuggestArticlesRequest.context_size] field in the request if there
-     * aren't that many messages in the conversation.
+     * [latest_message][google.cloud.dialogflow.v2.SuggestArticlesResponse.latest_message]
+     * to compile the suggestion. It may be smaller than the
+     * [SuggestArticlesRequest.context_size][google.cloud.dialogflow.v2.SuggestArticlesRequest.context_size]
+     * field in the request if there aren't that many messages in the
+     * conversation.
      * </pre>
      *
      * <code>int32 context_size = 3;</code>
@@ -1142,10 +1165,11 @@ public int getContextSize() {
      *
      * <pre>
      * Number of messages prior to and including
-     * [latest_message][google.cloud.dialogflow.v2.SuggestArticlesResponse.latest_message] to compile the
-     * suggestion. It may be smaller than the
-     * [SuggestArticlesRequest.context_size][google.cloud.dialogflow.v2.SuggestArticlesRequest.context_size] field in the request if there
-     * aren't that many messages in the conversation.
+     * [latest_message][google.cloud.dialogflow.v2.SuggestArticlesResponse.latest_message]
+     * to compile the suggestion. It may be smaller than the
+     * [SuggestArticlesRequest.context_size][google.cloud.dialogflow.v2.SuggestArticlesRequest.context_size]
+     * field in the request if there aren't that many messages in the
+     * conversation.
      * </pre>
      *
      * <code>int32 context_size = 3;</code>
@@ -1156,6 +1180,7 @@ public int getContextSize() {
     public Builder setContextSize(int value) {
 
       contextSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1164,10 +1189,11 @@ public Builder setContextSize(int value) {
      *
      * <pre>
      * Number of messages prior to and including
-     * [latest_message][google.cloud.dialogflow.v2.SuggestArticlesResponse.latest_message] to compile the
-     * suggestion. It may be smaller than the
-     * [SuggestArticlesRequest.context_size][google.cloud.dialogflow.v2.SuggestArticlesRequest.context_size] field in the request if there
-     * aren't that many messages in the conversation.
+     * [latest_message][google.cloud.dialogflow.v2.SuggestArticlesResponse.latest_message]
+     * to compile the suggestion. It may be smaller than the
+     * [SuggestArticlesRequest.context_size][google.cloud.dialogflow.v2.SuggestArticlesRequest.context_size]
+     * field in the request if there aren't that many messages in the
+     * conversation.
      * </pre>
      *
      * <code>int32 context_size = 3;</code>
@@ -1175,7 +1201,7 @@ public Builder setContextSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearContextSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       contextSize_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestArticlesResponseOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestArticlesResponseOrBuilder.java
index 7e75f0e7241c..4c87d2897788 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestArticlesResponseOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestArticlesResponseOrBuilder.java
@@ -111,10 +111,11 @@ public interface SuggestArticlesResponseOrBuilder
    *
    * <pre>
    * Number of messages prior to and including
-   * [latest_message][google.cloud.dialogflow.v2.SuggestArticlesResponse.latest_message] to compile the
-   * suggestion. It may be smaller than the
-   * [SuggestArticlesRequest.context_size][google.cloud.dialogflow.v2.SuggestArticlesRequest.context_size] field in the request if there
-   * aren't that many messages in the conversation.
+   * [latest_message][google.cloud.dialogflow.v2.SuggestArticlesResponse.latest_message]
+   * to compile the suggestion. It may be smaller than the
+   * [SuggestArticlesRequest.context_size][google.cloud.dialogflow.v2.SuggestArticlesRequest.context_size]
+   * field in the request if there aren't that many messages in the
+   * conversation.
    * </pre>
    *
    * <code>int32 context_size = 3;</code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestConversationSummaryRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestConversationSummaryRequest.java
new file mode 100644
index 000000000000..790679320a8d
--- /dev/null
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestConversationSummaryRequest.java
@@ -0,0 +1,979 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/dialogflow/v2/conversation.proto
+
+package com.google.cloud.dialogflow.v2;
+
+/**
+ *
+ *
+ * <pre>
+ * The request message for
+ * [Conversations.SuggestConversationSummary][google.cloud.dialogflow.v2.Conversations.SuggestConversationSummary].
+ * </pre>
+ *
+ * Protobuf type {@code google.cloud.dialogflow.v2.SuggestConversationSummaryRequest}
+ */
+public final class SuggestConversationSummaryRequest extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.cloud.dialogflow.v2.SuggestConversationSummaryRequest)
+    SuggestConversationSummaryRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use SuggestConversationSummaryRequest.newBuilder() to construct.
+  private SuggestConversationSummaryRequest(
+      com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+
+  private SuggestConversationSummaryRequest() {
+    conversation_ = "";
+    latestMessage_ = "";
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new SuggestConversationSummaryRequest();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.cloud.dialogflow.v2.ConversationProto
+        .internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryRequest_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.dialogflow.v2.ConversationProto
+        .internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest.class,
+            com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest.Builder.class);
+  }
+
+  public static final int CONVERSATION_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversation_ = "";
+  /**
+   *
+   *
+   * <pre>
+   * Required. The conversation to fetch suggestion for.
+   * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+   * ID&gt;/conversations/&lt;Conversation ID&gt;`.
+   * </pre>
+   *
+   * <code>
+   * string conversation = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+   * </code>
+   *
+   * @return The conversation.
+   */
+  @java.lang.Override
+  public java.lang.String getConversation() {
+    java.lang.Object ref = conversation_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      conversation_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * <pre>
+   * Required. The conversation to fetch suggestion for.
+   * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+   * ID&gt;/conversations/&lt;Conversation ID&gt;`.
+   * </pre>
+   *
+   * <code>
+   * string conversation = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+   * </code>
+   *
+   * @return The bytes for conversation.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getConversationBytes() {
+    java.lang.Object ref = conversation_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      conversation_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int LATEST_MESSAGE_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object latestMessage_ = "";
+  /**
+   *
+   *
+   * <pre>
+   * The name of the latest conversation message used as context for
+   * compiling suggestion. If empty, the latest message of the conversation will
+   * be used.
+   * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+   * ID&gt;/conversations/&lt;Conversation ID&gt;/messages/&lt;Message ID&gt;`.
+   * </pre>
+   *
+   * <code>string latest_message = 3 [(.google.api.resource_reference) = { ... }</code>
+   *
+   * @return The latestMessage.
+   */
+  @java.lang.Override
+  public java.lang.String getLatestMessage() {
+    java.lang.Object ref = latestMessage_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      latestMessage_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * <pre>
+   * The name of the latest conversation message used as context for
+   * compiling suggestion. If empty, the latest message of the conversation will
+   * be used.
+   * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+   * ID&gt;/conversations/&lt;Conversation ID&gt;/messages/&lt;Message ID&gt;`.
+   * </pre>
+   *
+   * <code>string latest_message = 3 [(.google.api.resource_reference) = { ... }</code>
+   *
+   * @return The bytes for latestMessage.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getLatestMessageBytes() {
+    java.lang.Object ref = latestMessage_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      latestMessage_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int CONTEXT_SIZE_FIELD_NUMBER = 4;
+  private int contextSize_ = 0;
+  /**
+   *
+   *
+   * <pre>
+   * Max number of messages prior to and including
+   * [latest_message] to use as context when compiling the
+   * suggestion. By default 500 and at most 1000.
+   * </pre>
+   *
+   * <code>int32 context_size = 4;</code>
+   *
+   * @return The contextSize.
+   */
+  @java.lang.Override
+  public int getContextSize() {
+    return contextSize_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(conversation_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, conversation_);
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(latestMessage_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, latestMessage_);
+    }
+    if (contextSize_ != 0) {
+      output.writeInt32(4, contextSize_);
+    }
+    getUnknownFields().writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(conversation_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, conversation_);
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(latestMessage_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, latestMessage_);
+    }
+    if (contextSize_ != 0) {
+      size += com.google.protobuf.CodedOutputStream.computeInt32Size(4, contextSize_);
+    }
+    size += getUnknownFields().getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest other =
+        (com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest) obj;
+
+    if (!getConversation().equals(other.getConversation())) return false;
+    if (!getLatestMessage().equals(other.getLatestMessage())) return false;
+    if (getContextSize() != other.getContextSize()) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + CONVERSATION_FIELD_NUMBER;
+    hash = (53 * hash) + getConversation().hashCode();
+    hash = (37 * hash) + LATEST_MESSAGE_FIELD_NUMBER;
+    hash = (53 * hash) + getLatestMessage().hashCode();
+    hash = (37 * hash) + CONTEXT_SIZE_FIELD_NUMBER;
+    hash = (53 * hash) + getContextSize();
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest parseFrom(
+      java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest parseFrom(
+      byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest parseFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(
+      com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * <pre>
+   * The request message for
+   * [Conversations.SuggestConversationSummary][google.cloud.dialogflow.v2.Conversations.SuggestConversationSummary].
+   * </pre>
+   *
+   * Protobuf type {@code google.cloud.dialogflow.v2.SuggestConversationSummaryRequest}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder>
+      implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.dialogflow.v2.SuggestConversationSummaryRequest)
+      com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.cloud.dialogflow.v2.ConversationProto
+          .internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryRequest_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.dialogflow.v2.ConversationProto
+          .internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest.class,
+              com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest.newBuilder()
+    private Builder() {}
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      bitField0_ = 0;
+      conversation_ = "";
+      latestMessage_ = "";
+      contextSize_ = 0;
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.cloud.dialogflow.v2.ConversationProto
+          .internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryRequest_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest
+        getDefaultInstanceForType() {
+      return com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest build() {
+      com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest buildPartial() {
+      com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest result =
+          new com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest(this);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversation_ = conversation_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.latestMessage_ = latestMessage_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.contextSize_ = contextSize_;
+      }
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest) {
+        return mergeFrom((com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(
+        com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest other) {
+      if (other
+          == com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest.getDefaultInstance())
+        return this;
+      if (!other.getConversation().isEmpty()) {
+        conversation_ = other.conversation_;
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
+      if (!other.getLatestMessage().isEmpty()) {
+        latestMessage_ = other.latestMessage_;
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
+      if (other.getContextSize() != 0) {
+        setContextSize(other.getContextSize());
+      }
+      this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                conversation_ = input.readStringRequireUtf8();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+            case 26:
+              {
+                latestMessage_ = input.readStringRequireUtf8();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 26
+            case 32:
+              {
+                contextSize_ = input.readInt32();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 32
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.unwrapIOException();
+      } finally {
+        onChanged();
+      } // finally
+      return this;
+    }
+
+    private int bitField0_;
+
+    private java.lang.Object conversation_ = "";
+    /**
+     *
+     *
+     * <pre>
+     * Required. The conversation to fetch suggestion for.
+     * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+     * ID&gt;/conversations/&lt;Conversation ID&gt;`.
+     * </pre>
+     *
+     * <code>
+     * string conversation = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @return The conversation.
+     */
+    public java.lang.String getConversation() {
+      java.lang.Object ref = conversation_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        conversation_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Required. The conversation to fetch suggestion for.
+     * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+     * ID&gt;/conversations/&lt;Conversation ID&gt;`.
+     * </pre>
+     *
+     * <code>
+     * string conversation = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @return The bytes for conversation.
+     */
+    public com.google.protobuf.ByteString getConversationBytes() {
+      java.lang.Object ref = conversation_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        conversation_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Required. The conversation to fetch suggestion for.
+     * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+     * ID&gt;/conversations/&lt;Conversation ID&gt;`.
+     * </pre>
+     *
+     * <code>
+     * string conversation = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @param value The conversation to set.
+     * @return This builder for chaining.
+     */
+    public Builder setConversation(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      conversation_ = value;
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Required. The conversation to fetch suggestion for.
+     * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+     * ID&gt;/conversations/&lt;Conversation ID&gt;`.
+     * </pre>
+     *
+     * <code>
+     * string conversation = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearConversation() {
+      conversation_ = getDefaultInstance().getConversation();
+      bitField0_ = (bitField0_ & ~0x00000001);
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Required. The conversation to fetch suggestion for.
+     * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+     * ID&gt;/conversations/&lt;Conversation ID&gt;`.
+     * </pre>
+     *
+     * <code>
+     * string conversation = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @param value The bytes for conversation to set.
+     * @return This builder for chaining.
+     */
+    public Builder setConversationBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+      conversation_ = value;
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object latestMessage_ = "";
+    /**
+     *
+     *
+     * <pre>
+     * The name of the latest conversation message used as context for
+     * compiling suggestion. If empty, the latest message of the conversation will
+     * be used.
+     * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+     * ID&gt;/conversations/&lt;Conversation ID&gt;/messages/&lt;Message ID&gt;`.
+     * </pre>
+     *
+     * <code>string latest_message = 3 [(.google.api.resource_reference) = { ... }</code>
+     *
+     * @return The latestMessage.
+     */
+    public java.lang.String getLatestMessage() {
+      java.lang.Object ref = latestMessage_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        latestMessage_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * <pre>
+     * The name of the latest conversation message used as context for
+     * compiling suggestion. If empty, the latest message of the conversation will
+     * be used.
+     * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+     * ID&gt;/conversations/&lt;Conversation ID&gt;/messages/&lt;Message ID&gt;`.
+     * </pre>
+     *
+     * <code>string latest_message = 3 [(.google.api.resource_reference) = { ... }</code>
+     *
+     * @return The bytes for latestMessage.
+     */
+    public com.google.protobuf.ByteString getLatestMessageBytes() {
+      java.lang.Object ref = latestMessage_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        latestMessage_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * <pre>
+     * The name of the latest conversation message used as context for
+     * compiling suggestion. If empty, the latest message of the conversation will
+     * be used.
+     * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+     * ID&gt;/conversations/&lt;Conversation ID&gt;/messages/&lt;Message ID&gt;`.
+     * </pre>
+     *
+     * <code>string latest_message = 3 [(.google.api.resource_reference) = { ... }</code>
+     *
+     * @param value The latestMessage to set.
+     * @return This builder for chaining.
+     */
+    public Builder setLatestMessage(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      latestMessage_ = value;
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * The name of the latest conversation message used as context for
+     * compiling suggestion. If empty, the latest message of the conversation will
+     * be used.
+     * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+     * ID&gt;/conversations/&lt;Conversation ID&gt;/messages/&lt;Message ID&gt;`.
+     * </pre>
+     *
+     * <code>string latest_message = 3 [(.google.api.resource_reference) = { ... }</code>
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearLatestMessage() {
+      latestMessage_ = getDefaultInstance().getLatestMessage();
+      bitField0_ = (bitField0_ & ~0x00000002);
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * The name of the latest conversation message used as context for
+     * compiling suggestion. If empty, the latest message of the conversation will
+     * be used.
+     * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+     * ID&gt;/conversations/&lt;Conversation ID&gt;/messages/&lt;Message ID&gt;`.
+     * </pre>
+     *
+     * <code>string latest_message = 3 [(.google.api.resource_reference) = { ... }</code>
+     *
+     * @param value The bytes for latestMessage to set.
+     * @return This builder for chaining.
+     */
+    public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+      latestMessage_ = value;
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return this;
+    }
+
+    private int contextSize_;
+    /**
+     *
+     *
+     * <pre>
+     * Max number of messages prior to and including
+     * [latest_message] to use as context when compiling the
+     * suggestion. By default 500 and at most 1000.
+     * </pre>
+     *
+     * <code>int32 context_size = 4;</code>
+     *
+     * @return The contextSize.
+     */
+    @java.lang.Override
+    public int getContextSize() {
+      return contextSize_;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Max number of messages prior to and including
+     * [latest_message] to use as context when compiling the
+     * suggestion. By default 500 and at most 1000.
+     * </pre>
+     *
+     * <code>int32 context_size = 4;</code>
+     *
+     * @param value The contextSize to set.
+     * @return This builder for chaining.
+     */
+    public Builder setContextSize(int value) {
+
+      contextSize_ = value;
+      bitField0_ |= 0x00000004;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Max number of messages prior to and including
+     * [latest_message] to use as context when compiling the
+     * suggestion. By default 500 and at most 1000.
+     * </pre>
+     *
+     * <code>int32 context_size = 4;</code>
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearContextSize() {
+      bitField0_ = (bitField0_ & ~0x00000004);
+      contextSize_ = 0;
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.dialogflow.v2.SuggestConversationSummaryRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.dialogflow.v2.SuggestConversationSummaryRequest)
+  private static final com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest
+      DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest();
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest
+      getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<SuggestConversationSummaryRequest> PARSER =
+      new com.google.protobuf.AbstractParser<SuggestConversationSummaryRequest>() {
+        @java.lang.Override
+        public SuggestConversationSummaryRequest parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
+
+  public static com.google.protobuf.Parser<SuggestConversationSummaryRequest> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<SuggestConversationSummaryRequest> getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest
+      getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestConversationSummaryRequestOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestConversationSummaryRequestOrBuilder.java
new file mode 100644
index 000000000000..4ac3de7c972b
--- /dev/null
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestConversationSummaryRequestOrBuilder.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/dialogflow/v2/conversation.proto
+
+package com.google.cloud.dialogflow.v2;
+
+public interface SuggestConversationSummaryRequestOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.dialogflow.v2.SuggestConversationSummaryRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * <pre>
+   * Required. The conversation to fetch suggestion for.
+   * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+   * ID&gt;/conversations/&lt;Conversation ID&gt;`.
+   * </pre>
+   *
+   * <code>
+   * string conversation = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+   * </code>
+   *
+   * @return The conversation.
+   */
+  java.lang.String getConversation();
+  /**
+   *
+   *
+   * <pre>
+   * Required. The conversation to fetch suggestion for.
+   * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+   * ID&gt;/conversations/&lt;Conversation ID&gt;`.
+   * </pre>
+   *
+   * <code>
+   * string conversation = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+   * </code>
+   *
+   * @return The bytes for conversation.
+   */
+  com.google.protobuf.ByteString getConversationBytes();
+
+  /**
+   *
+   *
+   * <pre>
+   * The name of the latest conversation message used as context for
+   * compiling suggestion. If empty, the latest message of the conversation will
+   * be used.
+   * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+   * ID&gt;/conversations/&lt;Conversation ID&gt;/messages/&lt;Message ID&gt;`.
+   * </pre>
+   *
+   * <code>string latest_message = 3 [(.google.api.resource_reference) = { ... }</code>
+   *
+   * @return The latestMessage.
+   */
+  java.lang.String getLatestMessage();
+  /**
+   *
+   *
+   * <pre>
+   * The name of the latest conversation message used as context for
+   * compiling suggestion. If empty, the latest message of the conversation will
+   * be used.
+   * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+   * ID&gt;/conversations/&lt;Conversation ID&gt;/messages/&lt;Message ID&gt;`.
+   * </pre>
+   *
+   * <code>string latest_message = 3 [(.google.api.resource_reference) = { ... }</code>
+   *
+   * @return The bytes for latestMessage.
+   */
+  com.google.protobuf.ByteString getLatestMessageBytes();
+
+  /**
+   *
+   *
+   * <pre>
+   * Max number of messages prior to and including
+   * [latest_message] to use as context when compiling the
+   * suggestion. By default 500 and at most 1000.
+   * </pre>
+   *
+   * <code>int32 context_size = 4;</code>
+   *
+   * @return The contextSize.
+   */
+  int getContextSize();
+}
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestConversationSummaryResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestConversationSummaryResponse.java
new file mode 100644
index 000000000000..c3c7a0462f8d
--- /dev/null
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestConversationSummaryResponse.java
@@ -0,0 +1,2370 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/dialogflow/v2/conversation.proto
+
+package com.google.cloud.dialogflow.v2;
+
+/**
+ *
+ *
+ * <pre>
+ * The response message for
+ * [Conversations.SuggestConversationSummary][google.cloud.dialogflow.v2.Conversations.SuggestConversationSummary].
+ * </pre>
+ *
+ * Protobuf type {@code google.cloud.dialogflow.v2.SuggestConversationSummaryResponse}
+ */
+public final class SuggestConversationSummaryResponse extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.cloud.dialogflow.v2.SuggestConversationSummaryResponse)
+    SuggestConversationSummaryResponseOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use SuggestConversationSummaryResponse.newBuilder() to construct.
+  private SuggestConversationSummaryResponse(
+      com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+
+  private SuggestConversationSummaryResponse() {
+    latestMessage_ = "";
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new SuggestConversationSummaryResponse();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.cloud.dialogflow.v2.ConversationProto
+        .internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.dialogflow.v2.ConversationProto
+        .internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.class,
+            com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Builder.class);
+  }
+
+  public interface SummaryOrBuilder
+      extends
+      // @@protoc_insertion_point(interface_extends:google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     *
+     *
+     * <pre>
+     * The summary content that is concatenated into one string.
+     * </pre>
+     *
+     * <code>string text = 1;</code>
+     *
+     * @return The text.
+     */
+    java.lang.String getText();
+    /**
+     *
+     *
+     * <pre>
+     * The summary content that is concatenated into one string.
+     * </pre>
+     *
+     * <code>string text = 1;</code>
+     *
+     * @return The bytes for text.
+     */
+    com.google.protobuf.ByteString getTextBytes();
+
+    /**
+     *
+     *
+     * <pre>
+     * The summary content that is divided into sections. The key is the
+     * section's name and the value is the section's content. There is no
+     * specific format for the key or value.
+     * </pre>
+     *
+     * <code>map&lt;string, string&gt; text_sections = 4;</code>
+     */
+    int getTextSectionsCount();
+    /**
+     *
+     *
+     * <pre>
+     * The summary content that is divided into sections. The key is the
+     * section's name and the value is the section's content. There is no
+     * specific format for the key or value.
+     * </pre>
+     *
+     * <code>map&lt;string, string&gt; text_sections = 4;</code>
+     */
+    boolean containsTextSections(java.lang.String key);
+    /** Use {@link #getTextSectionsMap()} instead. */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.String, java.lang.String> getTextSections();
+    /**
+     *
+     *
+     * <pre>
+     * The summary content that is divided into sections. The key is the
+     * section's name and the value is the section's content. There is no
+     * specific format for the key or value.
+     * </pre>
+     *
+     * <code>map&lt;string, string&gt; text_sections = 4;</code>
+     */
+    java.util.Map<java.lang.String, java.lang.String> getTextSectionsMap();
+    /**
+     *
+     *
+     * <pre>
+     * The summary content that is divided into sections. The key is the
+     * section's name and the value is the section's content. There is no
+     * specific format for the key or value.
+     * </pre>
+     *
+     * <code>map&lt;string, string&gt; text_sections = 4;</code>
+     */
+    /* nullable */
+    java.lang.String getTextSectionsOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue);
+    /**
+     *
+     *
+     * <pre>
+     * The summary content that is divided into sections. The key is the
+     * section's name and the value is the section's content. There is no
+     * specific format for the key or value.
+     * </pre>
+     *
+     * <code>map&lt;string, string&gt; text_sections = 4;</code>
+     */
+    java.lang.String getTextSectionsOrThrow(java.lang.String key);
+
+    /**
+     *
+     *
+     * <pre>
+     * The name of the answer record. Format:
+     * "projects/&lt;Project ID&gt;/answerRecords/&lt;Answer Record ID&gt;"
+     * </pre>
+     *
+     * <code>string answer_record = 3 [(.google.api.resource_reference) = { ... }</code>
+     *
+     * @return The answerRecord.
+     */
+    java.lang.String getAnswerRecord();
+    /**
+     *
+     *
+     * <pre>
+     * The name of the answer record. Format:
+     * "projects/&lt;Project ID&gt;/answerRecords/&lt;Answer Record ID&gt;"
+     * </pre>
+     *
+     * <code>string answer_record = 3 [(.google.api.resource_reference) = { ... }</code>
+     *
+     * @return The bytes for answerRecord.
+     */
+    com.google.protobuf.ByteString getAnswerRecordBytes();
+  }
+  /**
+   *
+   *
+   * <pre>
+   * Generated summary for a conversation.
+   * </pre>
+   *
+   * Protobuf type {@code google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary}
+   */
+  public static final class Summary extends com.google.protobuf.GeneratedMessageV3
+      implements
+      // @@protoc_insertion_point(message_implements:google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary)
+      SummaryOrBuilder {
+    private static final long serialVersionUID = 0L;
+    // Use Summary.newBuilder() to construct.
+    private Summary(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+
+    private Summary() {
+      text_ = "";
+      answerRecord_ = "";
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+      return new Summary();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.cloud.dialogflow.v2.ConversationProto
+          .internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_Summary_descriptor;
+    }
+
+    @SuppressWarnings({"rawtypes"})
+    @java.lang.Override
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
+      switch (number) {
+        case 4:
+          return internalGetTextSections();
+        default:
+          throw new RuntimeException("Invalid map field number: " + number);
+      }
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.dialogflow.v2.ConversationProto
+          .internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_Summary_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary.class,
+              com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary.Builder
+                  .class);
+    }
+
+    public static final int TEXT_FIELD_NUMBER = 1;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object text_ = "";
+    /**
+     *
+     *
+     * <pre>
+     * The summary content that is concatenated into one string.
+     * </pre>
+     *
+     * <code>string text = 1;</code>
+     *
+     * @return The text.
+     */
+    @java.lang.Override
+    public java.lang.String getText() {
+      java.lang.Object ref = text_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        text_ = s;
+        return s;
+      }
+    }
+    /**
+     *
+     *
+     * <pre>
+     * The summary content that is concatenated into one string.
+     * </pre>
+     *
+     * <code>string text = 1;</code>
+     *
+     * @return The bytes for text.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getTextBytes() {
+      java.lang.Object ref = text_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        text_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int TEXT_SECTIONS_FIELD_NUMBER = 4;
+
+    private static final class TextSectionsDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<java.lang.String, java.lang.String> defaultEntry =
+          com.google.protobuf.MapEntry.<java.lang.String, java.lang.String>newDefaultInstance(
+              com.google.cloud.dialogflow.v2.ConversationProto
+                  .internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_Summary_TextSectionsEntry_descriptor,
+              com.google.protobuf.WireFormat.FieldType.STRING,
+              "",
+              com.google.protobuf.WireFormat.FieldType.STRING,
+              "");
+    }
+
+    @SuppressWarnings("serial")
+    private com.google.protobuf.MapField<java.lang.String, java.lang.String> textSections_;
+
+    private com.google.protobuf.MapField<java.lang.String, java.lang.String>
+        internalGetTextSections() {
+      if (textSections_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            TextSectionsDefaultEntryHolder.defaultEntry);
+      }
+      return textSections_;
+    }
+
+    public int getTextSectionsCount() {
+      return internalGetTextSections().getMap().size();
+    }
+    /**
+     *
+     *
+     * <pre>
+     * The summary content that is divided into sections. The key is the
+     * section's name and the value is the section's content. There is no
+     * specific format for the key or value.
+     * </pre>
+     *
+     * <code>map&lt;string, string&gt; text_sections = 4;</code>
+     */
+    @java.lang.Override
+    public boolean containsTextSections(java.lang.String key) {
+      if (key == null) {
+        throw new NullPointerException("map key");
+      }
+      return internalGetTextSections().getMap().containsKey(key);
+    }
+    /** Use {@link #getTextSectionsMap()} instead. */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.String, java.lang.String> getTextSections() {
+      return getTextSectionsMap();
+    }
+    /**
+     *
+     *
+     * <pre>
+     * The summary content that is divided into sections. The key is the
+     * section's name and the value is the section's content. There is no
+     * specific format for the key or value.
+     * </pre>
+     *
+     * <code>map&lt;string, string&gt; text_sections = 4;</code>
+     */
+    @java.lang.Override
+    public java.util.Map<java.lang.String, java.lang.String> getTextSectionsMap() {
+      return internalGetTextSections().getMap();
+    }
+    /**
+     *
+     *
+     * <pre>
+     * The summary content that is divided into sections. The key is the
+     * section's name and the value is the section's content. There is no
+     * specific format for the key or value.
+     * </pre>
+     *
+     * <code>map&lt;string, string&gt; text_sections = 4;</code>
+     */
+    @java.lang.Override
+    public /* nullable */ java.lang.String getTextSectionsOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
+      if (key == null) {
+        throw new NullPointerException("map key");
+      }
+      java.util.Map<java.lang.String, java.lang.String> map = internalGetTextSections().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * The summary content that is divided into sections. The key is the
+     * section's name and the value is the section's content. There is no
+     * specific format for the key or value.
+     * </pre>
+     *
+     * <code>map&lt;string, string&gt; text_sections = 4;</code>
+     */
+    @java.lang.Override
+    public java.lang.String getTextSectionsOrThrow(java.lang.String key) {
+      if (key == null) {
+        throw new NullPointerException("map key");
+      }
+      java.util.Map<java.lang.String, java.lang.String> map = internalGetTextSections().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int ANSWER_RECORD_FIELD_NUMBER = 3;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object answerRecord_ = "";
+    /**
+     *
+     *
+     * <pre>
+     * The name of the answer record. Format:
+     * "projects/&lt;Project ID&gt;/answerRecords/&lt;Answer Record ID&gt;"
+     * </pre>
+     *
+     * <code>string answer_record = 3 [(.google.api.resource_reference) = { ... }</code>
+     *
+     * @return The answerRecord.
+     */
+    @java.lang.Override
+    public java.lang.String getAnswerRecord() {
+      java.lang.Object ref = answerRecord_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        answerRecord_ = s;
+        return s;
+      }
+    }
+    /**
+     *
+     *
+     * <pre>
+     * The name of the answer record. Format:
+     * "projects/&lt;Project ID&gt;/answerRecords/&lt;Answer Record ID&gt;"
+     * </pre>
+     *
+     * <code>string answer_record = 3 [(.google.api.resource_reference) = { ... }</code>
+     *
+     * @return The bytes for answerRecord.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getAnswerRecordBytes() {
+      java.lang.Object ref = answerRecord_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        answerRecord_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    private byte memoizedIsInitialized = -1;
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(text_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, text_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(answerRecord_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, answerRecord_);
+      }
+      com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
+          output, internalGetTextSections(), TextSectionsDefaultEntryHolder.defaultEntry, 4);
+      getUnknownFields().writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(text_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, text_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(answerRecord_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, answerRecord_);
+      }
+      for (java.util.Map.Entry<java.lang.String, java.lang.String> entry :
+          internalGetTextSections().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.String, java.lang.String> textSections__ =
+            TextSectionsDefaultEntryHolder.defaultEntry
+                .newBuilderForType()
+                .setKey(entry.getKey())
+                .setValue(entry.getValue())
+                .build();
+        size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, textSections__);
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+        return true;
+      }
+      if (!(obj
+          instanceof com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary)) {
+        return super.equals(obj);
+      }
+      com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary other =
+          (com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary) obj;
+
+      if (!getText().equals(other.getText())) return false;
+      if (!internalGetTextSections().equals(other.internalGetTextSections())) return false;
+      if (!getAnswerRecord().equals(other.getAnswerRecord())) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + TEXT_FIELD_NUMBER;
+      hash = (53 * hash) + getText().hashCode();
+      if (!internalGetTextSections().getMap().isEmpty()) {
+        hash = (37 * hash) + TEXT_SECTIONS_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetTextSections().hashCode();
+      }
+      hash = (37 * hash) + ANSWER_RECORD_FIELD_NUMBER;
+      hash = (53 * hash) + getAnswerRecord().hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+        parseFrom(java.nio.ByteBuffer data)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+        parseFrom(
+            java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+        parseFrom(com.google.protobuf.ByteString data)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+        parseFrom(
+            com.google.protobuf.ByteString data,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+        parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+        parseFrom(byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+        parseFrom(java.io.InputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    }
+
+    public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+        parseFrom(
+            java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    }
+
+    public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+        parseDelimitedFrom(
+            java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+        parseFrom(com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    }
+
+    public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+        parseFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() {
+      return newBuilder();
+    }
+
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+
+    public static Builder newBuilder(
+        com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Generated summary for a conversation.
+     * </pre>
+     *
+     * Protobuf type {@code google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary}
+     */
+    public static final class Builder
+        extends com.google.protobuf.GeneratedMessageV3.Builder<Builder>
+        implements
+        // @@protoc_insertion_point(builder_implements:google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary)
+        com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.SummaryOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+        return com.google.cloud.dialogflow.v2.ConversationProto
+            .internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_Summary_descriptor;
+      }
+
+      @SuppressWarnings({"rawtypes"})
+      protected com.google.protobuf.MapField internalGetMapField(int number) {
+        switch (number) {
+          case 4:
+            return internalGetTextSections();
+          default:
+            throw new RuntimeException("Invalid map field number: " + number);
+        }
+      }
+
+      @SuppressWarnings({"rawtypes"})
+      protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
+        switch (number) {
+          case 4:
+            return internalGetMutableTextSections();
+          default:
+            throw new RuntimeException("Invalid map field number: " + number);
+        }
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.cloud.dialogflow.v2.ConversationProto
+            .internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_Summary_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary.class,
+                com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary.Builder
+                    .class);
+      }
+
+      // Construct using
+      // com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary.newBuilder()
+      private Builder() {}
+
+      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+      }
+
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        bitField0_ = 0;
+        text_ = "";
+        internalGetMutableTextSections().clear();
+        answerRecord_ = "";
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+        return com.google.cloud.dialogflow.v2.ConversationProto
+            .internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_Summary_descriptor;
+      }
+
+      @java.lang.Override
+      public com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+          getDefaultInstanceForType() {
+        return com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+            .getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary build() {
+        com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary result =
+            buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+          buildPartial() {
+        com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary result =
+            new com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary(this);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.text_ = text_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.textSections_ = internalGetTextSections();
+          result.textSections_.makeImmutable();
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.answerRecord_ = answerRecord_;
+        }
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other
+            instanceof com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary) {
+          return mergeFrom(
+              (com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary) other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(
+          com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary other) {
+        if (other
+            == com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+                .getDefaultInstance()) return this;
+        if (!other.getText().isEmpty()) {
+          text_ = other.text_;
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
+        internalGetMutableTextSections().mergeFrom(other.internalGetTextSections());
+        bitField0_ |= 0x00000002;
+        if (!other.getAnswerRecord().isEmpty()) {
+          answerRecord_ = other.answerRecord_;
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10:
+                {
+                  text_ = input.readStringRequireUtf8();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+              case 26:
+                {
+                  answerRecord_ = input.readStringRequireUtf8();
+                  bitField0_ |= 0x00000004;
+                  break;
+                } // case 26
+              case 34:
+                {
+                  com.google.protobuf.MapEntry<java.lang.String, java.lang.String> textSections__ =
+                      input.readMessage(
+                          TextSectionsDefaultEntryHolder.defaultEntry.getParserForType(),
+                          extensionRegistry);
+                  internalGetMutableTextSections()
+                      .getMutableMap()
+                      .put(textSections__.getKey(), textSections__.getValue());
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 34
+              default:
+                {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.unwrapIOException();
+        } finally {
+          onChanged();
+        } // finally
+        return this;
+      }
+
+      private int bitField0_;
+
+      private java.lang.Object text_ = "";
+      /**
+       *
+       *
+       * <pre>
+       * The summary content that is concatenated into one string.
+       * </pre>
+       *
+       * <code>string text = 1;</code>
+       *
+       * @return The text.
+       */
+      public java.lang.String getText() {
+        java.lang.Object ref = text_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          text_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       *
+       *
+       * <pre>
+       * The summary content that is concatenated into one string.
+       * </pre>
+       *
+       * <code>string text = 1;</code>
+       *
+       * @return The bytes for text.
+       */
+      public com.google.protobuf.ByteString getTextBytes() {
+        java.lang.Object ref = text_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b =
+              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+          text_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       *
+       *
+       * <pre>
+       * The summary content that is concatenated into one string.
+       * </pre>
+       *
+       * <code>string text = 1;</code>
+       *
+       * @param value The text to set.
+       * @return This builder for chaining.
+       */
+      public Builder setText(java.lang.String value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        text_ = value;
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * <pre>
+       * The summary content that is concatenated into one string.
+       * </pre>
+       *
+       * <code>string text = 1;</code>
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearText() {
+        text_ = getDefaultInstance().getText();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * <pre>
+       * The summary content that is concatenated into one string.
+       * </pre>
+       *
+       * <code>string text = 1;</code>
+       *
+       * @param value The bytes for text to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTextBytes(com.google.protobuf.ByteString value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        checkByteStringIsUtf8(value);
+        text_ = value;
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.MapField<java.lang.String, java.lang.String> textSections_;
+
+      private com.google.protobuf.MapField<java.lang.String, java.lang.String>
+          internalGetTextSections() {
+        if (textSections_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              TextSectionsDefaultEntryHolder.defaultEntry);
+        }
+        return textSections_;
+      }
+
+      private com.google.protobuf.MapField<java.lang.String, java.lang.String>
+          internalGetMutableTextSections() {
+        if (textSections_ == null) {
+          textSections_ =
+              com.google.protobuf.MapField.newMapField(TextSectionsDefaultEntryHolder.defaultEntry);
+        }
+        if (!textSections_.isMutable()) {
+          textSections_ = textSections_.copy();
+        }
+        bitField0_ |= 0x00000002;
+        onChanged();
+        return textSections_;
+      }
+
+      public int getTextSectionsCount() {
+        return internalGetTextSections().getMap().size();
+      }
+      /**
+       *
+       *
+       * <pre>
+       * The summary content that is divided into sections. The key is the
+       * section's name and the value is the section's content. There is no
+       * specific format for the key or value.
+       * </pre>
+       *
+       * <code>map&lt;string, string&gt; text_sections = 4;</code>
+       */
+      @java.lang.Override
+      public boolean containsTextSections(java.lang.String key) {
+        if (key == null) {
+          throw new NullPointerException("map key");
+        }
+        return internalGetTextSections().getMap().containsKey(key);
+      }
+      /** Use {@link #getTextSectionsMap()} instead. */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, java.lang.String> getTextSections() {
+        return getTextSectionsMap();
+      }
+      /**
+       *
+       *
+       * <pre>
+       * The summary content that is divided into sections. The key is the
+       * section's name and the value is the section's content. There is no
+       * specific format for the key or value.
+       * </pre>
+       *
+       * <code>map&lt;string, string&gt; text_sections = 4;</code>
+       */
+      @java.lang.Override
+      public java.util.Map<java.lang.String, java.lang.String> getTextSectionsMap() {
+        return internalGetTextSections().getMap();
+      }
+      /**
+       *
+       *
+       * <pre>
+       * The summary content that is divided into sections. The key is the
+       * section's name and the value is the section's content. There is no
+       * specific format for the key or value.
+       * </pre>
+       *
+       * <code>map&lt;string, string&gt; text_sections = 4;</code>
+       */
+      @java.lang.Override
+      public /* nullable */ java.lang.String getTextSectionsOrDefault(
+          java.lang.String key,
+          /* nullable */
+          java.lang.String defaultValue) {
+        if (key == null) {
+          throw new NullPointerException("map key");
+        }
+        java.util.Map<java.lang.String, java.lang.String> map = internalGetTextSections().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       *
+       *
+       * <pre>
+       * The summary content that is divided into sections. The key is the
+       * section's name and the value is the section's content. There is no
+       * specific format for the key or value.
+       * </pre>
+       *
+       * <code>map&lt;string, string&gt; text_sections = 4;</code>
+       */
+      @java.lang.Override
+      public java.lang.String getTextSectionsOrThrow(java.lang.String key) {
+        if (key == null) {
+          throw new NullPointerException("map key");
+        }
+        java.util.Map<java.lang.String, java.lang.String> map = internalGetTextSections().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+
+      public Builder clearTextSections() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        internalGetMutableTextSections().getMutableMap().clear();
+        return this;
+      }
+      /**
+       *
+       *
+       * <pre>
+       * The summary content that is divided into sections. The key is the
+       * section's name and the value is the section's content. There is no
+       * specific format for the key or value.
+       * </pre>
+       *
+       * <code>map&lt;string, string&gt; text_sections = 4;</code>
+       */
+      public Builder removeTextSections(java.lang.String key) {
+        if (key == null) {
+          throw new NullPointerException("map key");
+        }
+        internalGetMutableTextSections().getMutableMap().remove(key);
+        return this;
+      }
+      /** Use alternate mutation accessors instead. */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.String, java.lang.String> getMutableTextSections() {
+        bitField0_ |= 0x00000002;
+        return internalGetMutableTextSections().getMutableMap();
+      }
+      /**
+       *
+       *
+       * <pre>
+       * The summary content that is divided into sections. The key is the
+       * section's name and the value is the section's content. There is no
+       * specific format for the key or value.
+       * </pre>
+       *
+       * <code>map&lt;string, string&gt; text_sections = 4;</code>
+       */
+      public Builder putTextSections(java.lang.String key, java.lang.String value) {
+        if (key == null) {
+          throw new NullPointerException("map key");
+        }
+        if (value == null) {
+          throw new NullPointerException("map value");
+        }
+        internalGetMutableTextSections().getMutableMap().put(key, value);
+        bitField0_ |= 0x00000002;
+        return this;
+      }
+      /**
+       *
+       *
+       * <pre>
+       * The summary content that is divided into sections. The key is the
+       * section's name and the value is the section's content. There is no
+       * specific format for the key or value.
+       * </pre>
+       *
+       * <code>map&lt;string, string&gt; text_sections = 4;</code>
+       */
+      public Builder putAllTextSections(java.util.Map<java.lang.String, java.lang.String> values) {
+        internalGetMutableTextSections().getMutableMap().putAll(values);
+        bitField0_ |= 0x00000002;
+        return this;
+      }
+
+      private java.lang.Object answerRecord_ = "";
+      /**
+       *
+       *
+       * <pre>
+       * The name of the answer record. Format:
+       * "projects/&lt;Project ID&gt;/answerRecords/&lt;Answer Record ID&gt;"
+       * </pre>
+       *
+       * <code>string answer_record = 3 [(.google.api.resource_reference) = { ... }</code>
+       *
+       * @return The answerRecord.
+       */
+      public java.lang.String getAnswerRecord() {
+        java.lang.Object ref = answerRecord_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          answerRecord_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       *
+       *
+       * <pre>
+       * The name of the answer record. Format:
+       * "projects/&lt;Project ID&gt;/answerRecords/&lt;Answer Record ID&gt;"
+       * </pre>
+       *
+       * <code>string answer_record = 3 [(.google.api.resource_reference) = { ... }</code>
+       *
+       * @return The bytes for answerRecord.
+       */
+      public com.google.protobuf.ByteString getAnswerRecordBytes() {
+        java.lang.Object ref = answerRecord_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b =
+              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+          answerRecord_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       *
+       *
+       * <pre>
+       * The name of the answer record. Format:
+       * "projects/&lt;Project ID&gt;/answerRecords/&lt;Answer Record ID&gt;"
+       * </pre>
+       *
+       * <code>string answer_record = 3 [(.google.api.resource_reference) = { ... }</code>
+       *
+       * @param value The answerRecord to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAnswerRecord(java.lang.String value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        answerRecord_ = value;
+        bitField0_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * <pre>
+       * The name of the answer record. Format:
+       * "projects/&lt;Project ID&gt;/answerRecords/&lt;Answer Record ID&gt;"
+       * </pre>
+       *
+       * <code>string answer_record = 3 [(.google.api.resource_reference) = { ... }</code>
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearAnswerRecord() {
+        answerRecord_ = getDefaultInstance().getAnswerRecord();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * <pre>
+       * The name of the answer record. Format:
+       * "projects/&lt;Project ID&gt;/answerRecords/&lt;Answer Record ID&gt;"
+       * </pre>
+       *
+       * <code>string answer_record = 3 [(.google.api.resource_reference) = { ... }</code>
+       *
+       * @param value The bytes for answerRecord to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAnswerRecordBytes(com.google.protobuf.ByteString value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        checkByteStringIsUtf8(value);
+        answerRecord_ = value;
+        bitField0_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+      // @@protoc_insertion_point(builder_scope:google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary)
+    }
+
+    // @@protoc_insertion_point(class_scope:google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary)
+    private static final com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+        DEFAULT_INSTANCE;
+
+    static {
+      DEFAULT_INSTANCE =
+          new com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary();
+    }
+
+    public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+        getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<Summary> PARSER =
+        new com.google.protobuf.AbstractParser<Summary>() {
+          @java.lang.Override
+          public Summary parsePartialFrom(
+              com.google.protobuf.CodedInputStream input,
+              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+              throws com.google.protobuf.InvalidProtocolBufferException {
+            Builder builder = newBuilder();
+            try {
+              builder.mergeFrom(input, extensionRegistry);
+            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+              throw e.setUnfinishedMessage(builder.buildPartial());
+            } catch (com.google.protobuf.UninitializedMessageException e) {
+              throw e.asInvalidProtocolBufferException()
+                  .setUnfinishedMessage(builder.buildPartial());
+            } catch (java.io.IOException e) {
+              throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                  .setUnfinishedMessage(builder.buildPartial());
+            }
+            return builder.buildPartial();
+          }
+        };
+
+    public static com.google.protobuf.Parser<Summary> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Summary> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+        getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+  }
+
+  public static final int SUMMARY_FIELD_NUMBER = 1;
+  private com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary summary_;
+  /**
+   *
+   *
+   * <pre>
+   * Generated summary.
+   * </pre>
+   *
+   * <code>.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary summary = 1;
+   * </code>
+   *
+   * @return Whether the summary field is set.
+   */
+  @java.lang.Override
+  public boolean hasSummary() {
+    return summary_ != null;
+  }
+  /**
+   *
+   *
+   * <pre>
+   * Generated summary.
+   * </pre>
+   *
+   * <code>.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary summary = 1;
+   * </code>
+   *
+   * @return The summary.
+   */
+  @java.lang.Override
+  public com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary getSummary() {
+    return summary_ == null
+        ? com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+            .getDefaultInstance()
+        : summary_;
+  }
+  /**
+   *
+   *
+   * <pre>
+   * Generated summary.
+   * </pre>
+   *
+   * <code>.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary summary = 1;
+   * </code>
+   */
+  @java.lang.Override
+  public com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.SummaryOrBuilder
+      getSummaryOrBuilder() {
+    return summary_ == null
+        ? com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+            .getDefaultInstance()
+        : summary_;
+  }
+
+  public static final int LATEST_MESSAGE_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object latestMessage_ = "";
+  /**
+   *
+   *
+   * <pre>
+   * The name of the latest conversation message used as context for
+   * compiling suggestion.
+   * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+   * ID&gt;/conversations/&lt;Conversation ID&gt;/messages/&lt;Message ID&gt;`.
+   * </pre>
+   *
+   * <code>string latest_message = 2 [(.google.api.resource_reference) = { ... }</code>
+   *
+   * @return The latestMessage.
+   */
+  @java.lang.Override
+  public java.lang.String getLatestMessage() {
+    java.lang.Object ref = latestMessage_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      latestMessage_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * <pre>
+   * The name of the latest conversation message used as context for
+   * compiling suggestion.
+   * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+   * ID&gt;/conversations/&lt;Conversation ID&gt;/messages/&lt;Message ID&gt;`.
+   * </pre>
+   *
+   * <code>string latest_message = 2 [(.google.api.resource_reference) = { ... }</code>
+   *
+   * @return The bytes for latestMessage.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getLatestMessageBytes() {
+    java.lang.Object ref = latestMessage_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      latestMessage_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int CONTEXT_SIZE_FIELD_NUMBER = 3;
+  private int contextSize_ = 0;
+  /**
+   *
+   *
+   * <pre>
+   * Number of messages prior to and including
+   * [last_conversation_message][] used to compile the suggestion. It may be
+   * smaller than the [SuggestSummaryRequest.context_size][] field in the
+   * request if there weren't that many messages in the conversation.
+   * </pre>
+   *
+   * <code>int32 context_size = 3;</code>
+   *
+   * @return The contextSize.
+   */
+  @java.lang.Override
+  public int getContextSize() {
+    return contextSize_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (summary_ != null) {
+      output.writeMessage(1, getSummary());
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(latestMessage_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, latestMessage_);
+    }
+    if (contextSize_ != 0) {
+      output.writeInt32(3, contextSize_);
+    }
+    getUnknownFields().writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (summary_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getSummary());
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(latestMessage_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, latestMessage_);
+    }
+    if (contextSize_ != 0) {
+      size += com.google.protobuf.CodedOutputStream.computeInt32Size(3, contextSize_);
+    }
+    size += getUnknownFields().getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse other =
+        (com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse) obj;
+
+    if (hasSummary() != other.hasSummary()) return false;
+    if (hasSummary()) {
+      if (!getSummary().equals(other.getSummary())) return false;
+    }
+    if (!getLatestMessage().equals(other.getLatestMessage())) return false;
+    if (getContextSize() != other.getContextSize()) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasSummary()) {
+      hash = (37 * hash) + SUMMARY_FIELD_NUMBER;
+      hash = (53 * hash) + getSummary().hashCode();
+    }
+    hash = (37 * hash) + LATEST_MESSAGE_FIELD_NUMBER;
+    hash = (53 * hash) + getLatestMessage().hashCode();
+    hash = (37 * hash) + CONTEXT_SIZE_FIELD_NUMBER;
+    hash = (53 * hash) + getContextSize();
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse parseFrom(
+      java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse parseFrom(
+      byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse parseFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse
+      parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse
+      parseDelimitedFrom(
+          java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(
+      com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * <pre>
+   * The response message for
+   * [Conversations.SuggestConversationSummary][google.cloud.dialogflow.v2.Conversations.SuggestConversationSummary].
+   * </pre>
+   *
+   * Protobuf type {@code google.cloud.dialogflow.v2.SuggestConversationSummaryResponse}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder>
+      implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.dialogflow.v2.SuggestConversationSummaryResponse)
+      com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.cloud.dialogflow.v2.ConversationProto
+          .internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.dialogflow.v2.ConversationProto
+          .internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.class,
+              com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Builder.class);
+    }
+
+    // Construct using
+    // com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.newBuilder()
+    private Builder() {}
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      bitField0_ = 0;
+      summary_ = null;
+      if (summaryBuilder_ != null) {
+        summaryBuilder_.dispose();
+        summaryBuilder_ = null;
+      }
+      latestMessage_ = "";
+      contextSize_ = 0;
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.cloud.dialogflow.v2.ConversationProto
+          .internal_static_google_cloud_dialogflow_v2_SuggestConversationSummaryResponse_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse
+        getDefaultInstanceForType() {
+      return com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse build() {
+      com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse buildPartial() {
+      com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse result =
+          new com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse(this);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.summary_ = summaryBuilder_ == null ? summary_ : summaryBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.latestMessage_ = latestMessage_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.contextSize_ = contextSize_;
+      }
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse) {
+        return mergeFrom((com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(
+        com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse other) {
+      if (other
+          == com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.getDefaultInstance())
+        return this;
+      if (other.hasSummary()) {
+        mergeSummary(other.getSummary());
+      }
+      if (!other.getLatestMessage().isEmpty()) {
+        latestMessage_ = other.latestMessage_;
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
+      if (other.getContextSize() != 0) {
+        setContextSize(other.getContextSize());
+      }
+      this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getSummaryFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+            case 18:
+              {
+                latestMessage_ = input.readStringRequireUtf8();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+            case 24:
+              {
+                contextSize_ = input.readInt32();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.unwrapIOException();
+      } finally {
+        onChanged();
+      } // finally
+      return this;
+    }
+
+    private int bitField0_;
+
+    private com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary summary_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary,
+            com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary.Builder,
+            com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.SummaryOrBuilder>
+        summaryBuilder_;
+    /**
+     *
+     *
+     * <pre>
+     * Generated summary.
+     * </pre>
+     *
+     * <code>.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary summary = 1;
+     * </code>
+     *
+     * @return Whether the summary field is set.
+     */
+    public boolean hasSummary() {
+      return ((bitField0_ & 0x00000001) != 0);
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Generated summary.
+     * </pre>
+     *
+     * <code>.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary summary = 1;
+     * </code>
+     *
+     * @return The summary.
+     */
+    public com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary getSummary() {
+      if (summaryBuilder_ == null) {
+        return summary_ == null
+            ? com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+                .getDefaultInstance()
+            : summary_;
+      } else {
+        return summaryBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Generated summary.
+     * </pre>
+     *
+     * <code>.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary summary = 1;
+     * </code>
+     */
+    public Builder setSummary(
+        com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary value) {
+      if (summaryBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        summary_ = value;
+      } else {
+        summaryBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Generated summary.
+     * </pre>
+     *
+     * <code>.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary summary = 1;
+     * </code>
+     */
+    public Builder setSummary(
+        com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary.Builder
+            builderForValue) {
+      if (summaryBuilder_ == null) {
+        summary_ = builderForValue.build();
+      } else {
+        summaryBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Generated summary.
+     * </pre>
+     *
+     * <code>.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary summary = 1;
+     * </code>
+     */
+    public Builder mergeSummary(
+        com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary value) {
+      if (summaryBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) != 0)
+            && summary_ != null
+            && summary_
+                != com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+                    .getDefaultInstance()) {
+          getSummaryBuilder().mergeFrom(value);
+        } else {
+          summary_ = value;
+        }
+      } else {
+        summaryBuilder_.mergeFrom(value);
+      }
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Generated summary.
+     * </pre>
+     *
+     * <code>.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary summary = 1;
+     * </code>
+     */
+    public Builder clearSummary() {
+      bitField0_ = (bitField0_ & ~0x00000001);
+      summary_ = null;
+      if (summaryBuilder_ != null) {
+        summaryBuilder_.dispose();
+        summaryBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Generated summary.
+     * </pre>
+     *
+     * <code>.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary summary = 1;
+     * </code>
+     */
+    public com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary.Builder
+        getSummaryBuilder() {
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return getSummaryFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Generated summary.
+     * </pre>
+     *
+     * <code>.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary summary = 1;
+     * </code>
+     */
+    public com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.SummaryOrBuilder
+        getSummaryOrBuilder() {
+      if (summaryBuilder_ != null) {
+        return summaryBuilder_.getMessageOrBuilder();
+      } else {
+        return summary_ == null
+            ? com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary
+                .getDefaultInstance()
+            : summary_;
+      }
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Generated summary.
+     * </pre>
+     *
+     * <code>.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary summary = 1;
+     * </code>
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary,
+            com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary.Builder,
+            com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.SummaryOrBuilder>
+        getSummaryFieldBuilder() {
+      if (summaryBuilder_ == null) {
+        summaryBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary,
+                com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary.Builder,
+                com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.SummaryOrBuilder>(
+                getSummary(), getParentForChildren(), isClean());
+        summary_ = null;
+      }
+      return summaryBuilder_;
+    }
+
+    private java.lang.Object latestMessage_ = "";
+    /**
+     *
+     *
+     * <pre>
+     * The name of the latest conversation message used as context for
+     * compiling suggestion.
+     * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+     * ID&gt;/conversations/&lt;Conversation ID&gt;/messages/&lt;Message ID&gt;`.
+     * </pre>
+     *
+     * <code>string latest_message = 2 [(.google.api.resource_reference) = { ... }</code>
+     *
+     * @return The latestMessage.
+     */
+    public java.lang.String getLatestMessage() {
+      java.lang.Object ref = latestMessage_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        latestMessage_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * <pre>
+     * The name of the latest conversation message used as context for
+     * compiling suggestion.
+     * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+     * ID&gt;/conversations/&lt;Conversation ID&gt;/messages/&lt;Message ID&gt;`.
+     * </pre>
+     *
+     * <code>string latest_message = 2 [(.google.api.resource_reference) = { ... }</code>
+     *
+     * @return The bytes for latestMessage.
+     */
+    public com.google.protobuf.ByteString getLatestMessageBytes() {
+      java.lang.Object ref = latestMessage_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        latestMessage_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * <pre>
+     * The name of the latest conversation message used as context for
+     * compiling suggestion.
+     * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+     * ID&gt;/conversations/&lt;Conversation ID&gt;/messages/&lt;Message ID&gt;`.
+     * </pre>
+     *
+     * <code>string latest_message = 2 [(.google.api.resource_reference) = { ... }</code>
+     *
+     * @param value The latestMessage to set.
+     * @return This builder for chaining.
+     */
+    public Builder setLatestMessage(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      latestMessage_ = value;
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * The name of the latest conversation message used as context for
+     * compiling suggestion.
+     * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+     * ID&gt;/conversations/&lt;Conversation ID&gt;/messages/&lt;Message ID&gt;`.
+     * </pre>
+     *
+     * <code>string latest_message = 2 [(.google.api.resource_reference) = { ... }</code>
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearLatestMessage() {
+      latestMessage_ = getDefaultInstance().getLatestMessage();
+      bitField0_ = (bitField0_ & ~0x00000002);
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * The name of the latest conversation message used as context for
+     * compiling suggestion.
+     * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+     * ID&gt;/conversations/&lt;Conversation ID&gt;/messages/&lt;Message ID&gt;`.
+     * </pre>
+     *
+     * <code>string latest_message = 2 [(.google.api.resource_reference) = { ... }</code>
+     *
+     * @param value The bytes for latestMessage to set.
+     * @return This builder for chaining.
+     */
+    public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+      latestMessage_ = value;
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return this;
+    }
+
+    private int contextSize_;
+    /**
+     *
+     *
+     * <pre>
+     * Number of messages prior to and including
+     * [last_conversation_message][] used to compile the suggestion. It may be
+     * smaller than the [SuggestSummaryRequest.context_size][] field in the
+     * request if there weren't that many messages in the conversation.
+     * </pre>
+     *
+     * <code>int32 context_size = 3;</code>
+     *
+     * @return The contextSize.
+     */
+    @java.lang.Override
+    public int getContextSize() {
+      return contextSize_;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Number of messages prior to and including
+     * [last_conversation_message][] used to compile the suggestion. It may be
+     * smaller than the [SuggestSummaryRequest.context_size][] field in the
+     * request if there weren't that many messages in the conversation.
+     * </pre>
+     *
+     * <code>int32 context_size = 3;</code>
+     *
+     * @param value The contextSize to set.
+     * @return This builder for chaining.
+     */
+    public Builder setContextSize(int value) {
+
+      contextSize_ = value;
+      bitField0_ |= 0x00000004;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Number of messages prior to and including
+     * [last_conversation_message][] used to compile the suggestion. It may be
+     * smaller than the [SuggestSummaryRequest.context_size][] field in the
+     * request if there weren't that many messages in the conversation.
+     * </pre>
+     *
+     * <code>int32 context_size = 3;</code>
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearContextSize() {
+      bitField0_ = (bitField0_ & ~0x00000004);
+      contextSize_ = 0;
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.dialogflow.v2.SuggestConversationSummaryResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.dialogflow.v2.SuggestConversationSummaryResponse)
+  private static final com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse
+      DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse();
+  }
+
+  public static com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse
+      getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<SuggestConversationSummaryResponse> PARSER =
+      new com.google.protobuf.AbstractParser<SuggestConversationSummaryResponse>() {
+        @java.lang.Override
+        public SuggestConversationSummaryResponse parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
+
+  public static com.google.protobuf.Parser<SuggestConversationSummaryResponse> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<SuggestConversationSummaryResponse> getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse
+      getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestConversationSummaryResponseOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestConversationSummaryResponseOrBuilder.java
new file mode 100644
index 000000000000..a017b5114301
--- /dev/null
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestConversationSummaryResponseOrBuilder.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/dialogflow/v2/conversation.proto
+
+package com.google.cloud.dialogflow.v2;
+
+public interface SuggestConversationSummaryResponseOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.dialogflow.v2.SuggestConversationSummaryResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * <pre>
+   * Generated summary.
+   * </pre>
+   *
+   * <code>.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary summary = 1;
+   * </code>
+   *
+   * @return Whether the summary field is set.
+   */
+  boolean hasSummary();
+  /**
+   *
+   *
+   * <pre>
+   * Generated summary.
+   * </pre>
+   *
+   * <code>.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary summary = 1;
+   * </code>
+   *
+   * @return The summary.
+   */
+  com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary getSummary();
+  /**
+   *
+   *
+   * <pre>
+   * Generated summary.
+   * </pre>
+   *
+   * <code>.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.Summary summary = 1;
+   * </code>
+   */
+  com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse.SummaryOrBuilder
+      getSummaryOrBuilder();
+
+  /**
+   *
+   *
+   * <pre>
+   * The name of the latest conversation message used as context for
+   * compiling suggestion.
+   * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+   * ID&gt;/conversations/&lt;Conversation ID&gt;/messages/&lt;Message ID&gt;`.
+   * </pre>
+   *
+   * <code>string latest_message = 2 [(.google.api.resource_reference) = { ... }</code>
+   *
+   * @return The latestMessage.
+   */
+  java.lang.String getLatestMessage();
+  /**
+   *
+   *
+   * <pre>
+   * The name of the latest conversation message used as context for
+   * compiling suggestion.
+   * Format: `projects/&lt;Project ID&gt;/locations/&lt;Location
+   * ID&gt;/conversations/&lt;Conversation ID&gt;/messages/&lt;Message ID&gt;`.
+   * </pre>
+   *
+   * <code>string latest_message = 2 [(.google.api.resource_reference) = { ... }</code>
+   *
+   * @return The bytes for latestMessage.
+   */
+  com.google.protobuf.ByteString getLatestMessageBytes();
+
+  /**
+   *
+   *
+   * <pre>
+   * Number of messages prior to and including
+   * [last_conversation_message][] used to compile the suggestion. It may be
+   * smaller than the [SuggestSummaryRequest.context_size][] field in the
+   * request if there weren't that many messages in the conversation.
+   * </pre>
+   *
+   * <code>int32 context_size = 3;</code>
+   *
+   * @return The contextSize.
+   */
+  int getContextSize();
+}
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestFaqAnswersRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestFaqAnswersRequest.java
index f759ef82a5eb..8120377185f5 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestFaqAnswersRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestFaqAnswersRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Participants.SuggestFaqAnswers][google.cloud.dialogflow.v2.Participants.SuggestFaqAnswers].
+ * The request message for
+ * [Participants.SuggestFaqAnswers][google.cloud.dialogflow.v2.Participants.SuggestFaqAnswers].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.SuggestFaqAnswersRequest}
@@ -69,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -126,7 +129,9 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int LATEST_MESSAGE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object latestMessage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object latestMessage_ = "";
   /**
    *
    *
@@ -185,7 +190,7 @@ public com.google.protobuf.ByteString getLatestMessageBytes() {
   }
 
   public static final int CONTEXT_SIZE_FIELD_NUMBER = 3;
-  private int contextSize_;
+  private int contextSize_ = 0;
   /**
    *
    *
@@ -250,7 +255,9 @@ public com.google.cloud.dialogflow.v2.AssistQueryParameters getAssistQueryParams
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.AssistQueryParametersOrBuilder
       getAssistQueryParamsOrBuilder() {
-    return getAssistQueryParams();
+    return assistQueryParams_ == null
+        ? com.google.cloud.dialogflow.v2.AssistQueryParameters.getDefaultInstance()
+        : assistQueryParams_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -449,7 +456,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Participants.SuggestFaqAnswers][google.cloud.dialogflow.v2.Participants.SuggestFaqAnswers].
+   * The request message for
+   * [Participants.SuggestFaqAnswers][google.cloud.dialogflow.v2.Participants.SuggestFaqAnswers].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.SuggestFaqAnswersRequest}
@@ -483,16 +491,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       latestMessage_ = "";
-
       contextSize_ = 0;
-
-      if (assistQueryParamsBuilder_ == null) {
-        assistQueryParams_ = null;
-      } else {
-        assistQueryParams_ = null;
+      assistQueryParams_ = null;
+      if (assistQueryParamsBuilder_ != null) {
+        assistQueryParamsBuilder_.dispose();
         assistQueryParamsBuilder_ = null;
       }
       return this;
@@ -522,18 +527,32 @@ public com.google.cloud.dialogflow.v2.SuggestFaqAnswersRequest build() {
     public com.google.cloud.dialogflow.v2.SuggestFaqAnswersRequest buildPartial() {
       com.google.cloud.dialogflow.v2.SuggestFaqAnswersRequest result =
           new com.google.cloud.dialogflow.v2.SuggestFaqAnswersRequest(this);
-      result.parent_ = parent_;
-      result.latestMessage_ = latestMessage_;
-      result.contextSize_ = contextSize_;
-      if (assistQueryParamsBuilder_ == null) {
-        result.assistQueryParams_ = assistQueryParams_;
-      } else {
-        result.assistQueryParams_ = assistQueryParamsBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.SuggestFaqAnswersRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.latestMessage_ = latestMessage_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.contextSize_ = contextSize_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.assistQueryParams_ =
+            assistQueryParamsBuilder_ == null
+                ? assistQueryParams_
+                : assistQueryParamsBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -582,10 +601,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.SuggestFaqAnswersRequest
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLatestMessage().isEmpty()) {
         latestMessage_ = other.latestMessage_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getContextSize() != 0) {
@@ -623,26 +644,26 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 latestMessage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 contextSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 34:
               {
                 input.readMessage(
                     getAssistQueryParamsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -662,6 +683,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -735,8 +758,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -756,8 +779,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -782,8 +805,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -864,8 +887,8 @@ public Builder setLatestMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -886,8 +909,8 @@ public Builder setLatestMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLatestMessage() {
-
       latestMessage_ = getDefaultInstance().getLatestMessage();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -913,8 +936,8 @@ public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -954,6 +977,7 @@ public int getContextSize() {
     public Builder setContextSize(int value) {
 
       contextSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -971,7 +995,7 @@ public Builder setContextSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearContextSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       contextSize_ = 0;
       onChanged();
       return this;
@@ -995,7 +1019,7 @@ public Builder clearContextSize() {
      * @return Whether the assistQueryParams field is set.
      */
     public boolean hasAssistQueryParams() {
-      return assistQueryParamsBuilder_ != null || assistQueryParams_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1033,11 +1057,11 @@ public Builder setAssistQueryParams(
           throw new NullPointerException();
         }
         assistQueryParams_ = value;
-        onChanged();
       } else {
         assistQueryParamsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1053,11 +1077,11 @@ public Builder setAssistQueryParams(
         com.google.cloud.dialogflow.v2.AssistQueryParameters.Builder builderForValue) {
       if (assistQueryParamsBuilder_ == null) {
         assistQueryParams_ = builderForValue.build();
-        onChanged();
       } else {
         assistQueryParamsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1072,19 +1096,19 @@ public Builder setAssistQueryParams(
     public Builder mergeAssistQueryParams(
         com.google.cloud.dialogflow.v2.AssistQueryParameters value) {
       if (assistQueryParamsBuilder_ == null) {
-        if (assistQueryParams_ != null) {
-          assistQueryParams_ =
-              com.google.cloud.dialogflow.v2.AssistQueryParameters.newBuilder(assistQueryParams_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && assistQueryParams_ != null
+            && assistQueryParams_
+                != com.google.cloud.dialogflow.v2.AssistQueryParameters.getDefaultInstance()) {
+          getAssistQueryParamsBuilder().mergeFrom(value);
         } else {
           assistQueryParams_ = value;
         }
-        onChanged();
       } else {
         assistQueryParamsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1097,14 +1121,13 @@ public Builder mergeAssistQueryParams(
      * <code>.google.cloud.dialogflow.v2.AssistQueryParameters assist_query_params = 4;</code>
      */
     public Builder clearAssistQueryParams() {
-      if (assistQueryParamsBuilder_ == null) {
-        assistQueryParams_ = null;
-        onChanged();
-      } else {
-        assistQueryParams_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      assistQueryParams_ = null;
+      if (assistQueryParamsBuilder_ != null) {
+        assistQueryParamsBuilder_.dispose();
         assistQueryParamsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1118,7 +1141,7 @@ public Builder clearAssistQueryParams() {
      */
     public com.google.cloud.dialogflow.v2.AssistQueryParameters.Builder
         getAssistQueryParamsBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getAssistQueryParamsFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestFaqAnswersResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestFaqAnswersResponse.java
index f6f9c51ebb95..54f2cdc744f2 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestFaqAnswersResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestFaqAnswersResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Participants.SuggestFaqAnswers][google.cloud.dialogflow.v2.Participants.SuggestFaqAnswers].
+ * The request message for
+ * [Participants.SuggestFaqAnswers][google.cloud.dialogflow.v2.Participants.SuggestFaqAnswers].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.SuggestFaqAnswersResponse}
@@ -69,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int FAQ_ANSWERS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.FaqAnswer> faqAnswers_;
   /**
    *
@@ -138,7 +141,9 @@ public com.google.cloud.dialogflow.v2.FaqAnswerOrBuilder getFaqAnswersOrBuilder(
   }
 
   public static final int LATEST_MESSAGE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object latestMessage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object latestMessage_ = "";
   /**
    *
    *
@@ -193,16 +198,17 @@ public com.google.protobuf.ByteString getLatestMessageBytes() {
   }
 
   public static final int CONTEXT_SIZE_FIELD_NUMBER = 3;
-  private int contextSize_;
+  private int contextSize_ = 0;
   /**
    *
    *
    * <pre>
    * Number of messages prior to and including
-   * [latest_message][google.cloud.dialogflow.v2.SuggestFaqAnswersResponse.latest_message] to compile the
-   * suggestion. It may be smaller than the
-   * [SuggestFaqAnswersRequest.context_size][google.cloud.dialogflow.v2.SuggestFaqAnswersRequest.context_size] field in the request if there
-   * aren't that many messages in the conversation.
+   * [latest_message][google.cloud.dialogflow.v2.SuggestFaqAnswersResponse.latest_message]
+   * to compile the suggestion. It may be smaller than the
+   * [SuggestFaqAnswersRequest.context_size][google.cloud.dialogflow.v2.SuggestFaqAnswersRequest.context_size]
+   * field in the request if there aren't that many messages in the
+   * conversation.
    * </pre>
    *
    * <code>int32 context_size = 3;</code>
@@ -398,7 +404,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Participants.SuggestFaqAnswers][google.cloud.dialogflow.v2.Participants.SuggestFaqAnswers].
+   * The request message for
+   * [Participants.SuggestFaqAnswers][google.cloud.dialogflow.v2.Participants.SuggestFaqAnswers].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.SuggestFaqAnswersResponse}
@@ -432,6 +439,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (faqAnswersBuilder_ == null) {
         faqAnswers_ = java.util.Collections.emptyList();
       } else {
@@ -440,9 +448,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       latestMessage_ = "";
-
       contextSize_ = 0;
-
       return this;
     }
 
@@ -470,7 +476,16 @@ public com.google.cloud.dialogflow.v2.SuggestFaqAnswersResponse build() {
     public com.google.cloud.dialogflow.v2.SuggestFaqAnswersResponse buildPartial() {
       com.google.cloud.dialogflow.v2.SuggestFaqAnswersResponse result =
           new com.google.cloud.dialogflow.v2.SuggestFaqAnswersResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.SuggestFaqAnswersResponse result) {
       if (faqAnswersBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           faqAnswers_ = java.util.Collections.unmodifiableList(faqAnswers_);
@@ -480,10 +495,16 @@ public com.google.cloud.dialogflow.v2.SuggestFaqAnswersResponse buildPartial() {
       } else {
         result.faqAnswers_ = faqAnswersBuilder_.build();
       }
-      result.latestMessage_ = latestMessage_;
-      result.contextSize_ = contextSize_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.SuggestFaqAnswersResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.latestMessage_ = latestMessage_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.contextSize_ = contextSize_;
+      }
     }
 
     @java.lang.Override
@@ -561,6 +582,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.SuggestFaqAnswersRespons
       }
       if (!other.getLatestMessage().isEmpty()) {
         latestMessage_ = other.latestMessage_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getContextSize() != 0) {
@@ -608,13 +630,13 @@ public Builder mergeFrom(
             case 18:
               {
                 latestMessage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 contextSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             default:
@@ -1056,8 +1078,8 @@ public Builder setLatestMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1076,8 +1098,8 @@ public Builder setLatestMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLatestMessage() {
-
       latestMessage_ = getDefaultInstance().getLatestMessage();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1101,8 +1123,8 @@ public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1113,10 +1135,11 @@ public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
      *
      * <pre>
      * Number of messages prior to and including
-     * [latest_message][google.cloud.dialogflow.v2.SuggestFaqAnswersResponse.latest_message] to compile the
-     * suggestion. It may be smaller than the
-     * [SuggestFaqAnswersRequest.context_size][google.cloud.dialogflow.v2.SuggestFaqAnswersRequest.context_size] field in the request if there
-     * aren't that many messages in the conversation.
+     * [latest_message][google.cloud.dialogflow.v2.SuggestFaqAnswersResponse.latest_message]
+     * to compile the suggestion. It may be smaller than the
+     * [SuggestFaqAnswersRequest.context_size][google.cloud.dialogflow.v2.SuggestFaqAnswersRequest.context_size]
+     * field in the request if there aren't that many messages in the
+     * conversation.
      * </pre>
      *
      * <code>int32 context_size = 3;</code>
@@ -1132,10 +1155,11 @@ public int getContextSize() {
      *
      * <pre>
      * Number of messages prior to and including
-     * [latest_message][google.cloud.dialogflow.v2.SuggestFaqAnswersResponse.latest_message] to compile the
-     * suggestion. It may be smaller than the
-     * [SuggestFaqAnswersRequest.context_size][google.cloud.dialogflow.v2.SuggestFaqAnswersRequest.context_size] field in the request if there
-     * aren't that many messages in the conversation.
+     * [latest_message][google.cloud.dialogflow.v2.SuggestFaqAnswersResponse.latest_message]
+     * to compile the suggestion. It may be smaller than the
+     * [SuggestFaqAnswersRequest.context_size][google.cloud.dialogflow.v2.SuggestFaqAnswersRequest.context_size]
+     * field in the request if there aren't that many messages in the
+     * conversation.
      * </pre>
      *
      * <code>int32 context_size = 3;</code>
@@ -1146,6 +1170,7 @@ public int getContextSize() {
     public Builder setContextSize(int value) {
 
       contextSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1154,10 +1179,11 @@ public Builder setContextSize(int value) {
      *
      * <pre>
      * Number of messages prior to and including
-     * [latest_message][google.cloud.dialogflow.v2.SuggestFaqAnswersResponse.latest_message] to compile the
-     * suggestion. It may be smaller than the
-     * [SuggestFaqAnswersRequest.context_size][google.cloud.dialogflow.v2.SuggestFaqAnswersRequest.context_size] field in the request if there
-     * aren't that many messages in the conversation.
+     * [latest_message][google.cloud.dialogflow.v2.SuggestFaqAnswersResponse.latest_message]
+     * to compile the suggestion. It may be smaller than the
+     * [SuggestFaqAnswersRequest.context_size][google.cloud.dialogflow.v2.SuggestFaqAnswersRequest.context_size]
+     * field in the request if there aren't that many messages in the
+     * conversation.
      * </pre>
      *
      * <code>int32 context_size = 3;</code>
@@ -1165,7 +1191,7 @@ public Builder setContextSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearContextSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       contextSize_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestFaqAnswersResponseOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestFaqAnswersResponseOrBuilder.java
index ffc55e1d8dc1..ac0087f7e9c0 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestFaqAnswersResponseOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestFaqAnswersResponseOrBuilder.java
@@ -111,10 +111,11 @@ public interface SuggestFaqAnswersResponseOrBuilder
    *
    * <pre>
    * Number of messages prior to and including
-   * [latest_message][google.cloud.dialogflow.v2.SuggestFaqAnswersResponse.latest_message] to compile the
-   * suggestion. It may be smaller than the
-   * [SuggestFaqAnswersRequest.context_size][google.cloud.dialogflow.v2.SuggestFaqAnswersRequest.context_size] field in the request if there
-   * aren't that many messages in the conversation.
+   * [latest_message][google.cloud.dialogflow.v2.SuggestFaqAnswersResponse.latest_message]
+   * to compile the suggestion. It may be smaller than the
+   * [SuggestFaqAnswersRequest.context_size][google.cloud.dialogflow.v2.SuggestFaqAnswersRequest.context_size]
+   * field in the request if there aren't that many messages in the
+   * conversation.
    * </pre>
    *
    * <code>int32 context_size = 3;</code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestSmartRepliesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestSmartRepliesRequest.java
index 9e26dd844f36..b475eb019cf8 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestSmartRepliesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestSmartRepliesRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Participants.SuggestSmartReplies][google.cloud.dialogflow.v2.Participants.SuggestSmartReplies].
+ * The request message for
+ * [Participants.SuggestSmartReplies][google.cloud.dialogflow.v2.Participants.SuggestSmartReplies].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.SuggestSmartRepliesRequest}
@@ -69,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -176,11 +179,15 @@ public com.google.cloud.dialogflow.v2.TextInput getCurrentTextInput() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.TextInputOrBuilder getCurrentTextInputOrBuilder() {
-    return getCurrentTextInput();
+    return currentTextInput_ == null
+        ? com.google.cloud.dialogflow.v2.TextInput.getDefaultInstance()
+        : currentTextInput_;
   }
 
   public static final int LATEST_MESSAGE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object latestMessage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object latestMessage_ = "";
   /**
    *
    *
@@ -235,7 +242,7 @@ public com.google.protobuf.ByteString getLatestMessageBytes() {
   }
 
   public static final int CONTEXT_SIZE_FIELD_NUMBER = 3;
-  private int contextSize_;
+  private int contextSize_ = 0;
   /**
    *
    *
@@ -450,7 +457,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Participants.SuggestSmartReplies][google.cloud.dialogflow.v2.Participants.SuggestSmartReplies].
+   * The request message for
+   * [Participants.SuggestSmartReplies][google.cloud.dialogflow.v2.Participants.SuggestSmartReplies].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.SuggestSmartRepliesRequest}
@@ -484,18 +492,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (currentTextInputBuilder_ == null) {
-        currentTextInput_ = null;
-      } else {
-        currentTextInput_ = null;
+      currentTextInput_ = null;
+      if (currentTextInputBuilder_ != null) {
+        currentTextInputBuilder_.dispose();
         currentTextInputBuilder_ = null;
       }
       latestMessage_ = "";
-
       contextSize_ = 0;
-
       return this;
     }
 
@@ -523,18 +528,30 @@ public com.google.cloud.dialogflow.v2.SuggestSmartRepliesRequest build() {
     public com.google.cloud.dialogflow.v2.SuggestSmartRepliesRequest buildPartial() {
       com.google.cloud.dialogflow.v2.SuggestSmartRepliesRequest result =
           new com.google.cloud.dialogflow.v2.SuggestSmartRepliesRequest(this);
-      result.parent_ = parent_;
-      if (currentTextInputBuilder_ == null) {
-        result.currentTextInput_ = currentTextInput_;
-      } else {
-        result.currentTextInput_ = currentTextInputBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.latestMessage_ = latestMessage_;
-      result.contextSize_ = contextSize_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.SuggestSmartRepliesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.currentTextInput_ =
+            currentTextInputBuilder_ == null ? currentTextInput_ : currentTextInputBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.latestMessage_ = latestMessage_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.contextSize_ = contextSize_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -583,6 +600,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.SuggestSmartRepliesReque
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasCurrentTextInput()) {
@@ -590,6 +608,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.SuggestSmartRepliesReque
       }
       if (!other.getLatestMessage().isEmpty()) {
         latestMessage_ = other.latestMessage_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.getContextSize() != 0) {
@@ -624,26 +643,26 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 latestMessage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 18
             case 24:
               {
                 contextSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 24
             case 34:
               {
                 input.readMessage(
                     getCurrentTextInputFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 34
             default:
@@ -663,6 +682,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -736,8 +757,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -757,8 +778,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -783,8 +804,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -809,7 +830,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the currentTextInput field is set.
      */
     public boolean hasCurrentTextInput() {
-      return currentTextInputBuilder_ != null || currentTextInput_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -850,11 +871,11 @@ public Builder setCurrentTextInput(com.google.cloud.dialogflow.v2.TextInput valu
           throw new NullPointerException();
         }
         currentTextInput_ = value;
-        onChanged();
       } else {
         currentTextInputBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -872,11 +893,11 @@ public Builder setCurrentTextInput(
         com.google.cloud.dialogflow.v2.TextInput.Builder builderForValue) {
       if (currentTextInputBuilder_ == null) {
         currentTextInput_ = builderForValue.build();
-        onChanged();
       } else {
         currentTextInputBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -892,19 +913,18 @@ public Builder setCurrentTextInput(
      */
     public Builder mergeCurrentTextInput(com.google.cloud.dialogflow.v2.TextInput value) {
       if (currentTextInputBuilder_ == null) {
-        if (currentTextInput_ != null) {
-          currentTextInput_ =
-              com.google.cloud.dialogflow.v2.TextInput.newBuilder(currentTextInput_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && currentTextInput_ != null
+            && currentTextInput_ != com.google.cloud.dialogflow.v2.TextInput.getDefaultInstance()) {
+          getCurrentTextInputBuilder().mergeFrom(value);
         } else {
           currentTextInput_ = value;
         }
-        onChanged();
       } else {
         currentTextInputBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -919,14 +939,13 @@ public Builder mergeCurrentTextInput(com.google.cloud.dialogflow.v2.TextInput va
      * <code>.google.cloud.dialogflow.v2.TextInput current_text_input = 4;</code>
      */
     public Builder clearCurrentTextInput() {
-      if (currentTextInputBuilder_ == null) {
-        currentTextInput_ = null;
-        onChanged();
-      } else {
-        currentTextInput_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      currentTextInput_ = null;
+      if (currentTextInputBuilder_ != null) {
+        currentTextInputBuilder_.dispose();
         currentTextInputBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -941,7 +960,7 @@ public Builder clearCurrentTextInput() {
      * <code>.google.cloud.dialogflow.v2.TextInput current_text_input = 4;</code>
      */
     public com.google.cloud.dialogflow.v2.TextInput.Builder getCurrentTextInputBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getCurrentTextInputFieldBuilder().getBuilder();
     }
@@ -1063,8 +1082,8 @@ public Builder setLatestMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1083,8 +1102,8 @@ public Builder setLatestMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLatestMessage() {
-
       latestMessage_ = getDefaultInstance().getLatestMessage();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1108,8 +1127,8 @@ public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1149,6 +1168,7 @@ public int getContextSize() {
     public Builder setContextSize(int value) {
 
       contextSize_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1166,7 +1186,7 @@ public Builder setContextSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearContextSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       contextSize_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestSmartRepliesResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestSmartRepliesResponse.java
index 5739581b7661..6d740acaf5a6 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestSmartRepliesResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestSmartRepliesResponse.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The response message for [Participants.SuggestSmartReplies][google.cloud.dialogflow.v2.Participants.SuggestSmartReplies].
+ * The response message for
+ * [Participants.SuggestSmartReplies][google.cloud.dialogflow.v2.Participants.SuggestSmartReplies].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.SuggestSmartRepliesResponse}
@@ -69,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SMART_REPLY_ANSWERS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.SmartReplyAnswer> smartReplyAnswers_;
   /**
    *
@@ -160,7 +163,9 @@ public com.google.cloud.dialogflow.v2.SmartReplyAnswerOrBuilder getSmartReplyAns
   }
 
   public static final int LATEST_MESSAGE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object latestMessage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object latestMessage_ = "";
   /**
    *
    *
@@ -215,16 +220,17 @@ public com.google.protobuf.ByteString getLatestMessageBytes() {
   }
 
   public static final int CONTEXT_SIZE_FIELD_NUMBER = 3;
-  private int contextSize_;
+  private int contextSize_ = 0;
   /**
    *
    *
    * <pre>
    * Number of messages prior to and including
-   * [latest_message][google.cloud.dialogflow.v2.SuggestSmartRepliesResponse.latest_message] to compile the
-   * suggestion. It may be smaller than the
-   * [SuggestSmartRepliesRequest.context_size][google.cloud.dialogflow.v2.SuggestSmartRepliesRequest.context_size] field in the request if there
-   * aren't that many messages in the conversation.
+   * [latest_message][google.cloud.dialogflow.v2.SuggestSmartRepliesResponse.latest_message]
+   * to compile the suggestion. It may be smaller than the
+   * [SuggestSmartRepliesRequest.context_size][google.cloud.dialogflow.v2.SuggestSmartRepliesRequest.context_size]
+   * field in the request if there aren't that many messages in the
+   * conversation.
    * </pre>
    *
    * <code>int32 context_size = 3;</code>
@@ -421,7 +427,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The response message for [Participants.SuggestSmartReplies][google.cloud.dialogflow.v2.Participants.SuggestSmartReplies].
+   * The response message for
+   * [Participants.SuggestSmartReplies][google.cloud.dialogflow.v2.Participants.SuggestSmartReplies].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.SuggestSmartRepliesResponse}
@@ -455,6 +462,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (smartReplyAnswersBuilder_ == null) {
         smartReplyAnswers_ = java.util.Collections.emptyList();
       } else {
@@ -463,9 +471,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       latestMessage_ = "";
-
       contextSize_ = 0;
-
       return this;
     }
 
@@ -493,7 +499,16 @@ public com.google.cloud.dialogflow.v2.SuggestSmartRepliesResponse build() {
     public com.google.cloud.dialogflow.v2.SuggestSmartRepliesResponse buildPartial() {
       com.google.cloud.dialogflow.v2.SuggestSmartRepliesResponse result =
           new com.google.cloud.dialogflow.v2.SuggestSmartRepliesResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.SuggestSmartRepliesResponse result) {
       if (smartReplyAnswersBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           smartReplyAnswers_ = java.util.Collections.unmodifiableList(smartReplyAnswers_);
@@ -503,10 +518,16 @@ public com.google.cloud.dialogflow.v2.SuggestSmartRepliesResponse buildPartial()
       } else {
         result.smartReplyAnswers_ = smartReplyAnswersBuilder_.build();
       }
-      result.latestMessage_ = latestMessage_;
-      result.contextSize_ = contextSize_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.SuggestSmartRepliesResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.latestMessage_ = latestMessage_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.contextSize_ = contextSize_;
+      }
     }
 
     @java.lang.Override
@@ -584,6 +605,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.SuggestSmartRepliesRespo
       }
       if (!other.getLatestMessage().isEmpty()) {
         latestMessage_ = other.latestMessage_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getContextSize() != 0) {
@@ -632,13 +654,13 @@ public Builder mergeFrom(
             case 18:
               {
                 latestMessage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 contextSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             default:
@@ -1163,8 +1185,8 @@ public Builder setLatestMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1183,8 +1205,8 @@ public Builder setLatestMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLatestMessage() {
-
       latestMessage_ = getDefaultInstance().getLatestMessage();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1208,8 +1230,8 @@ public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1220,10 +1242,11 @@ public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
      *
      * <pre>
      * Number of messages prior to and including
-     * [latest_message][google.cloud.dialogflow.v2.SuggestSmartRepliesResponse.latest_message] to compile the
-     * suggestion. It may be smaller than the
-     * [SuggestSmartRepliesRequest.context_size][google.cloud.dialogflow.v2.SuggestSmartRepliesRequest.context_size] field in the request if there
-     * aren't that many messages in the conversation.
+     * [latest_message][google.cloud.dialogflow.v2.SuggestSmartRepliesResponse.latest_message]
+     * to compile the suggestion. It may be smaller than the
+     * [SuggestSmartRepliesRequest.context_size][google.cloud.dialogflow.v2.SuggestSmartRepliesRequest.context_size]
+     * field in the request if there aren't that many messages in the
+     * conversation.
      * </pre>
      *
      * <code>int32 context_size = 3;</code>
@@ -1239,10 +1262,11 @@ public int getContextSize() {
      *
      * <pre>
      * Number of messages prior to and including
-     * [latest_message][google.cloud.dialogflow.v2.SuggestSmartRepliesResponse.latest_message] to compile the
-     * suggestion. It may be smaller than the
-     * [SuggestSmartRepliesRequest.context_size][google.cloud.dialogflow.v2.SuggestSmartRepliesRequest.context_size] field in the request if there
-     * aren't that many messages in the conversation.
+     * [latest_message][google.cloud.dialogflow.v2.SuggestSmartRepliesResponse.latest_message]
+     * to compile the suggestion. It may be smaller than the
+     * [SuggestSmartRepliesRequest.context_size][google.cloud.dialogflow.v2.SuggestSmartRepliesRequest.context_size]
+     * field in the request if there aren't that many messages in the
+     * conversation.
      * </pre>
      *
      * <code>int32 context_size = 3;</code>
@@ -1253,6 +1277,7 @@ public int getContextSize() {
     public Builder setContextSize(int value) {
 
       contextSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1261,10 +1286,11 @@ public Builder setContextSize(int value) {
      *
      * <pre>
      * Number of messages prior to and including
-     * [latest_message][google.cloud.dialogflow.v2.SuggestSmartRepliesResponse.latest_message] to compile the
-     * suggestion. It may be smaller than the
-     * [SuggestSmartRepliesRequest.context_size][google.cloud.dialogflow.v2.SuggestSmartRepliesRequest.context_size] field in the request if there
-     * aren't that many messages in the conversation.
+     * [latest_message][google.cloud.dialogflow.v2.SuggestSmartRepliesResponse.latest_message]
+     * to compile the suggestion. It may be smaller than the
+     * [SuggestSmartRepliesRequest.context_size][google.cloud.dialogflow.v2.SuggestSmartRepliesRequest.context_size]
+     * field in the request if there aren't that many messages in the
+     * conversation.
      * </pre>
      *
      * <code>int32 context_size = 3;</code>
@@ -1272,7 +1298,7 @@ public Builder setContextSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearContextSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       contextSize_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestSmartRepliesResponseOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestSmartRepliesResponseOrBuilder.java
index ce4bdbeaf4da..ccdcc1941bb4 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestSmartRepliesResponseOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestSmartRepliesResponseOrBuilder.java
@@ -131,10 +131,11 @@ public interface SuggestSmartRepliesResponseOrBuilder
    *
    * <pre>
    * Number of messages prior to and including
-   * [latest_message][google.cloud.dialogflow.v2.SuggestSmartRepliesResponse.latest_message] to compile the
-   * suggestion. It may be smaller than the
-   * [SuggestSmartRepliesRequest.context_size][google.cloud.dialogflow.v2.SuggestSmartRepliesRequest.context_size] field in the request if there
-   * aren't that many messages in the conversation.
+   * [latest_message][google.cloud.dialogflow.v2.SuggestSmartRepliesResponse.latest_message]
+   * to compile the suggestion. It may be smaller than the
+   * [SuggestSmartRepliesRequest.context_size][google.cloud.dialogflow.v2.SuggestSmartRepliesRequest.context_size]
+   * field in the request if there aren't that many messages in the
+   * conversation.
    * </pre>
    *
    * <code>int32 context_size = 3;</code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestionFeature.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestionFeature.java
index c18d430a9c55..db2f4f5ca096 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestionFeature.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestionFeature.java
@@ -249,7 +249,7 @@ private Type(int value) {
   }
 
   public static final int TYPE_FIELD_NUMBER = 1;
-  private int type_;
+  private int type_ = 0;
   /**
    *
    *
@@ -278,9 +278,8 @@ public int getTypeValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.SuggestionFeature.Type getType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.SuggestionFeature.Type result =
-        com.google.cloud.dialogflow.v2.SuggestionFeature.Type.valueOf(type_);
+        com.google.cloud.dialogflow.v2.SuggestionFeature.Type.forNumber(type_);
     return result == null
         ? com.google.cloud.dialogflow.v2.SuggestionFeature.Type.UNRECOGNIZED
         : result;
@@ -487,8 +486,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       type_ = 0;
-
       return this;
     }
 
@@ -516,11 +515,20 @@ public com.google.cloud.dialogflow.v2.SuggestionFeature build() {
     public com.google.cloud.dialogflow.v2.SuggestionFeature buildPartial() {
       com.google.cloud.dialogflow.v2.SuggestionFeature result =
           new com.google.cloud.dialogflow.v2.SuggestionFeature(this);
-      result.type_ = type_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.SuggestionFeature result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.type_ = type_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -599,7 +607,7 @@ public Builder mergeFrom(
             case 8:
               {
                 type_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             default:
@@ -619,6 +627,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private int type_ = 0;
     /**
      *
@@ -648,8 +658,8 @@ public int getTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setTypeValue(int value) {
-
       type_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -666,9 +676,8 @@ public Builder setTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.SuggestionFeature.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.SuggestionFeature.Type result =
-          com.google.cloud.dialogflow.v2.SuggestionFeature.Type.valueOf(type_);
+          com.google.cloud.dialogflow.v2.SuggestionFeature.Type.forNumber(type_);
       return result == null
           ? com.google.cloud.dialogflow.v2.SuggestionFeature.Type.UNRECOGNIZED
           : result;
@@ -689,7 +698,7 @@ public Builder setType(com.google.cloud.dialogflow.v2.SuggestionFeature.Type val
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       type_ = value.getNumber();
       onChanged();
       return this;
@@ -706,7 +715,7 @@ public Builder setType(com.google.cloud.dialogflow.v2.SuggestionFeature.Type val
      * @return This builder for chaining.
      */
     public Builder clearType() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       type_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestionResult.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestionResult.java
index 370daea8a57f..dfbce9f8eb12 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestionResult.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestionResult.java
@@ -23,8 +23,12 @@
  *
  * <pre>
  * One response of different type of suggestion response which is used in
- * the response of [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent] and
- * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent], as well as [HumanAgentAssistantEvent][google.cloud.dialogflow.v2.HumanAgentAssistantEvent].
+ * the response of
+ * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent]
+ * and
+ * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent],
+ * as well as
+ * [HumanAgentAssistantEvent][google.cloud.dialogflow.v2.HumanAgentAssistantEvent].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.SuggestionResult}
@@ -566,8 +570,12 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * <pre>
    * One response of different type of suggestion response which is used in
-   * the response of [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent] and
-   * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent], as well as [HumanAgentAssistantEvent][google.cloud.dialogflow.v2.HumanAgentAssistantEvent].
+   * the response of
+   * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent]
+   * and
+   * [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent],
+   * as well as
+   * [HumanAgentAssistantEvent][google.cloud.dialogflow.v2.HumanAgentAssistantEvent].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.SuggestionResult}
@@ -601,6 +609,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (errorBuilder_ != null) {
         errorBuilder_.clear();
       }
@@ -642,37 +651,33 @@ public com.google.cloud.dialogflow.v2.SuggestionResult build() {
     public com.google.cloud.dialogflow.v2.SuggestionResult buildPartial() {
       com.google.cloud.dialogflow.v2.SuggestionResult result =
           new com.google.cloud.dialogflow.v2.SuggestionResult(this);
-      if (suggestionResponseCase_ == 1) {
-        if (errorBuilder_ == null) {
-          result.suggestionResponse_ = suggestionResponse_;
-        } else {
-          result.suggestionResponse_ = errorBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (suggestionResponseCase_ == 2) {
-        if (suggestArticlesResponseBuilder_ == null) {
-          result.suggestionResponse_ = suggestionResponse_;
-        } else {
-          result.suggestionResponse_ = suggestArticlesResponseBuilder_.build();
-        }
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.SuggestionResult result) {
+      int from_bitField0_ = bitField0_;
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2.SuggestionResult result) {
+      result.suggestionResponseCase_ = suggestionResponseCase_;
+      result.suggestionResponse_ = this.suggestionResponse_;
+      if (suggestionResponseCase_ == 1 && errorBuilder_ != null) {
+        result.suggestionResponse_ = errorBuilder_.build();
       }
-      if (suggestionResponseCase_ == 3) {
-        if (suggestFaqAnswersResponseBuilder_ == null) {
-          result.suggestionResponse_ = suggestionResponse_;
-        } else {
-          result.suggestionResponse_ = suggestFaqAnswersResponseBuilder_.build();
-        }
+      if (suggestionResponseCase_ == 2 && suggestArticlesResponseBuilder_ != null) {
+        result.suggestionResponse_ = suggestArticlesResponseBuilder_.build();
       }
-      if (suggestionResponseCase_ == 4) {
-        if (suggestSmartRepliesResponseBuilder_ == null) {
-          result.suggestionResponse_ = suggestionResponse_;
-        } else {
-          result.suggestionResponse_ = suggestSmartRepliesResponseBuilder_.build();
-        }
+      if (suggestionResponseCase_ == 3 && suggestFaqAnswersResponseBuilder_ != null) {
+        result.suggestionResponse_ = suggestFaqAnswersResponseBuilder_.build();
+      }
+      if (suggestionResponseCase_ == 4 && suggestSmartRepliesResponseBuilder_ != null) {
+        result.suggestionResponse_ = suggestSmartRepliesResponseBuilder_.build();
       }
-      result.suggestionResponseCase_ = suggestionResponseCase_;
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -831,6 +836,8 @@ public Builder clearSuggestionResponse() {
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder>
         errorBuilder_;
@@ -1029,7 +1036,6 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
       }
       suggestionResponseCase_ = 1;
       onChanged();
-      ;
       return errorBuilder_;
     }
 
@@ -1254,7 +1260,6 @@ public Builder clearSuggestArticlesResponse() {
       }
       suggestionResponseCase_ = 2;
       onChanged();
-      ;
       return suggestArticlesResponseBuilder_;
     }
 
@@ -1480,7 +1485,6 @@ public Builder clearSuggestFaqAnswersResponse() {
       }
       suggestionResponseCase_ = 3;
       onChanged();
-      ;
       return suggestFaqAnswersResponseBuilder_;
     }
 
@@ -1717,7 +1721,6 @@ public Builder clearSuggestSmartRepliesResponse() {
       }
       suggestionResponseCase_ = 4;
       onChanged();
-      ;
       return suggestSmartRepliesResponseBuilder_;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SynthesizeSpeechConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SynthesizeSpeechConfig.java
index a7512b14b7ac..6af51895ac80 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SynthesizeSpeechConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SynthesizeSpeechConfig.java
@@ -68,7 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SPEAKING_RATE_FIELD_NUMBER = 1;
-  private double speakingRate_;
+  private double speakingRate_ = 0D;
   /**
    *
    *
@@ -89,7 +89,7 @@ public double getSpeakingRate() {
   }
 
   public static final int PITCH_FIELD_NUMBER = 2;
-  private double pitch_;
+  private double pitch_ = 0D;
   /**
    *
    *
@@ -109,7 +109,7 @@ public double getPitch() {
   }
 
   public static final int VOLUME_GAIN_DB_FIELD_NUMBER = 3;
-  private double volumeGainDb_;
+  private double volumeGainDb_ = 0D;
   /**
    *
    *
@@ -134,6 +134,8 @@ public double getVolumeGainDb() {
   }
 
   public static final int EFFECTS_PROFILE_ID_FIELD_NUMBER = 5;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList effectsProfileId_;
   /**
    *
@@ -247,7 +249,9 @@ public com.google.cloud.dialogflow.v2.VoiceSelectionParams getVoice() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.VoiceSelectionParamsOrBuilder getVoiceOrBuilder() {
-    return getVoice();
+    return voice_ == null
+        ? com.google.cloud.dialogflow.v2.VoiceSelectionParams.getDefaultInstance()
+        : voice_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -507,18 +511,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       speakingRate_ = 0D;
-
       pitch_ = 0D;
-
       volumeGainDb_ = 0D;
-
       effectsProfileId_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
-      if (voiceBuilder_ == null) {
-        voice_ = null;
-      } else {
-        voice_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      voice_ = null;
+      if (voiceBuilder_ != null) {
+        voiceBuilder_.dispose();
         voiceBuilder_ = null;
       }
       return this;
@@ -548,22 +549,37 @@ public com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig build() {
     public com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig buildPartial() {
       com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig result =
           new com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig(this);
-      int from_bitField0_ = bitField0_;
-      result.speakingRate_ = speakingRate_;
-      result.pitch_ = pitch_;
-      result.volumeGainDb_ = volumeGainDb_;
-      if (((bitField0_ & 0x00000001) != 0)) {
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig result) {
+      if (((bitField0_ & 0x00000008) != 0)) {
         effectsProfileId_ = effectsProfileId_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000008);
       }
       result.effectsProfileId_ = effectsProfileId_;
-      if (voiceBuilder_ == null) {
-        result.voice_ = voice_;
-      } else {
-        result.voice_ = voiceBuilder_.build();
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.speakingRate_ = speakingRate_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pitch_ = pitch_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.volumeGainDb_ = volumeGainDb_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.voice_ = voiceBuilder_ == null ? voice_ : voiceBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -624,7 +640,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig o
       if (!other.effectsProfileId_.isEmpty()) {
         if (effectsProfileId_.isEmpty()) {
           effectsProfileId_ = other.effectsProfileId_;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000008);
         } else {
           ensureEffectsProfileIdIsMutable();
           effectsProfileId_.addAll(other.effectsProfileId_);
@@ -663,25 +679,25 @@ public Builder mergeFrom(
             case 9:
               {
                 speakingRate_ = input.readDouble();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 9
             case 17:
               {
                 pitch_ = input.readDouble();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 17
             case 25:
               {
                 volumeGainDb_ = input.readDouble();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 25
             case 34:
               {
                 input.readMessage(getVoiceFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 34
             case 42:
@@ -747,6 +763,7 @@ public double getSpeakingRate() {
     public Builder setSpeakingRate(double value) {
 
       speakingRate_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -765,7 +782,7 @@ public Builder setSpeakingRate(double value) {
      * @return This builder for chaining.
      */
     public Builder clearSpeakingRate() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       speakingRate_ = 0D;
       onChanged();
       return this;
@@ -806,6 +823,7 @@ public double getPitch() {
     public Builder setPitch(double value) {
 
       pitch_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -823,7 +841,7 @@ public Builder setPitch(double value) {
      * @return This builder for chaining.
      */
     public Builder clearPitch() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pitch_ = 0D;
       onChanged();
       return this;
@@ -874,6 +892,7 @@ public double getVolumeGainDb() {
     public Builder setVolumeGainDb(double value) {
 
       volumeGainDb_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -896,7 +915,7 @@ public Builder setVolumeGainDb(double value) {
      * @return This builder for chaining.
      */
     public Builder clearVolumeGainDb() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       volumeGainDb_ = 0D;
       onChanged();
       return this;
@@ -906,9 +925,9 @@ public Builder clearVolumeGainDb() {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureEffectsProfileIdIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         effectsProfileId_ = new com.google.protobuf.LazyStringArrayList(effectsProfileId_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000008;
       }
     }
     /**
@@ -1059,7 +1078,7 @@ public Builder addAllEffectsProfileId(java.lang.Iterable<java.lang.String> value
      */
     public Builder clearEffectsProfileId() {
       effectsProfileId_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1106,7 +1125,7 @@ public Builder addEffectsProfileIdBytes(com.google.protobuf.ByteString value) {
      * @return Whether the voice field is set.
      */
     public boolean hasVoice() {
-      return voiceBuilder_ != null || voice_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -1143,11 +1162,11 @@ public Builder setVoice(com.google.cloud.dialogflow.v2.VoiceSelectionParams valu
           throw new NullPointerException();
         }
         voice_ = value;
-        onChanged();
       } else {
         voiceBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1163,11 +1182,11 @@ public Builder setVoice(
         com.google.cloud.dialogflow.v2.VoiceSelectionParams.Builder builderForValue) {
       if (voiceBuilder_ == null) {
         voice_ = builderForValue.build();
-        onChanged();
       } else {
         voiceBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1181,19 +1200,18 @@ public Builder setVoice(
      */
     public Builder mergeVoice(com.google.cloud.dialogflow.v2.VoiceSelectionParams value) {
       if (voiceBuilder_ == null) {
-        if (voice_ != null) {
-          voice_ =
-              com.google.cloud.dialogflow.v2.VoiceSelectionParams.newBuilder(voice_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && voice_ != null
+            && voice_ != com.google.cloud.dialogflow.v2.VoiceSelectionParams.getDefaultInstance()) {
+          getVoiceBuilder().mergeFrom(value);
         } else {
           voice_ = value;
         }
-        onChanged();
       } else {
         voiceBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1206,14 +1224,13 @@ public Builder mergeVoice(com.google.cloud.dialogflow.v2.VoiceSelectionParams va
      * <code>.google.cloud.dialogflow.v2.VoiceSelectionParams voice = 4;</code>
      */
     public Builder clearVoice() {
-      if (voiceBuilder_ == null) {
-        voice_ = null;
-        onChanged();
-      } else {
-        voice_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      voice_ = null;
+      if (voiceBuilder_ != null) {
+        voiceBuilder_.dispose();
         voiceBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1226,7 +1243,7 @@ public Builder clearVoice() {
      * <code>.google.cloud.dialogflow.v2.VoiceSelectionParams voice = 4;</code>
      */
     public com.google.cloud.dialogflow.v2.VoiceSelectionParams.Builder getVoiceBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getVoiceFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TelephonyDtmfEvents.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TelephonyDtmfEvents.java
index e08621737910..e216efe09255 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TelephonyDtmfEvents.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TelephonyDtmfEvents.java
@@ -68,16 +68,18 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int DTMF_EVENTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<java.lang.Integer> dtmfEvents_;
+
   private static final com.google.protobuf.Internal.ListAdapter.Converter<
           java.lang.Integer, com.google.cloud.dialogflow.v2.TelephonyDtmf>
       dtmfEvents_converter_ =
           new com.google.protobuf.Internal.ListAdapter.Converter<
               java.lang.Integer, com.google.cloud.dialogflow.v2.TelephonyDtmf>() {
             public com.google.cloud.dialogflow.v2.TelephonyDtmf convert(java.lang.Integer from) {
-              @SuppressWarnings("deprecation")
               com.google.cloud.dialogflow.v2.TelephonyDtmf result =
-                  com.google.cloud.dialogflow.v2.TelephonyDtmf.valueOf(from);
+                  com.google.cloud.dialogflow.v2.TelephonyDtmf.forNumber(from);
               return result == null
                   ? com.google.cloud.dialogflow.v2.TelephonyDtmf.UNRECOGNIZED
                   : result;
@@ -378,6 +380,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       dtmfEvents_ = java.util.Collections.emptyList();
       bitField0_ = (bitField0_ & ~0x00000001);
       return this;
@@ -407,14 +410,25 @@ public com.google.cloud.dialogflow.v2.TelephonyDtmfEvents build() {
     public com.google.cloud.dialogflow.v2.TelephonyDtmfEvents buildPartial() {
       com.google.cloud.dialogflow.v2.TelephonyDtmfEvents result =
           new com.google.cloud.dialogflow.v2.TelephonyDtmfEvents(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.TelephonyDtmfEvents result) {
       if (((bitField0_ & 0x00000001) != 0)) {
         dtmfEvents_ = java.util.Collections.unmodifiableList(dtmfEvents_);
         bitField0_ = (bitField0_ & ~0x00000001);
       }
       result.dtmfEvents_ = dtmfEvents_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.TelephonyDtmfEvents result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TextInput.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TextInput.java
index b22c8359e200..5b949fbd6262 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TextInput.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TextInput.java
@@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int TEXT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object text_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object text_ = "";
   /**
    *
    *
@@ -122,7 +124,9 @@ public com.google.protobuf.ByteString getTextBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -383,10 +387,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       text_ = "";
-
       languageCode_ = "";
-
       return this;
     }
 
@@ -414,12 +417,23 @@ public com.google.cloud.dialogflow.v2.TextInput build() {
     public com.google.cloud.dialogflow.v2.TextInput buildPartial() {
       com.google.cloud.dialogflow.v2.TextInput result =
           new com.google.cloud.dialogflow.v2.TextInput(this);
-      result.text_ = text_;
-      result.languageCode_ = languageCode_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.TextInput result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.text_ = text_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -467,10 +481,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.TextInput other) {
       if (other == com.google.cloud.dialogflow.v2.TextInput.getDefaultInstance()) return this;
       if (!other.getText().isEmpty()) {
         text_ = other.text_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -502,13 +518,13 @@ public Builder mergeFrom(
             case 10:
               {
                 text_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -528,6 +544,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object text_ = "";
     /**
      *
@@ -592,8 +610,8 @@ public Builder setText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       text_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -610,8 +628,8 @@ public Builder setText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearText() {
-
       text_ = getDefaultInstance().getText();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -633,8 +651,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       text_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -709,8 +727,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -729,8 +747,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -754,8 +772,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TextToSpeechSettings.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TextToSpeechSettings.java
index f02bab8a14ad..1ac1aca52bf3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TextToSpeechSettings.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TextToSpeechSettings.java
@@ -79,13 +79,13 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   }
 
   public static final int ENABLE_TEXT_TO_SPEECH_FIELD_NUMBER = 1;
-  private boolean enableTextToSpeech_;
+  private boolean enableTextToSpeech_ = false;
   /**
    *
    *
    * <pre>
-   * Optional. Indicates whether text to speech is enabled. Even when this field is false,
-   * other settings in this proto are still retained.
+   * Optional. Indicates whether text to speech is enabled. Even when this field
+   * is false, other settings in this proto are still retained.
    * </pre>
    *
    * <code>bool enable_text_to_speech = 1 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -98,7 +98,7 @@ public boolean getEnableTextToSpeech() {
   }
 
   public static final int OUTPUT_AUDIO_ENCODING_FIELD_NUMBER = 2;
-  private int outputAudioEncoding_;
+  private int outputAudioEncoding_ = 0;
   /**
    *
    *
@@ -131,25 +131,24 @@ public int getOutputAudioEncodingValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.OutputAudioEncoding getOutputAudioEncoding() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.OutputAudioEncoding result =
-        com.google.cloud.dialogflow.v2.OutputAudioEncoding.valueOf(outputAudioEncoding_);
+        com.google.cloud.dialogflow.v2.OutputAudioEncoding.forNumber(outputAudioEncoding_);
     return result == null
         ? com.google.cloud.dialogflow.v2.OutputAudioEncoding.UNRECOGNIZED
         : result;
   }
 
   public static final int SAMPLE_RATE_HERTZ_FIELD_NUMBER = 3;
-  private int sampleRateHertz_;
+  private int sampleRateHertz_ = 0;
   /**
    *
    *
    * <pre>
-   * Optional. The synthesis sample rate (in hertz) for this audio. If not provided, then
-   * the synthesizer will use the default sample rate based on the audio
-   * encoding. If this is different from the voice's natural sample rate, then
-   * the synthesizer will honor this request by converting to the desired sample
-   * rate (which might result in worse audio quality).
+   * Optional. The synthesis sample rate (in hertz) for this audio. If not
+   * provided, then the synthesizer will use the default sample rate based on
+   * the audio encoding. If this is different from the voice's natural sample
+   * rate, then the synthesizer will honor this request by converting to the
+   * desired sample rate (which might result in worse audio quality).
    * </pre>
    *
    * <code>int32 sample_rate_hertz = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -178,6 +177,7 @@ private static final class SynthesizeSpeechConfigsDefaultEntryHolder {
                         com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig.getDefaultInstance());
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<
           java.lang.String, com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig>
       synthesizeSpeechConfigs_;
@@ -199,8 +199,8 @@ public int getSynthesizeSpeechConfigsCount() {
    *
    *
    * <pre>
-   * Optional. Configuration of how speech should be synthesized, mapping from language
-   * (https://cloud.google.com/dialogflow/docs/reference/language) to
+   * Optional. Configuration of how speech should be synthesized, mapping from
+   * language (https://cloud.google.com/dialogflow/docs/reference/language) to
    * SynthesizeSpeechConfig.
    * </pre>
    *
@@ -226,8 +226,8 @@ public boolean containsSynthesizeSpeechConfigs(java.lang.String key) {
    *
    *
    * <pre>
-   * Optional. Configuration of how speech should be synthesized, mapping from language
-   * (https://cloud.google.com/dialogflow/docs/reference/language) to
+   * Optional. Configuration of how speech should be synthesized, mapping from
+   * language (https://cloud.google.com/dialogflow/docs/reference/language) to
    * SynthesizeSpeechConfig.
    * </pre>
    *
@@ -244,8 +244,8 @@ public boolean containsSynthesizeSpeechConfigs(java.lang.String key) {
    *
    *
    * <pre>
-   * Optional. Configuration of how speech should be synthesized, mapping from language
-   * (https://cloud.google.com/dialogflow/docs/reference/language) to
+   * Optional. Configuration of how speech should be synthesized, mapping from
+   * language (https://cloud.google.com/dialogflow/docs/reference/language) to
    * SynthesizeSpeechConfig.
    * </pre>
    *
@@ -254,8 +254,11 @@ public boolean containsSynthesizeSpeechConfigs(java.lang.String key) {
    * </code>
    */
   @java.lang.Override
-  public com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig getSynthesizeSpeechConfigsOrDefault(
-      java.lang.String key, com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig defaultValue) {
+  public /* nullable */ com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig
+      getSynthesizeSpeechConfigsOrDefault(
+          java.lang.String key,
+          /* nullable */
+          com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -267,8 +270,8 @@ public com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig getSynthesizeSpeech
    *
    *
    * <pre>
-   * Optional. Configuration of how speech should be synthesized, mapping from language
-   * (https://cloud.google.com/dialogflow/docs/reference/language) to
+   * Optional. Configuration of how speech should be synthesized, mapping from
+   * language (https://cloud.google.com/dialogflow/docs/reference/language) to
    * SynthesizeSpeechConfig.
    * </pre>
    *
@@ -554,12 +557,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       enableTextToSpeech_ = false;
-
       outputAudioEncoding_ = 0;
-
       sampleRateHertz_ = 0;
-
       internalGetMutableSynthesizeSpeechConfigs().clear();
       return this;
     }
@@ -588,16 +589,30 @@ public com.google.cloud.dialogflow.v2.TextToSpeechSettings build() {
     public com.google.cloud.dialogflow.v2.TextToSpeechSettings buildPartial() {
       com.google.cloud.dialogflow.v2.TextToSpeechSettings result =
           new com.google.cloud.dialogflow.v2.TextToSpeechSettings(this);
-      int from_bitField0_ = bitField0_;
-      result.enableTextToSpeech_ = enableTextToSpeech_;
-      result.outputAudioEncoding_ = outputAudioEncoding_;
-      result.sampleRateHertz_ = sampleRateHertz_;
-      result.synthesizeSpeechConfigs_ = internalGetSynthesizeSpeechConfigs();
-      result.synthesizeSpeechConfigs_.makeImmutable();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.TextToSpeechSettings result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.enableTextToSpeech_ = enableTextToSpeech_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.outputAudioEncoding_ = outputAudioEncoding_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.sampleRateHertz_ = sampleRateHertz_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.synthesizeSpeechConfigs_ = internalGetSynthesizeSpeechConfigs();
+        result.synthesizeSpeechConfigs_.makeImmutable();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -655,6 +670,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.TextToSpeechSettings oth
       }
       internalGetMutableSynthesizeSpeechConfigs()
           .mergeFrom(other.internalGetSynthesizeSpeechConfigs());
+      bitField0_ |= 0x00000008;
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -684,19 +700,19 @@ public Builder mergeFrom(
             case 8:
               {
                 enableTextToSpeech_ = input.readBool();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 16:
               {
                 outputAudioEncoding_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 24:
               {
                 sampleRateHertz_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 34:
@@ -711,6 +727,7 @@ public Builder mergeFrom(
                 internalGetMutableSynthesizeSpeechConfigs()
                     .getMutableMap()
                     .put(synthesizeSpeechConfigs__.getKey(), synthesizeSpeechConfigs__.getValue());
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -737,8 +754,8 @@ public Builder mergeFrom(
      *
      *
      * <pre>
-     * Optional. Indicates whether text to speech is enabled. Even when this field is false,
-     * other settings in this proto are still retained.
+     * Optional. Indicates whether text to speech is enabled. Even when this field
+     * is false, other settings in this proto are still retained.
      * </pre>
      *
      * <code>bool enable_text_to_speech = 1 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -753,8 +770,8 @@ public boolean getEnableTextToSpeech() {
      *
      *
      * <pre>
-     * Optional. Indicates whether text to speech is enabled. Even when this field is false,
-     * other settings in this proto are still retained.
+     * Optional. Indicates whether text to speech is enabled. Even when this field
+     * is false, other settings in this proto are still retained.
      * </pre>
      *
      * <code>bool enable_text_to_speech = 1 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -765,6 +782,7 @@ public boolean getEnableTextToSpeech() {
     public Builder setEnableTextToSpeech(boolean value) {
 
       enableTextToSpeech_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -772,8 +790,8 @@ public Builder setEnableTextToSpeech(boolean value) {
      *
      *
      * <pre>
-     * Optional. Indicates whether text to speech is enabled. Even when this field is false,
-     * other settings in this proto are still retained.
+     * Optional. Indicates whether text to speech is enabled. Even when this field
+     * is false, other settings in this proto are still retained.
      * </pre>
      *
      * <code>bool enable_text_to_speech = 1 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -781,7 +799,7 @@ public Builder setEnableTextToSpeech(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearEnableTextToSpeech() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       enableTextToSpeech_ = false;
       onChanged();
       return this;
@@ -820,8 +838,8 @@ public int getOutputAudioEncodingValue() {
      * @return This builder for chaining.
      */
     public Builder setOutputAudioEncodingValue(int value) {
-
       outputAudioEncoding_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -840,9 +858,8 @@ public Builder setOutputAudioEncodingValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.OutputAudioEncoding getOutputAudioEncoding() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.OutputAudioEncoding result =
-          com.google.cloud.dialogflow.v2.OutputAudioEncoding.valueOf(outputAudioEncoding_);
+          com.google.cloud.dialogflow.v2.OutputAudioEncoding.forNumber(outputAudioEncoding_);
       return result == null
           ? com.google.cloud.dialogflow.v2.OutputAudioEncoding.UNRECOGNIZED
           : result;
@@ -866,7 +883,7 @@ public Builder setOutputAudioEncoding(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       outputAudioEncoding_ = value.getNumber();
       onChanged();
       return this;
@@ -885,7 +902,7 @@ public Builder setOutputAudioEncoding(
      * @return This builder for chaining.
      */
     public Builder clearOutputAudioEncoding() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       outputAudioEncoding_ = 0;
       onChanged();
       return this;
@@ -896,11 +913,11 @@ public Builder clearOutputAudioEncoding() {
      *
      *
      * <pre>
-     * Optional. The synthesis sample rate (in hertz) for this audio. If not provided, then
-     * the synthesizer will use the default sample rate based on the audio
-     * encoding. If this is different from the voice's natural sample rate, then
-     * the synthesizer will honor this request by converting to the desired sample
-     * rate (which might result in worse audio quality).
+     * Optional. The synthesis sample rate (in hertz) for this audio. If not
+     * provided, then the synthesizer will use the default sample rate based on
+     * the audio encoding. If this is different from the voice's natural sample
+     * rate, then the synthesizer will honor this request by converting to the
+     * desired sample rate (which might result in worse audio quality).
      * </pre>
      *
      * <code>int32 sample_rate_hertz = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -915,11 +932,11 @@ public int getSampleRateHertz() {
      *
      *
      * <pre>
-     * Optional. The synthesis sample rate (in hertz) for this audio. If not provided, then
-     * the synthesizer will use the default sample rate based on the audio
-     * encoding. If this is different from the voice's natural sample rate, then
-     * the synthesizer will honor this request by converting to the desired sample
-     * rate (which might result in worse audio quality).
+     * Optional. The synthesis sample rate (in hertz) for this audio. If not
+     * provided, then the synthesizer will use the default sample rate based on
+     * the audio encoding. If this is different from the voice's natural sample
+     * rate, then the synthesizer will honor this request by converting to the
+     * desired sample rate (which might result in worse audio quality).
      * </pre>
      *
      * <code>int32 sample_rate_hertz = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -930,6 +947,7 @@ public int getSampleRateHertz() {
     public Builder setSampleRateHertz(int value) {
 
       sampleRateHertz_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -937,11 +955,11 @@ public Builder setSampleRateHertz(int value) {
      *
      *
      * <pre>
-     * Optional. The synthesis sample rate (in hertz) for this audio. If not provided, then
-     * the synthesizer will use the default sample rate based on the audio
-     * encoding. If this is different from the voice's natural sample rate, then
-     * the synthesizer will honor this request by converting to the desired sample
-     * rate (which might result in worse audio quality).
+     * Optional. The synthesis sample rate (in hertz) for this audio. If not
+     * provided, then the synthesizer will use the default sample rate based on
+     * the audio encoding. If this is different from the voice's natural sample
+     * rate, then the synthesizer will honor this request by converting to the
+     * desired sample rate (which might result in worse audio quality).
      * </pre>
      *
      * <code>int32 sample_rate_hertz = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -949,7 +967,7 @@ public Builder setSampleRateHertz(int value) {
      * @return This builder for chaining.
      */
     public Builder clearSampleRateHertz() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       sampleRateHertz_ = 0;
       onChanged();
       return this;
@@ -972,8 +990,6 @@ public Builder clearSampleRateHertz() {
     private com.google.protobuf.MapField<
             java.lang.String, com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig>
         internalGetMutableSynthesizeSpeechConfigs() {
-      onChanged();
-      ;
       if (synthesizeSpeechConfigs_ == null) {
         synthesizeSpeechConfigs_ =
             com.google.protobuf.MapField.newMapField(
@@ -982,6 +998,8 @@ public Builder clearSampleRateHertz() {
       if (!synthesizeSpeechConfigs_.isMutable()) {
         synthesizeSpeechConfigs_ = synthesizeSpeechConfigs_.copy();
       }
+      bitField0_ |= 0x00000008;
+      onChanged();
       return synthesizeSpeechConfigs_;
     }
 
@@ -992,8 +1010,8 @@ public int getSynthesizeSpeechConfigsCount() {
      *
      *
      * <pre>
-     * Optional. Configuration of how speech should be synthesized, mapping from language
-     * (https://cloud.google.com/dialogflow/docs/reference/language) to
+     * Optional. Configuration of how speech should be synthesized, mapping from
+     * language (https://cloud.google.com/dialogflow/docs/reference/language) to
      * SynthesizeSpeechConfig.
      * </pre>
      *
@@ -1019,8 +1037,8 @@ public boolean containsSynthesizeSpeechConfigs(java.lang.String key) {
      *
      *
      * <pre>
-     * Optional. Configuration of how speech should be synthesized, mapping from language
-     * (https://cloud.google.com/dialogflow/docs/reference/language) to
+     * Optional. Configuration of how speech should be synthesized, mapping from
+     * language (https://cloud.google.com/dialogflow/docs/reference/language) to
      * SynthesizeSpeechConfig.
      * </pre>
      *
@@ -1037,8 +1055,8 @@ public boolean containsSynthesizeSpeechConfigs(java.lang.String key) {
      *
      *
      * <pre>
-     * Optional. Configuration of how speech should be synthesized, mapping from language
-     * (https://cloud.google.com/dialogflow/docs/reference/language) to
+     * Optional. Configuration of how speech should be synthesized, mapping from
+     * language (https://cloud.google.com/dialogflow/docs/reference/language) to
      * SynthesizeSpeechConfig.
      * </pre>
      *
@@ -1047,9 +1065,10 @@ public boolean containsSynthesizeSpeechConfigs(java.lang.String key) {
      * </code>
      */
     @java.lang.Override
-    public com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig
+    public /* nullable */ com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig
         getSynthesizeSpeechConfigsOrDefault(
             java.lang.String key,
+            /* nullable */
             com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
@@ -1062,8 +1081,8 @@ public boolean containsSynthesizeSpeechConfigs(java.lang.String key) {
      *
      *
      * <pre>
-     * Optional. Configuration of how speech should be synthesized, mapping from language
-     * (https://cloud.google.com/dialogflow/docs/reference/language) to
+     * Optional. Configuration of how speech should be synthesized, mapping from
+     * language (https://cloud.google.com/dialogflow/docs/reference/language) to
      * SynthesizeSpeechConfig.
      * </pre>
      *
@@ -1086,6 +1105,7 @@ public com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig getSynthesizeSpeech
     }
 
     public Builder clearSynthesizeSpeechConfigs() {
+      bitField0_ = (bitField0_ & ~0x00000008);
       internalGetMutableSynthesizeSpeechConfigs().getMutableMap().clear();
       return this;
     }
@@ -1093,8 +1113,8 @@ public Builder clearSynthesizeSpeechConfigs() {
      *
      *
      * <pre>
-     * Optional. Configuration of how speech should be synthesized, mapping from language
-     * (https://cloud.google.com/dialogflow/docs/reference/language) to
+     * Optional. Configuration of how speech should be synthesized, mapping from
+     * language (https://cloud.google.com/dialogflow/docs/reference/language) to
      * SynthesizeSpeechConfig.
      * </pre>
      *
@@ -1113,14 +1133,15 @@ public Builder removeSynthesizeSpeechConfigs(java.lang.String key) {
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig>
         getMutableSynthesizeSpeechConfigs() {
+      bitField0_ |= 0x00000008;
       return internalGetMutableSynthesizeSpeechConfigs().getMutableMap();
     }
     /**
      *
      *
      * <pre>
-     * Optional. Configuration of how speech should be synthesized, mapping from language
-     * (https://cloud.google.com/dialogflow/docs/reference/language) to
+     * Optional. Configuration of how speech should be synthesized, mapping from
+     * language (https://cloud.google.com/dialogflow/docs/reference/language) to
      * SynthesizeSpeechConfig.
      * </pre>
      *
@@ -1136,16 +1157,16 @@ public Builder putSynthesizeSpeechConfigs(
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableSynthesizeSpeechConfigs().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000008;
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Optional. Configuration of how speech should be synthesized, mapping from language
-     * (https://cloud.google.com/dialogflow/docs/reference/language) to
+     * Optional. Configuration of how speech should be synthesized, mapping from
+     * language (https://cloud.google.com/dialogflow/docs/reference/language) to
      * SynthesizeSpeechConfig.
      * </pre>
      *
@@ -1157,6 +1178,7 @@ public Builder putAllSynthesizeSpeechConfigs(
         java.util.Map<java.lang.String, com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig>
             values) {
       internalGetMutableSynthesizeSpeechConfigs().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000008;
       return this;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TextToSpeechSettingsOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TextToSpeechSettingsOrBuilder.java
index 16a08b7c9bfe..ea1b86689f05 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TextToSpeechSettingsOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TextToSpeechSettingsOrBuilder.java
@@ -27,8 +27,8 @@ public interface TextToSpeechSettingsOrBuilder
    *
    *
    * <pre>
-   * Optional. Indicates whether text to speech is enabled. Even when this field is false,
-   * other settings in this proto are still retained.
+   * Optional. Indicates whether text to speech is enabled. Even when this field
+   * is false, other settings in this proto are still retained.
    * </pre>
    *
    * <code>bool enable_text_to_speech = 1 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -70,11 +70,11 @@ public interface TextToSpeechSettingsOrBuilder
    *
    *
    * <pre>
-   * Optional. The synthesis sample rate (in hertz) for this audio. If not provided, then
-   * the synthesizer will use the default sample rate based on the audio
-   * encoding. If this is different from the voice's natural sample rate, then
-   * the synthesizer will honor this request by converting to the desired sample
-   * rate (which might result in worse audio quality).
+   * Optional. The synthesis sample rate (in hertz) for this audio. If not
+   * provided, then the synthesizer will use the default sample rate based on
+   * the audio encoding. If this is different from the voice's natural sample
+   * rate, then the synthesizer will honor this request by converting to the
+   * desired sample rate (which might result in worse audio quality).
    * </pre>
    *
    * <code>int32 sample_rate_hertz = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -87,8 +87,8 @@ public interface TextToSpeechSettingsOrBuilder
    *
    *
    * <pre>
-   * Optional. Configuration of how speech should be synthesized, mapping from language
-   * (https://cloud.google.com/dialogflow/docs/reference/language) to
+   * Optional. Configuration of how speech should be synthesized, mapping from
+   * language (https://cloud.google.com/dialogflow/docs/reference/language) to
    * SynthesizeSpeechConfig.
    * </pre>
    *
@@ -101,8 +101,8 @@ public interface TextToSpeechSettingsOrBuilder
    *
    *
    * <pre>
-   * Optional. Configuration of how speech should be synthesized, mapping from language
-   * (https://cloud.google.com/dialogflow/docs/reference/language) to
+   * Optional. Configuration of how speech should be synthesized, mapping from
+   * language (https://cloud.google.com/dialogflow/docs/reference/language) to
    * SynthesizeSpeechConfig.
    * </pre>
    *
@@ -119,8 +119,8 @@ public interface TextToSpeechSettingsOrBuilder
    *
    *
    * <pre>
-   * Optional. Configuration of how speech should be synthesized, mapping from language
-   * (https://cloud.google.com/dialogflow/docs/reference/language) to
+   * Optional. Configuration of how speech should be synthesized, mapping from
+   * language (https://cloud.google.com/dialogflow/docs/reference/language) to
    * SynthesizeSpeechConfig.
    * </pre>
    *
@@ -134,8 +134,8 @@ public interface TextToSpeechSettingsOrBuilder
    *
    *
    * <pre>
-   * Optional. Configuration of how speech should be synthesized, mapping from language
-   * (https://cloud.google.com/dialogflow/docs/reference/language) to
+   * Optional. Configuration of how speech should be synthesized, mapping from
+   * language (https://cloud.google.com/dialogflow/docs/reference/language) to
    * SynthesizeSpeechConfig.
    * </pre>
    *
@@ -143,7 +143,6 @@ public interface TextToSpeechSettingsOrBuilder
    * map&lt;string, .google.cloud.dialogflow.v2.SynthesizeSpeechConfig&gt; synthesize_speech_configs = 4 [(.google.api.field_behavior) = OPTIONAL];
    * </code>
    */
-
   /* nullable */
   com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig getSynthesizeSpeechConfigsOrDefault(
       java.lang.String key,
@@ -153,8 +152,8 @@ com.google.cloud.dialogflow.v2.SynthesizeSpeechConfig getSynthesizeSpeechConfigs
    *
    *
    * <pre>
-   * Optional. Configuration of how speech should be synthesized, mapping from language
-   * (https://cloud.google.com/dialogflow/docs/reference/language) to
+   * Optional. Configuration of how speech should be synthesized, mapping from
+   * language (https://cloud.google.com/dialogflow/docs/reference/language) to
    * SynthesizeSpeechConfig.
    * </pre>
    *
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TrainAgentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TrainAgentRequest.java
index 5453016ed4bc..d052751fee17 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TrainAgentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TrainAgentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Agents.TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent].
+ * The request message for
+ * [Agents.TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.TrainAgentRequest}
@@ -68,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -285,7 +288,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Agents.TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent].
+   * The request message for
+   * [Agents.TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.TrainAgentRequest}
@@ -319,8 +323,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       return this;
     }
 
@@ -348,11 +352,20 @@ public com.google.cloud.dialogflow.v2.TrainAgentRequest build() {
     public com.google.cloud.dialogflow.v2.TrainAgentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.TrainAgentRequest result =
           new com.google.cloud.dialogflow.v2.TrainAgentRequest(this);
-      result.parent_ = parent_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.TrainAgentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -401,6 +414,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.TrainAgentRequest other)
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -432,7 +446,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -452,6 +466,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -522,8 +538,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -542,8 +558,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -567,8 +583,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UndeployConversationModelOperationMetadata.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UndeployConversationModelOperationMetadata.java
index 83b0d3f14a49..ebf715ee9be1 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UndeployConversationModelOperationMetadata.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UndeployConversationModelOperationMetadata.java
@@ -22,7 +22,9 @@
  *
  *
  * <pre>
- * Metadata for a [ConversationModels.UndeployConversationModel][google.cloud.dialogflow.v2.ConversationModels.UndeployConversationModel] operation.
+ * Metadata for a
+ * [ConversationModels.UndeployConversationModel][google.cloud.dialogflow.v2.ConversationModels.UndeployConversationModel]
+ * operation.
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata}
@@ -71,7 +73,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_MODEL_FIELD_NUMBER = 1;
-  private volatile java.lang.Object conversationModel_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversationModel_ = "";
   /**
    *
    *
@@ -167,7 +171,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -350,7 +354,9 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Metadata for a [ConversationModels.UndeployConversationModel][google.cloud.dialogflow.v2.ConversationModels.UndeployConversationModel] operation.
+   * Metadata for a
+   * [ConversationModels.UndeployConversationModel][google.cloud.dialogflow.v2.ConversationModels.UndeployConversationModel]
+   * operation.
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata}
@@ -386,12 +392,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       conversationModel_ = "";
-
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
       return this;
@@ -425,16 +430,24 @@ public com.google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata
         buildPartial() {
       com.google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata result =
           new com.google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata(this);
-      result.conversationModel_ = conversationModel_;
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversationModel_ = conversationModel_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -487,6 +500,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getConversationModel().isEmpty()) {
         conversationModel_ = other.conversationModel_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasCreateTime()) {
@@ -521,13 +535,13 @@ public Builder mergeFrom(
             case 10:
               {
                 conversationModel_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 26:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 26
             default:
@@ -547,6 +561,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object conversationModel_ = "";
     /**
      *
@@ -611,8 +627,8 @@ public Builder setConversationModel(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversationModel_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -629,8 +645,8 @@ public Builder setConversationModel(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationModel() {
-
       conversationModel_ = getDefaultInstance().getConversationModel();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -652,8 +668,8 @@ public Builder setConversationModelBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversationModel_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -677,7 +693,7 @@ public Builder setConversationModelBytes(com.google.protobuf.ByteString value) {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -716,11 +732,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -736,11 +752,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -755,17 +771,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
         } else {
           createTime_ = value;
         }
-        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -779,14 +796,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * <code>.google.protobuf.Timestamp create_time = 3;</code>
      */
     public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -800,7 +816,7 @@ public Builder clearCreateTime() {
      * <code>.google.protobuf.Timestamp create_time = 3;</code>
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UndeployConversationModelRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UndeployConversationModelRequest.java
index 010a80c1e4cd..87a3273dd874 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UndeployConversationModelRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UndeployConversationModelRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -319,8 +321,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -349,11 +351,21 @@ public com.google.cloud.dialogflow.v2.UndeployConversationModelRequest build() {
     public com.google.cloud.dialogflow.v2.UndeployConversationModelRequest buildPartial() {
       com.google.cloud.dialogflow.v2.UndeployConversationModelRequest result =
           new com.google.cloud.dialogflow.v2.UndeployConversationModelRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.UndeployConversationModelRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -404,6 +416,7 @@ public Builder mergeFrom(
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -435,7 +448,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -455,6 +468,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -519,8 +534,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -537,8 +552,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -560,8 +575,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateAnswerRecordRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateAnswerRecordRequest.java
index b8411f072764..911659efc945 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateAnswerRecordRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateAnswerRecordRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * Request message for [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord].
+ * Request message for
+ * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.UpdateAnswerRecordRequest}
@@ -116,7 +117,9 @@ public com.google.cloud.dialogflow.v2.AnswerRecord getAnswerRecord() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.AnswerRecordOrBuilder getAnswerRecordOrBuilder() {
-    return getAnswerRecord();
+    return answerRecord_ == null
+        ? com.google.cloud.dialogflow.v2.AnswerRecord.getDefaultInstance()
+        : answerRecord_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -165,7 +168,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -351,7 +354,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Request message for [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord].
+   * Request message for
+   * [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.UpdateAnswerRecordRequest}
@@ -385,16 +389,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (answerRecordBuilder_ == null) {
-        answerRecord_ = null;
-      } else {
-        answerRecord_ = null;
+      bitField0_ = 0;
+      answerRecord_ = null;
+      if (answerRecordBuilder_ != null) {
+        answerRecordBuilder_.dispose();
         answerRecordBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -424,20 +427,24 @@ public com.google.cloud.dialogflow.v2.UpdateAnswerRecordRequest build() {
     public com.google.cloud.dialogflow.v2.UpdateAnswerRecordRequest buildPartial() {
       com.google.cloud.dialogflow.v2.UpdateAnswerRecordRequest result =
           new com.google.cloud.dialogflow.v2.UpdateAnswerRecordRequest(this);
-      if (answerRecordBuilder_ == null) {
-        result.answerRecord_ = answerRecord_;
-      } else {
-        result.answerRecord_ = answerRecordBuilder_.build();
-      }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.UpdateAnswerRecordRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.answerRecord_ =
+            answerRecordBuilder_ == null ? answerRecord_ : answerRecordBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -519,13 +526,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getAnswerRecordFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -545,6 +552,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2.AnswerRecord answerRecord_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.AnswerRecord,
@@ -565,7 +574,7 @@ public Builder mergeFrom(
      * @return Whether the answerRecord field is set.
      */
     public boolean hasAnswerRecord() {
-      return answerRecordBuilder_ != null || answerRecord_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -606,11 +615,11 @@ public Builder setAnswerRecord(com.google.cloud.dialogflow.v2.AnswerRecord value
           throw new NullPointerException();
         }
         answerRecord_ = value;
-        onChanged();
       } else {
         answerRecordBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -628,11 +637,11 @@ public Builder setAnswerRecord(
         com.google.cloud.dialogflow.v2.AnswerRecord.Builder builderForValue) {
       if (answerRecordBuilder_ == null) {
         answerRecord_ = builderForValue.build();
-        onChanged();
       } else {
         answerRecordBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -648,19 +657,18 @@ public Builder setAnswerRecord(
      */
     public Builder mergeAnswerRecord(com.google.cloud.dialogflow.v2.AnswerRecord value) {
       if (answerRecordBuilder_ == null) {
-        if (answerRecord_ != null) {
-          answerRecord_ =
-              com.google.cloud.dialogflow.v2.AnswerRecord.newBuilder(answerRecord_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && answerRecord_ != null
+            && answerRecord_ != com.google.cloud.dialogflow.v2.AnswerRecord.getDefaultInstance()) {
+          getAnswerRecordBuilder().mergeFrom(value);
         } else {
           answerRecord_ = value;
         }
-        onChanged();
       } else {
         answerRecordBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -675,14 +683,13 @@ public Builder mergeAnswerRecord(com.google.cloud.dialogflow.v2.AnswerRecord val
      * </code>
      */
     public Builder clearAnswerRecord() {
-      if (answerRecordBuilder_ == null) {
-        answerRecord_ = null;
-        onChanged();
-      } else {
-        answerRecord_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      answerRecord_ = null;
+      if (answerRecordBuilder_ != null) {
+        answerRecordBuilder_.dispose();
         answerRecordBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -697,7 +704,7 @@ public Builder clearAnswerRecord() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.AnswerRecord.Builder getAnswerRecordBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getAnswerRecordFieldBuilder().getBuilder();
     }
@@ -768,7 +775,7 @@ public com.google.cloud.dialogflow.v2.AnswerRecordOrBuilder getAnswerRecordOrBui
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -807,11 +814,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -827,11 +834,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -846,17 +853,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -870,14 +878,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -891,7 +898,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateContextRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateContextRequest.java
index 0d8457b9f104..b2a2c025414a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateContextRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateContextRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Contexts.UpdateContext][google.cloud.dialogflow.v2.Contexts.UpdateContext].
+ * The request message for
+ * [Contexts.UpdateContext][google.cloud.dialogflow.v2.Contexts.UpdateContext].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.UpdateContextRequest}
@@ -116,7 +117,9 @@ public com.google.cloud.dialogflow.v2.Context getContext() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.ContextOrBuilder getContextOrBuilder() {
-    return getContext();
+    return context_ == null
+        ? com.google.cloud.dialogflow.v2.Context.getDefaultInstance()
+        : context_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -165,7 +168,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -350,7 +353,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Contexts.UpdateContext][google.cloud.dialogflow.v2.Contexts.UpdateContext].
+   * The request message for
+   * [Contexts.UpdateContext][google.cloud.dialogflow.v2.Contexts.UpdateContext].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.UpdateContextRequest}
@@ -384,16 +388,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (contextBuilder_ == null) {
-        context_ = null;
-      } else {
-        context_ = null;
+      bitField0_ = 0;
+      context_ = null;
+      if (contextBuilder_ != null) {
+        contextBuilder_.dispose();
         contextBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -423,20 +426,23 @@ public com.google.cloud.dialogflow.v2.UpdateContextRequest build() {
     public com.google.cloud.dialogflow.v2.UpdateContextRequest buildPartial() {
       com.google.cloud.dialogflow.v2.UpdateContextRequest result =
           new com.google.cloud.dialogflow.v2.UpdateContextRequest(this);
-      if (contextBuilder_ == null) {
-        result.context_ = context_;
-      } else {
-        result.context_ = contextBuilder_.build();
-      }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.UpdateContextRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.context_ = contextBuilder_ == null ? context_ : contextBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -518,13 +524,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getContextFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -544,6 +550,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2.Context context_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.Context,
@@ -564,7 +572,7 @@ public Builder mergeFrom(
      * @return Whether the context field is set.
      */
     public boolean hasContext() {
-      return contextBuilder_ != null || context_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -605,11 +613,11 @@ public Builder setContext(com.google.cloud.dialogflow.v2.Context value) {
           throw new NullPointerException();
         }
         context_ = value;
-        onChanged();
       } else {
         contextBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -626,11 +634,11 @@ public Builder setContext(com.google.cloud.dialogflow.v2.Context value) {
     public Builder setContext(com.google.cloud.dialogflow.v2.Context.Builder builderForValue) {
       if (contextBuilder_ == null) {
         context_ = builderForValue.build();
-        onChanged();
       } else {
         contextBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -646,19 +654,18 @@ public Builder setContext(com.google.cloud.dialogflow.v2.Context.Builder builder
      */
     public Builder mergeContext(com.google.cloud.dialogflow.v2.Context value) {
       if (contextBuilder_ == null) {
-        if (context_ != null) {
-          context_ =
-              com.google.cloud.dialogflow.v2.Context.newBuilder(context_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && context_ != null
+            && context_ != com.google.cloud.dialogflow.v2.Context.getDefaultInstance()) {
+          getContextBuilder().mergeFrom(value);
         } else {
           context_ = value;
         }
-        onChanged();
       } else {
         contextBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -673,14 +680,13 @@ public Builder mergeContext(com.google.cloud.dialogflow.v2.Context value) {
      * </code>
      */
     public Builder clearContext() {
-      if (contextBuilder_ == null) {
-        context_ = null;
-        onChanged();
-      } else {
-        context_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      context_ = null;
+      if (contextBuilder_ != null) {
+        contextBuilder_.dispose();
         contextBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -695,7 +701,7 @@ public Builder clearContext() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.Context.Builder getContextBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getContextFieldBuilder().getBuilder();
     }
@@ -766,7 +772,7 @@ public com.google.cloud.dialogflow.v2.ContextOrBuilder getContextOrBuilder() {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -805,11 +811,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -825,11 +831,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -844,17 +850,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -868,14 +875,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -889,7 +895,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateConversationProfileRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateConversationProfileRequest.java
index 8847d12ec0b3..a880bbc62867 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateConversationProfileRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateConversationProfileRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [ConversationProfiles.UpdateConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.UpdateConversationProfile].
+ * The request message for
+ * [ConversationProfiles.UpdateConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.UpdateConversationProfile].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.UpdateConversationProfileRequest}
@@ -118,7 +119,9 @@ public com.google.cloud.dialogflow.v2.ConversationProfile getConversationProfile
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.ConversationProfileOrBuilder
       getConversationProfileOrBuilder() {
-    return getConversationProfile();
+    return conversationProfile_ == null
+        ? com.google.cloud.dialogflow.v2.ConversationProfile.getDefaultInstance()
+        : conversationProfile_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -167,7 +170,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -353,7 +356,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [ConversationProfiles.UpdateConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.UpdateConversationProfile].
+   * The request message for
+   * [ConversationProfiles.UpdateConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.UpdateConversationProfile].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.UpdateConversationProfileRequest}
@@ -387,16 +391,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (conversationProfileBuilder_ == null) {
-        conversationProfile_ = null;
-      } else {
-        conversationProfile_ = null;
+      bitField0_ = 0;
+      conversationProfile_ = null;
+      if (conversationProfileBuilder_ != null) {
+        conversationProfileBuilder_.dispose();
         conversationProfileBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -427,20 +430,27 @@ public com.google.cloud.dialogflow.v2.UpdateConversationProfileRequest build() {
     public com.google.cloud.dialogflow.v2.UpdateConversationProfileRequest buildPartial() {
       com.google.cloud.dialogflow.v2.UpdateConversationProfileRequest result =
           new com.google.cloud.dialogflow.v2.UpdateConversationProfileRequest(this);
-      if (conversationProfileBuilder_ == null) {
-        result.conversationProfile_ = conversationProfile_;
-      } else {
-        result.conversationProfile_ = conversationProfileBuilder_.build();
-      }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.UpdateConversationProfileRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversationProfile_ =
+            conversationProfileBuilder_ == null
+                ? conversationProfile_
+                : conversationProfileBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -525,13 +535,13 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getConversationProfileFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -551,6 +561,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2.ConversationProfile conversationProfile_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.ConversationProfile,
@@ -571,7 +583,7 @@ public Builder mergeFrom(
      * @return Whether the conversationProfile field is set.
      */
     public boolean hasConversationProfile() {
-      return conversationProfileBuilder_ != null || conversationProfile_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -613,11 +625,11 @@ public Builder setConversationProfile(
           throw new NullPointerException();
         }
         conversationProfile_ = value;
-        onChanged();
       } else {
         conversationProfileBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -635,11 +647,11 @@ public Builder setConversationProfile(
         com.google.cloud.dialogflow.v2.ConversationProfile.Builder builderForValue) {
       if (conversationProfileBuilder_ == null) {
         conversationProfile_ = builderForValue.build();
-        onChanged();
       } else {
         conversationProfileBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -656,19 +668,19 @@ public Builder setConversationProfile(
     public Builder mergeConversationProfile(
         com.google.cloud.dialogflow.v2.ConversationProfile value) {
       if (conversationProfileBuilder_ == null) {
-        if (conversationProfile_ != null) {
-          conversationProfile_ =
-              com.google.cloud.dialogflow.v2.ConversationProfile.newBuilder(conversationProfile_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && conversationProfile_ != null
+            && conversationProfile_
+                != com.google.cloud.dialogflow.v2.ConversationProfile.getDefaultInstance()) {
+          getConversationProfileBuilder().mergeFrom(value);
         } else {
           conversationProfile_ = value;
         }
-        onChanged();
       } else {
         conversationProfileBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -683,14 +695,13 @@ public Builder mergeConversationProfile(
      * </code>
      */
     public Builder clearConversationProfile() {
-      if (conversationProfileBuilder_ == null) {
-        conversationProfile_ = null;
-        onChanged();
-      } else {
-        conversationProfile_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      conversationProfile_ = null;
+      if (conversationProfileBuilder_ != null) {
+        conversationProfileBuilder_.dispose();
         conversationProfileBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -706,7 +717,7 @@ public Builder clearConversationProfile() {
      */
     public com.google.cloud.dialogflow.v2.ConversationProfile.Builder
         getConversationProfileBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getConversationProfileFieldBuilder().getBuilder();
     }
@@ -778,7 +789,7 @@ public Builder clearConversationProfile() {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -817,11 +828,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -837,11 +848,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -856,17 +867,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -880,14 +892,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -901,7 +912,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateDocumentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateDocumentRequest.java
index e272280b9140..25fd44d21962 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateDocumentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateDocumentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * Request message for [Documents.UpdateDocument][google.cloud.dialogflow.v2.Documents.UpdateDocument].
+ * Request message for
+ * [Documents.UpdateDocument][google.cloud.dialogflow.v2.Documents.UpdateDocument].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.UpdateDocumentRequest}
@@ -116,7 +117,9 @@ public com.google.cloud.dialogflow.v2.Document getDocument() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.DocumentOrBuilder getDocumentOrBuilder() {
-    return getDocument();
+    return document_ == null
+        ? com.google.cloud.dialogflow.v2.Document.getDefaultInstance()
+        : document_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -171,7 +174,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -356,7 +359,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Request message for [Documents.UpdateDocument][google.cloud.dialogflow.v2.Documents.UpdateDocument].
+   * Request message for
+   * [Documents.UpdateDocument][google.cloud.dialogflow.v2.Documents.UpdateDocument].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.UpdateDocumentRequest}
@@ -390,16 +394,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (documentBuilder_ == null) {
-        document_ = null;
-      } else {
-        document_ = null;
+      bitField0_ = 0;
+      document_ = null;
+      if (documentBuilder_ != null) {
+        documentBuilder_.dispose();
         documentBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -429,20 +432,23 @@ public com.google.cloud.dialogflow.v2.UpdateDocumentRequest build() {
     public com.google.cloud.dialogflow.v2.UpdateDocumentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.UpdateDocumentRequest result =
           new com.google.cloud.dialogflow.v2.UpdateDocumentRequest(this);
-      if (documentBuilder_ == null) {
-        result.document_ = document_;
-      } else {
-        result.document_ = documentBuilder_.build();
-      }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.UpdateDocumentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.document_ = documentBuilder_ == null ? document_ : documentBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -524,13 +530,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getDocumentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -550,6 +556,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2.Document document_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.Document,
@@ -570,7 +578,7 @@ public Builder mergeFrom(
      * @return Whether the document field is set.
      */
     public boolean hasDocument() {
-      return documentBuilder_ != null || document_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -611,11 +619,11 @@ public Builder setDocument(com.google.cloud.dialogflow.v2.Document value) {
           throw new NullPointerException();
         }
         document_ = value;
-        onChanged();
       } else {
         documentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -632,11 +640,11 @@ public Builder setDocument(com.google.cloud.dialogflow.v2.Document value) {
     public Builder setDocument(com.google.cloud.dialogflow.v2.Document.Builder builderForValue) {
       if (documentBuilder_ == null) {
         document_ = builderForValue.build();
-        onChanged();
       } else {
         documentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -652,19 +660,18 @@ public Builder setDocument(com.google.cloud.dialogflow.v2.Document.Builder build
      */
     public Builder mergeDocument(com.google.cloud.dialogflow.v2.Document value) {
       if (documentBuilder_ == null) {
-        if (document_ != null) {
-          document_ =
-              com.google.cloud.dialogflow.v2.Document.newBuilder(document_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && document_ != null
+            && document_ != com.google.cloud.dialogflow.v2.Document.getDefaultInstance()) {
+          getDocumentBuilder().mergeFrom(value);
         } else {
           document_ = value;
         }
-        onChanged();
       } else {
         documentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -679,14 +686,13 @@ public Builder mergeDocument(com.google.cloud.dialogflow.v2.Document value) {
      * </code>
      */
     public Builder clearDocument() {
-      if (documentBuilder_ == null) {
-        document_ = null;
-        onChanged();
-      } else {
-        document_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      document_ = null;
+      if (documentBuilder_ != null) {
+        documentBuilder_.dispose();
         documentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -701,7 +707,7 @@ public Builder clearDocument() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.Document.Builder getDocumentBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getDocumentFieldBuilder().getBuilder();
     }
@@ -774,7 +780,7 @@ public com.google.cloud.dialogflow.v2.DocumentOrBuilder getDocumentOrBuilder() {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -817,11 +823,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -839,11 +845,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -860,17 +866,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -886,14 +893,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -909,7 +915,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateEntityTypeRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateEntityTypeRequest.java
index 082820e70071..b8635d392e4d 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateEntityTypeRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateEntityTypeRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType].
+ * The request message for
+ * [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.UpdateEntityTypeRequest}
@@ -118,11 +119,15 @@ public com.google.cloud.dialogflow.v2.EntityType getEntityType() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.EntityTypeOrBuilder getEntityTypeOrBuilder() {
-    return getEntityType();
+    return entityType_ == null
+        ? com.google.cloud.dialogflow.v2.EntityType.getDefaultInstance()
+        : entityType_;
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -224,7 +229,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -419,7 +424,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType].
+   * The request message for
+   * [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.UpdateEntityTypeRequest}
@@ -453,18 +459,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (entityTypeBuilder_ == null) {
-        entityType_ = null;
-      } else {
-        entityType_ = null;
+      bitField0_ = 0;
+      entityType_ = null;
+      if (entityTypeBuilder_ != null) {
+        entityTypeBuilder_.dispose();
         entityTypeBuilder_ = null;
       }
       languageCode_ = "";
-
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -494,21 +498,26 @@ public com.google.cloud.dialogflow.v2.UpdateEntityTypeRequest build() {
     public com.google.cloud.dialogflow.v2.UpdateEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2.UpdateEntityTypeRequest result =
           new com.google.cloud.dialogflow.v2.UpdateEntityTypeRequest(this);
-      if (entityTypeBuilder_ == null) {
-        result.entityType_ = entityType_;
-      } else {
-        result.entityType_ = entityTypeBuilder_.build();
-      }
-      result.languageCode_ = languageCode_;
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.UpdateEntityTypeRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.entityType_ = entityTypeBuilder_ == null ? entityType_ : entityTypeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -560,6 +569,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.UpdateEntityTypeRequest
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasUpdateMask()) {
@@ -594,19 +604,19 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getEntityTypeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -626,6 +636,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2.EntityType entityType_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.EntityType,
@@ -646,7 +658,7 @@ public Builder mergeFrom(
      * @return Whether the entityType field is set.
      */
     public boolean hasEntityType() {
-      return entityTypeBuilder_ != null || entityType_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -687,11 +699,11 @@ public Builder setEntityType(com.google.cloud.dialogflow.v2.EntityType value) {
           throw new NullPointerException();
         }
         entityType_ = value;
-        onChanged();
       } else {
         entityTypeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -709,11 +721,11 @@ public Builder setEntityType(
         com.google.cloud.dialogflow.v2.EntityType.Builder builderForValue) {
       if (entityTypeBuilder_ == null) {
         entityType_ = builderForValue.build();
-        onChanged();
       } else {
         entityTypeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -729,19 +741,18 @@ public Builder setEntityType(
      */
     public Builder mergeEntityType(com.google.cloud.dialogflow.v2.EntityType value) {
       if (entityTypeBuilder_ == null) {
-        if (entityType_ != null) {
-          entityType_ =
-              com.google.cloud.dialogflow.v2.EntityType.newBuilder(entityType_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && entityType_ != null
+            && entityType_ != com.google.cloud.dialogflow.v2.EntityType.getDefaultInstance()) {
+          getEntityTypeBuilder().mergeFrom(value);
         } else {
           entityType_ = value;
         }
-        onChanged();
       } else {
         entityTypeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -756,14 +767,13 @@ public Builder mergeEntityType(com.google.cloud.dialogflow.v2.EntityType value)
      * </code>
      */
     public Builder clearEntityType() {
-      if (entityTypeBuilder_ == null) {
-        entityType_ = null;
-        onChanged();
-      } else {
-        entityType_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      entityType_ = null;
+      if (entityTypeBuilder_ != null) {
+        entityTypeBuilder_.dispose();
         entityTypeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -778,7 +788,7 @@ public Builder clearEntityType() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.EntityType.Builder getEntityTypeBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getEntityTypeFieldBuilder().getBuilder();
     }
@@ -903,8 +913,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -924,8 +934,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -950,8 +960,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -975,7 +985,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1014,11 +1024,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1034,11 +1044,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1053,17 +1063,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1077,14 +1088,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1098,7 +1108,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateEnvironmentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateEnvironmentRequest.java
index 9ad299b26e0f..68a5ae6f402c 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateEnvironmentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateEnvironmentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Environments.UpdateEnvironment][google.cloud.dialogflow.v2.Environments.UpdateEnvironment].
+ * The request message for
+ * [Environments.UpdateEnvironment][google.cloud.dialogflow.v2.Environments.UpdateEnvironment].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.UpdateEnvironmentRequest}
@@ -116,7 +117,9 @@ public com.google.cloud.dialogflow.v2.Environment getEnvironment() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.EnvironmentOrBuilder getEnvironmentOrBuilder() {
-    return getEnvironment();
+    return environment_ == null
+        ? com.google.cloud.dialogflow.v2.Environment.getDefaultInstance()
+        : environment_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -165,11 +168,11 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   public static final int ALLOW_LOAD_TO_DRAFT_AND_DISCARD_CHANGES_FIELD_NUMBER = 3;
-  private boolean allowLoadToDraftAndDiscardChanges_;
+  private boolean allowLoadToDraftAndDiscardChanges_ = false;
   /**
    *
    *
@@ -388,7 +391,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Environments.UpdateEnvironment][google.cloud.dialogflow.v2.Environments.UpdateEnvironment].
+   * The request message for
+   * [Environments.UpdateEnvironment][google.cloud.dialogflow.v2.Environments.UpdateEnvironment].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.UpdateEnvironmentRequest}
@@ -422,20 +426,18 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (environmentBuilder_ == null) {
-        environment_ = null;
-      } else {
-        environment_ = null;
+      bitField0_ = 0;
+      environment_ = null;
+      if (environmentBuilder_ != null) {
+        environmentBuilder_.dispose();
         environmentBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       allowLoadToDraftAndDiscardChanges_ = false;
-
       return this;
     }
 
@@ -463,21 +465,27 @@ public com.google.cloud.dialogflow.v2.UpdateEnvironmentRequest build() {
     public com.google.cloud.dialogflow.v2.UpdateEnvironmentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.UpdateEnvironmentRequest result =
           new com.google.cloud.dialogflow.v2.UpdateEnvironmentRequest(this);
-      if (environmentBuilder_ == null) {
-        result.environment_ = environment_;
-      } else {
-        result.environment_ = environmentBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
-      }
-      result.allowLoadToDraftAndDiscardChanges_ = allowLoadToDraftAndDiscardChanges_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.UpdateEnvironmentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.environment_ =
+            environmentBuilder_ == null ? environment_ : environmentBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.allowLoadToDraftAndDiscardChanges_ = allowLoadToDraftAndDiscardChanges_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -562,19 +570,19 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getEnvironmentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 allowLoadToDraftAndDiscardChanges_ = input.readBool();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             default:
@@ -594,6 +602,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2.Environment environment_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.Environment,
@@ -614,7 +624,7 @@ public Builder mergeFrom(
      * @return Whether the environment field is set.
      */
     public boolean hasEnvironment() {
-      return environmentBuilder_ != null || environment_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -655,11 +665,11 @@ public Builder setEnvironment(com.google.cloud.dialogflow.v2.Environment value)
           throw new NullPointerException();
         }
         environment_ = value;
-        onChanged();
       } else {
         environmentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -677,11 +687,11 @@ public Builder setEnvironment(
         com.google.cloud.dialogflow.v2.Environment.Builder builderForValue) {
       if (environmentBuilder_ == null) {
         environment_ = builderForValue.build();
-        onChanged();
       } else {
         environmentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -697,19 +707,18 @@ public Builder setEnvironment(
      */
     public Builder mergeEnvironment(com.google.cloud.dialogflow.v2.Environment value) {
       if (environmentBuilder_ == null) {
-        if (environment_ != null) {
-          environment_ =
-              com.google.cloud.dialogflow.v2.Environment.newBuilder(environment_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && environment_ != null
+            && environment_ != com.google.cloud.dialogflow.v2.Environment.getDefaultInstance()) {
+          getEnvironmentBuilder().mergeFrom(value);
         } else {
           environment_ = value;
         }
-        onChanged();
       } else {
         environmentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -724,14 +733,13 @@ public Builder mergeEnvironment(com.google.cloud.dialogflow.v2.Environment value
      * </code>
      */
     public Builder clearEnvironment() {
-      if (environmentBuilder_ == null) {
-        environment_ = null;
-        onChanged();
-      } else {
-        environment_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      environment_ = null;
+      if (environmentBuilder_ != null) {
+        environmentBuilder_.dispose();
         environmentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -746,7 +754,7 @@ public Builder clearEnvironment() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.Environment.Builder getEnvironmentBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getEnvironmentFieldBuilder().getBuilder();
     }
@@ -817,7 +825,7 @@ public com.google.cloud.dialogflow.v2.EnvironmentOrBuilder getEnvironmentOrBuild
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -856,11 +864,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -876,11 +884,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -895,17 +903,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -919,14 +928,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -940,7 +948,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
@@ -1031,6 +1039,7 @@ public boolean getAllowLoadToDraftAndDiscardChanges() {
     public Builder setAllowLoadToDraftAndDiscardChanges(boolean value) {
 
       allowLoadToDraftAndDiscardChanges_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1051,7 +1060,7 @@ public Builder setAllowLoadToDraftAndDiscardChanges(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearAllowLoadToDraftAndDiscardChanges() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       allowLoadToDraftAndDiscardChanges_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateFulfillmentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateFulfillmentRequest.java
index f43ee1819575..a8472dc94093 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateFulfillmentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateFulfillmentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Fulfillments.UpdateFulfillment][google.cloud.dialogflow.v2.Fulfillments.UpdateFulfillment].
+ * The request message for
+ * [Fulfillments.UpdateFulfillment][google.cloud.dialogflow.v2.Fulfillments.UpdateFulfillment].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.UpdateFulfillmentRequest}
@@ -116,7 +117,9 @@ public com.google.cloud.dialogflow.v2.Fulfillment getFulfillment() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.FulfillmentOrBuilder getFulfillmentOrBuilder() {
-    return getFulfillment();
+    return fulfillment_ == null
+        ? com.google.cloud.dialogflow.v2.Fulfillment.getDefaultInstance()
+        : fulfillment_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -168,7 +171,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -354,7 +357,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Fulfillments.UpdateFulfillment][google.cloud.dialogflow.v2.Fulfillments.UpdateFulfillment].
+   * The request message for
+   * [Fulfillments.UpdateFulfillment][google.cloud.dialogflow.v2.Fulfillments.UpdateFulfillment].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.UpdateFulfillmentRequest}
@@ -388,16 +392,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (fulfillmentBuilder_ == null) {
-        fulfillment_ = null;
-      } else {
-        fulfillment_ = null;
+      bitField0_ = 0;
+      fulfillment_ = null;
+      if (fulfillmentBuilder_ != null) {
+        fulfillmentBuilder_.dispose();
         fulfillmentBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -427,20 +430,24 @@ public com.google.cloud.dialogflow.v2.UpdateFulfillmentRequest build() {
     public com.google.cloud.dialogflow.v2.UpdateFulfillmentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.UpdateFulfillmentRequest result =
           new com.google.cloud.dialogflow.v2.UpdateFulfillmentRequest(this);
-      if (fulfillmentBuilder_ == null) {
-        result.fulfillment_ = fulfillment_;
-      } else {
-        result.fulfillment_ = fulfillmentBuilder_.build();
-      }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.UpdateFulfillmentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.fulfillment_ =
+            fulfillmentBuilder_ == null ? fulfillment_ : fulfillmentBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -522,13 +529,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getFulfillmentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -548,6 +555,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2.Fulfillment fulfillment_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.Fulfillment,
@@ -568,7 +577,7 @@ public Builder mergeFrom(
      * @return Whether the fulfillment field is set.
      */
     public boolean hasFulfillment() {
-      return fulfillmentBuilder_ != null || fulfillment_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -609,11 +618,11 @@ public Builder setFulfillment(com.google.cloud.dialogflow.v2.Fulfillment value)
           throw new NullPointerException();
         }
         fulfillment_ = value;
-        onChanged();
       } else {
         fulfillmentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -631,11 +640,11 @@ public Builder setFulfillment(
         com.google.cloud.dialogflow.v2.Fulfillment.Builder builderForValue) {
       if (fulfillmentBuilder_ == null) {
         fulfillment_ = builderForValue.build();
-        onChanged();
       } else {
         fulfillmentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -651,19 +660,18 @@ public Builder setFulfillment(
      */
     public Builder mergeFulfillment(com.google.cloud.dialogflow.v2.Fulfillment value) {
       if (fulfillmentBuilder_ == null) {
-        if (fulfillment_ != null) {
-          fulfillment_ =
-              com.google.cloud.dialogflow.v2.Fulfillment.newBuilder(fulfillment_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && fulfillment_ != null
+            && fulfillment_ != com.google.cloud.dialogflow.v2.Fulfillment.getDefaultInstance()) {
+          getFulfillmentBuilder().mergeFrom(value);
         } else {
           fulfillment_ = value;
         }
-        onChanged();
       } else {
         fulfillmentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -678,14 +686,13 @@ public Builder mergeFulfillment(com.google.cloud.dialogflow.v2.Fulfillment value
      * </code>
      */
     public Builder clearFulfillment() {
-      if (fulfillmentBuilder_ == null) {
-        fulfillment_ = null;
-        onChanged();
-      } else {
-        fulfillment_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      fulfillment_ = null;
+      if (fulfillmentBuilder_ != null) {
+        fulfillmentBuilder_.dispose();
         fulfillmentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -700,7 +707,7 @@ public Builder clearFulfillment() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.Fulfillment.Builder getFulfillmentBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getFulfillmentFieldBuilder().getBuilder();
     }
@@ -772,7 +779,7 @@ public com.google.cloud.dialogflow.v2.FulfillmentOrBuilder getFulfillmentOrBuild
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -813,11 +820,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -834,11 +841,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -854,17 +861,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -879,14 +887,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -901,7 +908,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateIntentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateIntentRequest.java
index e6097e99d6a4..e4c99674a6ea 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateIntentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateIntentRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent].
+ * The request message for
+ * [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.UpdateIntentRequest}
@@ -114,11 +115,13 @@ public com.google.cloud.dialogflow.v2.Intent getIntent() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.IntentOrBuilder getIntentOrBuilder() {
-    return getIntent();
+    return intent_ == null ? com.google.cloud.dialogflow.v2.Intent.getDefaultInstance() : intent_;
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -220,11 +223,11 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   public static final int INTENT_VIEW_FIELD_NUMBER = 4;
-  private int intentView_;
+  private int intentView_ = 0;
   /**
    *
    *
@@ -257,9 +260,8 @@ public int getIntentViewValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.IntentView getIntentView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.IntentView result =
-        com.google.cloud.dialogflow.v2.IntentView.valueOf(intentView_);
+        com.google.cloud.dialogflow.v2.IntentView.forNumber(intentView_);
     return result == null ? com.google.cloud.dialogflow.v2.IntentView.UNRECOGNIZED : result;
   }
 
@@ -465,7 +467,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent].
+   * The request message for
+   * [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.UpdateIntentRequest}
@@ -499,22 +502,19 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (intentBuilder_ == null) {
-        intent_ = null;
-      } else {
-        intent_ = null;
+      bitField0_ = 0;
+      intent_ = null;
+      if (intentBuilder_ != null) {
+        intentBuilder_.dispose();
         intentBuilder_ = null;
       }
       languageCode_ = "";
-
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       intentView_ = 0;
-
       return this;
     }
 
@@ -542,22 +542,29 @@ public com.google.cloud.dialogflow.v2.UpdateIntentRequest build() {
     public com.google.cloud.dialogflow.v2.UpdateIntentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.UpdateIntentRequest result =
           new com.google.cloud.dialogflow.v2.UpdateIntentRequest(this);
-      if (intentBuilder_ == null) {
-        result.intent_ = intent_;
-      } else {
-        result.intent_ = intentBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.languageCode_ = languageCode_;
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
-      }
-      result.intentView_ = intentView_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.UpdateIntentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.intent_ = intentBuilder_ == null ? intent_ : intentBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.intentView_ = intentView_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -609,6 +616,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.UpdateIntentRequest othe
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasUpdateMask()) {
@@ -646,25 +654,25 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getIntentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 32:
               {
                 intentView_ = input.readEnum();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 32
             default:
@@ -684,6 +692,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2.Intent intent_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.Intent,
@@ -704,7 +714,7 @@ public Builder mergeFrom(
      * @return Whether the intent field is set.
      */
     public boolean hasIntent() {
-      return intentBuilder_ != null || intent_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -745,11 +755,11 @@ public Builder setIntent(com.google.cloud.dialogflow.v2.Intent value) {
           throw new NullPointerException();
         }
         intent_ = value;
-        onChanged();
       } else {
         intentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -766,11 +776,11 @@ public Builder setIntent(com.google.cloud.dialogflow.v2.Intent value) {
     public Builder setIntent(com.google.cloud.dialogflow.v2.Intent.Builder builderForValue) {
       if (intentBuilder_ == null) {
         intent_ = builderForValue.build();
-        onChanged();
       } else {
         intentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -786,19 +796,18 @@ public Builder setIntent(com.google.cloud.dialogflow.v2.Intent.Builder builderFo
      */
     public Builder mergeIntent(com.google.cloud.dialogflow.v2.Intent value) {
       if (intentBuilder_ == null) {
-        if (intent_ != null) {
-          intent_ =
-              com.google.cloud.dialogflow.v2.Intent.newBuilder(intent_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && intent_ != null
+            && intent_ != com.google.cloud.dialogflow.v2.Intent.getDefaultInstance()) {
+          getIntentBuilder().mergeFrom(value);
         } else {
           intent_ = value;
         }
-        onChanged();
       } else {
         intentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -813,14 +822,13 @@ public Builder mergeIntent(com.google.cloud.dialogflow.v2.Intent value) {
      * </code>
      */
     public Builder clearIntent() {
-      if (intentBuilder_ == null) {
-        intent_ = null;
-        onChanged();
-      } else {
-        intent_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      intent_ = null;
+      if (intentBuilder_ != null) {
+        intentBuilder_.dispose();
         intentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -835,7 +843,7 @@ public Builder clearIntent() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.Intent.Builder getIntentBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getIntentFieldBuilder().getBuilder();
     }
@@ -960,8 +968,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -981,8 +989,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1007,8 +1015,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1032,7 +1040,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1071,11 +1079,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1091,11 +1099,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1110,17 +1118,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1134,14 +1143,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1155,7 +1163,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
@@ -1238,8 +1246,8 @@ public int getIntentViewValue() {
      * @return This builder for chaining.
      */
     public Builder setIntentViewValue(int value) {
-
       intentView_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1258,9 +1266,8 @@ public Builder setIntentViewValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.IntentView getIntentView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.IntentView result =
-          com.google.cloud.dialogflow.v2.IntentView.valueOf(intentView_);
+          com.google.cloud.dialogflow.v2.IntentView.forNumber(intentView_);
       return result == null ? com.google.cloud.dialogflow.v2.IntentView.UNRECOGNIZED : result;
     }
     /**
@@ -1281,7 +1288,7 @@ public Builder setIntentView(com.google.cloud.dialogflow.v2.IntentView value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000008;
       intentView_ = value.getNumber();
       onChanged();
       return this;
@@ -1300,7 +1307,7 @@ public Builder setIntentView(com.google.cloud.dialogflow.v2.IntentView value) {
      * @return This builder for chaining.
      */
     public Builder clearIntentView() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       intentView_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateKnowledgeBaseRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateKnowledgeBaseRequest.java
index 54a532785f70..782d8fad9b91 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateKnowledgeBaseRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateKnowledgeBaseRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * Request message for [KnowledgeBases.UpdateKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.UpdateKnowledgeBase].
+ * Request message for
+ * [KnowledgeBases.UpdateKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.UpdateKnowledgeBase].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.UpdateKnowledgeBaseRequest}
@@ -116,7 +117,9 @@ public com.google.cloud.dialogflow.v2.KnowledgeBase getKnowledgeBase() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.KnowledgeBaseOrBuilder getKnowledgeBaseOrBuilder() {
-    return getKnowledgeBase();
+    return knowledgeBase_ == null
+        ? com.google.cloud.dialogflow.v2.KnowledgeBase.getDefaultInstance()
+        : knowledgeBase_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -171,7 +174,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -357,7 +360,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Request message for [KnowledgeBases.UpdateKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.UpdateKnowledgeBase].
+   * Request message for
+   * [KnowledgeBases.UpdateKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.UpdateKnowledgeBase].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.UpdateKnowledgeBaseRequest}
@@ -391,16 +395,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (knowledgeBaseBuilder_ == null) {
-        knowledgeBase_ = null;
-      } else {
-        knowledgeBase_ = null;
+      bitField0_ = 0;
+      knowledgeBase_ = null;
+      if (knowledgeBaseBuilder_ != null) {
+        knowledgeBaseBuilder_.dispose();
         knowledgeBaseBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -430,20 +433,24 @@ public com.google.cloud.dialogflow.v2.UpdateKnowledgeBaseRequest build() {
     public com.google.cloud.dialogflow.v2.UpdateKnowledgeBaseRequest buildPartial() {
       com.google.cloud.dialogflow.v2.UpdateKnowledgeBaseRequest result =
           new com.google.cloud.dialogflow.v2.UpdateKnowledgeBaseRequest(this);
-      if (knowledgeBaseBuilder_ == null) {
-        result.knowledgeBase_ = knowledgeBase_;
-      } else {
-        result.knowledgeBase_ = knowledgeBaseBuilder_.build();
-      }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.UpdateKnowledgeBaseRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.knowledgeBase_ =
+            knowledgeBaseBuilder_ == null ? knowledgeBase_ : knowledgeBaseBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -525,13 +532,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getKnowledgeBaseFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -551,6 +558,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2.KnowledgeBase knowledgeBase_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.KnowledgeBase,
@@ -571,7 +580,7 @@ public Builder mergeFrom(
      * @return Whether the knowledgeBase field is set.
      */
     public boolean hasKnowledgeBase() {
-      return knowledgeBaseBuilder_ != null || knowledgeBase_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -612,11 +621,11 @@ public Builder setKnowledgeBase(com.google.cloud.dialogflow.v2.KnowledgeBase val
           throw new NullPointerException();
         }
         knowledgeBase_ = value;
-        onChanged();
       } else {
         knowledgeBaseBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -634,11 +643,11 @@ public Builder setKnowledgeBase(
         com.google.cloud.dialogflow.v2.KnowledgeBase.Builder builderForValue) {
       if (knowledgeBaseBuilder_ == null) {
         knowledgeBase_ = builderForValue.build();
-        onChanged();
       } else {
         knowledgeBaseBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -654,19 +663,19 @@ public Builder setKnowledgeBase(
      */
     public Builder mergeKnowledgeBase(com.google.cloud.dialogflow.v2.KnowledgeBase value) {
       if (knowledgeBaseBuilder_ == null) {
-        if (knowledgeBase_ != null) {
-          knowledgeBase_ =
-              com.google.cloud.dialogflow.v2.KnowledgeBase.newBuilder(knowledgeBase_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && knowledgeBase_ != null
+            && knowledgeBase_
+                != com.google.cloud.dialogflow.v2.KnowledgeBase.getDefaultInstance()) {
+          getKnowledgeBaseBuilder().mergeFrom(value);
         } else {
           knowledgeBase_ = value;
         }
-        onChanged();
       } else {
         knowledgeBaseBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -681,14 +690,13 @@ public Builder mergeKnowledgeBase(com.google.cloud.dialogflow.v2.KnowledgeBase v
      * </code>
      */
     public Builder clearKnowledgeBase() {
-      if (knowledgeBaseBuilder_ == null) {
-        knowledgeBase_ = null;
-        onChanged();
-      } else {
-        knowledgeBase_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      knowledgeBase_ = null;
+      if (knowledgeBaseBuilder_ != null) {
+        knowledgeBaseBuilder_.dispose();
         knowledgeBaseBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -703,7 +711,7 @@ public Builder clearKnowledgeBase() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.KnowledgeBase.Builder getKnowledgeBaseBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getKnowledgeBaseFieldBuilder().getBuilder();
     }
@@ -776,7 +784,7 @@ public com.google.cloud.dialogflow.v2.KnowledgeBaseOrBuilder getKnowledgeBaseOrB
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -819,11 +827,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -841,11 +849,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -862,17 +870,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -888,14 +897,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -911,7 +919,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateParticipantRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateParticipantRequest.java
index 3f0c845ebb08..723c23c2fb3e 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateParticipantRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateParticipantRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Participants.UpdateParticipant][google.cloud.dialogflow.v2.Participants.UpdateParticipant].
+ * The request message for
+ * [Participants.UpdateParticipant][google.cloud.dialogflow.v2.Participants.UpdateParticipant].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.UpdateParticipantRequest}
@@ -116,7 +117,9 @@ public com.google.cloud.dialogflow.v2.Participant getParticipant() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.ParticipantOrBuilder getParticipantOrBuilder() {
-    return getParticipant();
+    return participant_ == null
+        ? com.google.cloud.dialogflow.v2.Participant.getDefaultInstance()
+        : participant_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -165,7 +168,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -351,7 +354,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Participants.UpdateParticipant][google.cloud.dialogflow.v2.Participants.UpdateParticipant].
+   * The request message for
+   * [Participants.UpdateParticipant][google.cloud.dialogflow.v2.Participants.UpdateParticipant].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.UpdateParticipantRequest}
@@ -385,16 +389,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (participantBuilder_ == null) {
-        participant_ = null;
-      } else {
-        participant_ = null;
+      bitField0_ = 0;
+      participant_ = null;
+      if (participantBuilder_ != null) {
+        participantBuilder_.dispose();
         participantBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -424,20 +427,24 @@ public com.google.cloud.dialogflow.v2.UpdateParticipantRequest build() {
     public com.google.cloud.dialogflow.v2.UpdateParticipantRequest buildPartial() {
       com.google.cloud.dialogflow.v2.UpdateParticipantRequest result =
           new com.google.cloud.dialogflow.v2.UpdateParticipantRequest(this);
-      if (participantBuilder_ == null) {
-        result.participant_ = participant_;
-      } else {
-        result.participant_ = participantBuilder_.build();
-      }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.UpdateParticipantRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.participant_ =
+            participantBuilder_ == null ? participant_ : participantBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -519,13 +526,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getParticipantFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -545,6 +552,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2.Participant participant_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.Participant,
@@ -565,7 +574,7 @@ public Builder mergeFrom(
      * @return Whether the participant field is set.
      */
     public boolean hasParticipant() {
-      return participantBuilder_ != null || participant_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -606,11 +615,11 @@ public Builder setParticipant(com.google.cloud.dialogflow.v2.Participant value)
           throw new NullPointerException();
         }
         participant_ = value;
-        onChanged();
       } else {
         participantBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -628,11 +637,11 @@ public Builder setParticipant(
         com.google.cloud.dialogflow.v2.Participant.Builder builderForValue) {
       if (participantBuilder_ == null) {
         participant_ = builderForValue.build();
-        onChanged();
       } else {
         participantBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -648,19 +657,18 @@ public Builder setParticipant(
      */
     public Builder mergeParticipant(com.google.cloud.dialogflow.v2.Participant value) {
       if (participantBuilder_ == null) {
-        if (participant_ != null) {
-          participant_ =
-              com.google.cloud.dialogflow.v2.Participant.newBuilder(participant_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && participant_ != null
+            && participant_ != com.google.cloud.dialogflow.v2.Participant.getDefaultInstance()) {
+          getParticipantBuilder().mergeFrom(value);
         } else {
           participant_ = value;
         }
-        onChanged();
       } else {
         participantBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -675,14 +683,13 @@ public Builder mergeParticipant(com.google.cloud.dialogflow.v2.Participant value
      * </code>
      */
     public Builder clearParticipant() {
-      if (participantBuilder_ == null) {
-        participant_ = null;
-        onChanged();
-      } else {
-        participant_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      participant_ = null;
+      if (participantBuilder_ != null) {
+        participantBuilder_.dispose();
         participantBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -697,7 +704,7 @@ public Builder clearParticipant() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.Participant.Builder getParticipantBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getParticipantFieldBuilder().getBuilder();
     }
@@ -768,7 +775,7 @@ public com.google.cloud.dialogflow.v2.ParticipantOrBuilder getParticipantOrBuild
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -807,11 +814,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -827,11 +834,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -846,17 +853,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -870,14 +878,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -891,7 +898,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateSessionEntityTypeRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateSessionEntityTypeRequest.java
index e1fc09abdcd5..c6bfbdc24e91 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateSessionEntityTypeRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateSessionEntityTypeRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [SessionEntityTypes.UpdateSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.UpdateSessionEntityType].
+ * The request message for
+ * [SessionEntityTypes.UpdateSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.UpdateSessionEntityType].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.UpdateSessionEntityTypeRequest}
@@ -117,7 +118,9 @@ public com.google.cloud.dialogflow.v2.SessionEntityType getSessionEntityType() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.SessionEntityTypeOrBuilder getSessionEntityTypeOrBuilder() {
-    return getSessionEntityType();
+    return sessionEntityType_ == null
+        ? com.google.cloud.dialogflow.v2.SessionEntityType.getDefaultInstance()
+        : sessionEntityType_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -166,7 +169,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -352,7 +355,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [SessionEntityTypes.UpdateSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.UpdateSessionEntityType].
+   * The request message for
+   * [SessionEntityTypes.UpdateSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.UpdateSessionEntityType].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.UpdateSessionEntityTypeRequest}
@@ -386,16 +390,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (sessionEntityTypeBuilder_ == null) {
-        sessionEntityType_ = null;
-      } else {
-        sessionEntityType_ = null;
+      bitField0_ = 0;
+      sessionEntityType_ = null;
+      if (sessionEntityTypeBuilder_ != null) {
+        sessionEntityTypeBuilder_.dispose();
         sessionEntityTypeBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -426,20 +429,27 @@ public com.google.cloud.dialogflow.v2.UpdateSessionEntityTypeRequest build() {
     public com.google.cloud.dialogflow.v2.UpdateSessionEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2.UpdateSessionEntityTypeRequest result =
           new com.google.cloud.dialogflow.v2.UpdateSessionEntityTypeRequest(this);
-      if (sessionEntityTypeBuilder_ == null) {
-        result.sessionEntityType_ = sessionEntityType_;
-      } else {
-        result.sessionEntityType_ = sessionEntityTypeBuilder_.build();
-      }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2.UpdateSessionEntityTypeRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.sessionEntityType_ =
+            sessionEntityTypeBuilder_ == null
+                ? sessionEntityType_
+                : sessionEntityTypeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -523,13 +533,13 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getSessionEntityTypeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -549,6 +559,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2.SessionEntityType sessionEntityType_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.SessionEntityType,
@@ -569,7 +581,7 @@ public Builder mergeFrom(
      * @return Whether the sessionEntityType field is set.
      */
     public boolean hasSessionEntityType() {
-      return sessionEntityTypeBuilder_ != null || sessionEntityType_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -610,11 +622,11 @@ public Builder setSessionEntityType(com.google.cloud.dialogflow.v2.SessionEntity
           throw new NullPointerException();
         }
         sessionEntityType_ = value;
-        onChanged();
       } else {
         sessionEntityTypeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -632,11 +644,11 @@ public Builder setSessionEntityType(
         com.google.cloud.dialogflow.v2.SessionEntityType.Builder builderForValue) {
       if (sessionEntityTypeBuilder_ == null) {
         sessionEntityType_ = builderForValue.build();
-        onChanged();
       } else {
         sessionEntityTypeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -652,19 +664,19 @@ public Builder setSessionEntityType(
      */
     public Builder mergeSessionEntityType(com.google.cloud.dialogflow.v2.SessionEntityType value) {
       if (sessionEntityTypeBuilder_ == null) {
-        if (sessionEntityType_ != null) {
-          sessionEntityType_ =
-              com.google.cloud.dialogflow.v2.SessionEntityType.newBuilder(sessionEntityType_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && sessionEntityType_ != null
+            && sessionEntityType_
+                != com.google.cloud.dialogflow.v2.SessionEntityType.getDefaultInstance()) {
+          getSessionEntityTypeBuilder().mergeFrom(value);
         } else {
           sessionEntityType_ = value;
         }
-        onChanged();
       } else {
         sessionEntityTypeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -679,14 +691,13 @@ public Builder mergeSessionEntityType(com.google.cloud.dialogflow.v2.SessionEnti
      * </code>
      */
     public Builder clearSessionEntityType() {
-      if (sessionEntityTypeBuilder_ == null) {
-        sessionEntityType_ = null;
-        onChanged();
-      } else {
-        sessionEntityType_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      sessionEntityType_ = null;
+      if (sessionEntityTypeBuilder_ != null) {
+        sessionEntityTypeBuilder_.dispose();
         sessionEntityTypeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -701,7 +712,7 @@ public Builder clearSessionEntityType() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.SessionEntityType.Builder getSessionEntityTypeBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getSessionEntityTypeFieldBuilder().getBuilder();
     }
@@ -773,7 +784,7 @@ public com.google.cloud.dialogflow.v2.SessionEntityType.Builder getSessionEntity
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -812,11 +823,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -832,11 +843,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -851,17 +862,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -875,14 +887,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -896,7 +907,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateVersionRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateVersionRequest.java
index 0f0aaa88bd55..a30a5529b54b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateVersionRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateVersionRequest.java
@@ -22,7 +22,8 @@
  *
  *
  * <pre>
- * The request message for [Versions.UpdateVersion][google.cloud.dialogflow.v2.Versions.UpdateVersion].
+ * The request message for
+ * [Versions.UpdateVersion][google.cloud.dialogflow.v2.Versions.UpdateVersion].
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.UpdateVersionRequest}
@@ -128,7 +129,9 @@ public com.google.cloud.dialogflow.v2.Version getVersion() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.VersionOrBuilder getVersionOrBuilder() {
-    return getVersion();
+    return version_ == null
+        ? com.google.cloud.dialogflow.v2.Version.getDefaultInstance()
+        : version_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -177,7 +180,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -362,7 +365,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The request message for [Versions.UpdateVersion][google.cloud.dialogflow.v2.Versions.UpdateVersion].
+   * The request message for
+   * [Versions.UpdateVersion][google.cloud.dialogflow.v2.Versions.UpdateVersion].
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.UpdateVersionRequest}
@@ -396,16 +400,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (versionBuilder_ == null) {
-        version_ = null;
-      } else {
-        version_ = null;
+      bitField0_ = 0;
+      version_ = null;
+      if (versionBuilder_ != null) {
+        versionBuilder_.dispose();
         versionBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -435,20 +438,23 @@ public com.google.cloud.dialogflow.v2.UpdateVersionRequest build() {
     public com.google.cloud.dialogflow.v2.UpdateVersionRequest buildPartial() {
       com.google.cloud.dialogflow.v2.UpdateVersionRequest result =
           new com.google.cloud.dialogflow.v2.UpdateVersionRequest(this);
-      if (versionBuilder_ == null) {
-        result.version_ = version_;
-      } else {
-        result.version_ = versionBuilder_.build();
-      }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.UpdateVersionRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.version_ = versionBuilder_ == null ? version_ : versionBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -530,13 +536,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getVersionFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -556,6 +562,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2.Version version_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2.Version,
@@ -580,7 +588,7 @@ public Builder mergeFrom(
      * @return Whether the version field is set.
      */
     public boolean hasVersion() {
-      return versionBuilder_ != null || version_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -629,11 +637,11 @@ public Builder setVersion(com.google.cloud.dialogflow.v2.Version value) {
           throw new NullPointerException();
         }
         version_ = value;
-        onChanged();
       } else {
         versionBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -654,11 +662,11 @@ public Builder setVersion(com.google.cloud.dialogflow.v2.Version value) {
     public Builder setVersion(com.google.cloud.dialogflow.v2.Version.Builder builderForValue) {
       if (versionBuilder_ == null) {
         version_ = builderForValue.build();
-        onChanged();
       } else {
         versionBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -678,19 +686,18 @@ public Builder setVersion(com.google.cloud.dialogflow.v2.Version.Builder builder
      */
     public Builder mergeVersion(com.google.cloud.dialogflow.v2.Version value) {
       if (versionBuilder_ == null) {
-        if (version_ != null) {
-          version_ =
-              com.google.cloud.dialogflow.v2.Version.newBuilder(version_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && version_ != null
+            && version_ != com.google.cloud.dialogflow.v2.Version.getDefaultInstance()) {
+          getVersionBuilder().mergeFrom(value);
         } else {
           version_ = value;
         }
-        onChanged();
       } else {
         versionBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -709,14 +716,13 @@ public Builder mergeVersion(com.google.cloud.dialogflow.v2.Version value) {
      * </code>
      */
     public Builder clearVersion() {
-      if (versionBuilder_ == null) {
-        version_ = null;
-        onChanged();
-      } else {
-        version_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      version_ = null;
+      if (versionBuilder_ != null) {
+        versionBuilder_.dispose();
         versionBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -735,7 +741,7 @@ public Builder clearVersion() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2.Version.Builder getVersionBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getVersionFieldBuilder().getBuilder();
     }
@@ -814,7 +820,7 @@ public com.google.cloud.dialogflow.v2.VersionOrBuilder getVersionOrBuilder() {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -853,11 +859,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -873,11 +879,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -892,17 +898,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -916,14 +923,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -937,7 +943,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ValidationError.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ValidationError.java
index 6becc6d0ecd1..4429c500fffe 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ValidationError.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ValidationError.java
@@ -271,7 +271,7 @@ private Severity(int value) {
   }
 
   public static final int SEVERITY_FIELD_NUMBER = 1;
-  private int severity_;
+  private int severity_ = 0;
   /**
    *
    *
@@ -300,15 +300,16 @@ public int getSeverityValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.ValidationError.Severity getSeverity() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.ValidationError.Severity result =
-        com.google.cloud.dialogflow.v2.ValidationError.Severity.valueOf(severity_);
+        com.google.cloud.dialogflow.v2.ValidationError.Severity.forNumber(severity_);
     return result == null
         ? com.google.cloud.dialogflow.v2.ValidationError.Severity.UNRECOGNIZED
         : result;
   }
 
   public static final int ENTRIES_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList entries_;
   /**
    *
@@ -418,7 +419,9 @@ public com.google.protobuf.ByteString getEntriesBytes(int index) {
   }
 
   public static final int ERROR_MESSAGE_FIELD_NUMBER = 4;
-  private volatile java.lang.Object errorMessage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object errorMessage_ = "";
   /**
    *
    *
@@ -692,12 +695,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       severity_ = 0;
-
       entries_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       errorMessage_ = "";
-
       return this;
     }
 
@@ -725,18 +727,32 @@ public com.google.cloud.dialogflow.v2.ValidationError build() {
     public com.google.cloud.dialogflow.v2.ValidationError buildPartial() {
       com.google.cloud.dialogflow.v2.ValidationError result =
           new com.google.cloud.dialogflow.v2.ValidationError(this);
-      int from_bitField0_ = bitField0_;
-      result.severity_ = severity_;
-      if (((bitField0_ & 0x00000001) != 0)) {
-        entries_ = entries_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000001);
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.entries_ = entries_;
-      result.errorMessage_ = errorMessage_;
       onBuilt();
       return result;
     }
 
+    private void buildPartialRepeatedFields(com.google.cloud.dialogflow.v2.ValidationError result) {
+      if (((bitField0_ & 0x00000002) != 0)) {
+        entries_ = entries_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000002);
+      }
+      result.entries_ = entries_;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ValidationError result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.severity_ = severity_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.errorMessage_ = errorMessage_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -788,7 +804,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ValidationError other) {
       if (!other.entries_.isEmpty()) {
         if (entries_.isEmpty()) {
           entries_ = other.entries_;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureEntriesIsMutable();
           entries_.addAll(other.entries_);
@@ -797,6 +813,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ValidationError other) {
       }
       if (!other.getErrorMessage().isEmpty()) {
         errorMessage_ = other.errorMessage_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -828,7 +845,7 @@ public Builder mergeFrom(
             case 8:
               {
                 severity_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 26:
@@ -841,7 +858,7 @@ public Builder mergeFrom(
             case 34:
               {
                 errorMessage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 34
             default:
@@ -892,8 +909,8 @@ public int getSeverityValue() {
      * @return This builder for chaining.
      */
     public Builder setSeverityValue(int value) {
-
       severity_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -910,9 +927,8 @@ public Builder setSeverityValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.ValidationError.Severity getSeverity() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.ValidationError.Severity result =
-          com.google.cloud.dialogflow.v2.ValidationError.Severity.valueOf(severity_);
+          com.google.cloud.dialogflow.v2.ValidationError.Severity.forNumber(severity_);
       return result == null
           ? com.google.cloud.dialogflow.v2.ValidationError.Severity.UNRECOGNIZED
           : result;
@@ -933,7 +949,7 @@ public Builder setSeverity(com.google.cloud.dialogflow.v2.ValidationError.Severi
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       severity_ = value.getNumber();
       onChanged();
       return this;
@@ -950,7 +966,7 @@ public Builder setSeverity(com.google.cloud.dialogflow.v2.ValidationError.Severi
      * @return This builder for chaining.
      */
     public Builder clearSeverity() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       severity_ = 0;
       onChanged();
       return this;
@@ -960,9 +976,9 @@ public Builder clearSeverity() {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureEntriesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         entries_ = new com.google.protobuf.LazyStringArrayList(entries_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
     /**
@@ -1193,7 +1209,7 @@ public Builder addAllEntries(java.lang.Iterable<java.lang.String> values) {
      */
     public Builder clearEntries() {
       entries_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1293,8 +1309,8 @@ public Builder setErrorMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       errorMessage_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1310,8 +1326,8 @@ public Builder setErrorMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearErrorMessage() {
-
       errorMessage_ = getDefaultInstance().getErrorMessage();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1332,8 +1348,8 @@ public Builder setErrorMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       errorMessage_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ValidationResult.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ValidationResult.java
index 52946928afe8..fd63f8fa071b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ValidationResult.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ValidationResult.java
@@ -68,6 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int VALIDATION_ERRORS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.ValidationError> validationErrors_;
   /**
    *
@@ -336,6 +338,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (validationErrorsBuilder_ == null) {
         validationErrors_ = java.util.Collections.emptyList();
       } else {
@@ -370,7 +373,16 @@ public com.google.cloud.dialogflow.v2.ValidationResult build() {
     public com.google.cloud.dialogflow.v2.ValidationResult buildPartial() {
       com.google.cloud.dialogflow.v2.ValidationResult result =
           new com.google.cloud.dialogflow.v2.ValidationResult(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2.ValidationResult result) {
       if (validationErrorsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           validationErrors_ = java.util.Collections.unmodifiableList(validationErrors_);
@@ -380,8 +392,10 @@ public com.google.cloud.dialogflow.v2.ValidationResult buildPartial() {
       } else {
         result.validationErrors_ = validationErrorsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.ValidationResult result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ValidationResultProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ValidationResultProto.java
index 5bcfac7b13d8..3db5ea2aa7d9 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ValidationResultProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ValidationResultProto.java
@@ -53,12 +53,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "PECIFIED\020\000\022\010\n\004INFO\020\001\022\013\n\007WARNING\020\002\022\t\n\005ERR"
           + "OR\020\003\022\014\n\010CRITICAL\020\004\"Z\n\020ValidationResult\022F"
           + "\n\021validation_errors\030\001 \003(\0132+.google.cloud"
-          + ".dialogflow.v2.ValidationErrorB\244\001\n\036com.g"
+          + ".dialogflow.v2.ValidationErrorB\236\001\n\036com.g"
           + "oogle.cloud.dialogflow.v2B\025ValidationRes"
-          + "ultProtoP\001ZDgoogle.golang.org/genproto/g"
-          + "oogleapis/cloud/dialogflow/v2;dialogflow"
-          + "\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dialogflow.V2b\006p"
-          + "roto3"
+          + "ultProtoP\001Z>cloud.google.com/go/dialogfl"
+          + "ow/apiv2/dialogflowpb;dialogflowpb\370\001\001\242\002\002"
+          + "DF\252\002\032Google.Cloud.Dialogflow.V2b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Version.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Version.java
index c5a18d2182e9..45f7724af28d 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Version.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Version.java
@@ -262,7 +262,9 @@ private VersionStatus(int value) {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -319,7 +321,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 2;
-  private volatile java.lang.Object description_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object description_ = "";
   /**
    *
    *
@@ -368,13 +372,13 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
   }
 
   public static final int VERSION_NUMBER_FIELD_NUMBER = 3;
-  private int versionNumber_;
+  private int versionNumber_ = 0;
   /**
    *
    *
    * <pre>
-   * Output only. The sequential number of this version. This field is read-only which means
-   * it cannot be set by create and update methods.
+   * Output only. The sequential number of this version. This field is read-only
+   * which means it cannot be set by create and update methods.
    * </pre>
    *
    * <code>int32 version_number = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -392,8 +396,8 @@ public int getVersionNumber() {
    *
    *
    * <pre>
-   * Output only. The creation time of this version. This field is read-only, i.e., it cannot
-   * be set by create and update methods.
+   * Output only. The creation time of this version. This field is read-only,
+   * i.e., it cannot be set by create and update methods.
    * </pre>
    *
    * <code>.google.protobuf.Timestamp create_time = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];
@@ -409,8 +413,8 @@ public boolean hasCreateTime() {
    *
    *
    * <pre>
-   * Output only. The creation time of this version. This field is read-only, i.e., it cannot
-   * be set by create and update methods.
+   * Output only. The creation time of this version. This field is read-only,
+   * i.e., it cannot be set by create and update methods.
    * </pre>
    *
    * <code>.google.protobuf.Timestamp create_time = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];
@@ -426,8 +430,8 @@ public com.google.protobuf.Timestamp getCreateTime() {
    *
    *
    * <pre>
-   * Output only. The creation time of this version. This field is read-only, i.e., it cannot
-   * be set by create and update methods.
+   * Output only. The creation time of this version. This field is read-only,
+   * i.e., it cannot be set by create and update methods.
    * </pre>
    *
    * <code>.google.protobuf.Timestamp create_time = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];
@@ -435,17 +439,17 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
 
   public static final int STATUS_FIELD_NUMBER = 6;
-  private int status_;
+  private int status_ = 0;
   /**
    *
    *
    * <pre>
-   * Output only. The status of this version. This field is read-only and cannot be set by
-   * create and update methods.
+   * Output only. The status of this version. This field is read-only and cannot
+   * be set by create and update methods.
    * </pre>
    *
    * <code>
@@ -462,8 +466,8 @@ public int getStatusValue() {
    *
    *
    * <pre>
-   * Output only. The status of this version. This field is read-only and cannot be set by
-   * create and update methods.
+   * Output only. The status of this version. This field is read-only and cannot
+   * be set by create and update methods.
    * </pre>
    *
    * <code>
@@ -474,9 +478,8 @@ public int getStatusValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.Version.VersionStatus getStatus() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.Version.VersionStatus result =
-        com.google.cloud.dialogflow.v2.Version.VersionStatus.valueOf(status_);
+        com.google.cloud.dialogflow.v2.Version.VersionStatus.forNumber(status_);
     return result == null
         ? com.google.cloud.dialogflow.v2.Version.VersionStatus.UNRECOGNIZED
         : result;
@@ -736,20 +739,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       description_ = "";
-
       versionNumber_ = 0;
-
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
       status_ = 0;
-
       return this;
     }
 
@@ -777,19 +776,32 @@ public com.google.cloud.dialogflow.v2.Version build() {
     public com.google.cloud.dialogflow.v2.Version buildPartial() {
       com.google.cloud.dialogflow.v2.Version result =
           new com.google.cloud.dialogflow.v2.Version(this);
-      result.name_ = name_;
-      result.description_ = description_;
-      result.versionNumber_ = versionNumber_;
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.status_ = status_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.Version result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.description_ = description_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.versionNumber_ = versionNumber_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.status_ = status_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -837,10 +849,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Version other) {
       if (other == com.google.cloud.dialogflow.v2.Version.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getVersionNumber() != 0) {
@@ -881,31 +895,31 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 description_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 versionNumber_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 34:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 48:
               {
                 status_ = input.readEnum();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 48
             default:
@@ -925,6 +939,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -998,8 +1014,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1019,8 +1035,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1045,8 +1061,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1112,8 +1128,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       description_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1129,8 +1145,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
-
       description_ = getDefaultInstance().getDescription();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1151,8 +1167,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       description_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1162,8 +1178,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
      *
      *
      * <pre>
-     * Output only. The sequential number of this version. This field is read-only which means
-     * it cannot be set by create and update methods.
+     * Output only. The sequential number of this version. This field is read-only
+     * which means it cannot be set by create and update methods.
      * </pre>
      *
      * <code>int32 version_number = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1178,8 +1194,8 @@ public int getVersionNumber() {
      *
      *
      * <pre>
-     * Output only. The sequential number of this version. This field is read-only which means
-     * it cannot be set by create and update methods.
+     * Output only. The sequential number of this version. This field is read-only
+     * which means it cannot be set by create and update methods.
      * </pre>
      *
      * <code>int32 version_number = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1190,6 +1206,7 @@ public int getVersionNumber() {
     public Builder setVersionNumber(int value) {
 
       versionNumber_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1197,8 +1214,8 @@ public Builder setVersionNumber(int value) {
      *
      *
      * <pre>
-     * Output only. The sequential number of this version. This field is read-only which means
-     * it cannot be set by create and update methods.
+     * Output only. The sequential number of this version. This field is read-only
+     * which means it cannot be set by create and update methods.
      * </pre>
      *
      * <code>int32 version_number = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1206,7 +1223,7 @@ public Builder setVersionNumber(int value) {
      * @return This builder for chaining.
      */
     public Builder clearVersionNumber() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       versionNumber_ = 0;
       onChanged();
       return this;
@@ -1222,8 +1239,8 @@ public Builder clearVersionNumber() {
      *
      *
      * <pre>
-     * Output only. The creation time of this version. This field is read-only, i.e., it cannot
-     * be set by create and update methods.
+     * Output only. The creation time of this version. This field is read-only,
+     * i.e., it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1233,14 +1250,14 @@ public Builder clearVersionNumber() {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
      *
      * <pre>
-     * Output only. The creation time of this version. This field is read-only, i.e., it cannot
-     * be set by create and update methods.
+     * Output only. The creation time of this version. This field is read-only,
+     * i.e., it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1262,8 +1279,8 @@ public com.google.protobuf.Timestamp getCreateTime() {
      *
      *
      * <pre>
-     * Output only. The creation time of this version. This field is read-only, i.e., it cannot
-     * be set by create and update methods.
+     * Output only. The creation time of this version. This field is read-only,
+     * i.e., it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1276,19 +1293,19 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Output only. The creation time of this version. This field is read-only, i.e., it cannot
-     * be set by create and update methods.
+     * Output only. The creation time of this version. This field is read-only,
+     * i.e., it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1298,19 +1315,19 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Output only. The creation time of this version. This field is read-only, i.e., it cannot
-     * be set by create and update methods.
+     * Output only. The creation time of this version. This field is read-only,
+     * i.e., it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1319,25 +1336,26 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
         } else {
           createTime_ = value;
         }
-        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Output only. The creation time of this version. This field is read-only, i.e., it cannot
-     * be set by create and update methods.
+     * Output only. The creation time of this version. This field is read-only,
+     * i.e., it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1345,22 +1363,21 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * </code>
      */
     public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Output only. The creation time of this version. This field is read-only, i.e., it cannot
-     * be set by create and update methods.
+     * Output only. The creation time of this version. This field is read-only,
+     * i.e., it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1368,7 +1385,7 @@ public Builder clearCreateTime() {
      * </code>
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
@@ -1376,8 +1393,8 @@ public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
      *
      *
      * <pre>
-     * Output only. The creation time of this version. This field is read-only, i.e., it cannot
-     * be set by create and update methods.
+     * Output only. The creation time of this version. This field is read-only,
+     * i.e., it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1397,8 +1414,8 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
      *
      *
      * <pre>
-     * Output only. The creation time of this version. This field is read-only, i.e., it cannot
-     * be set by create and update methods.
+     * Output only. The creation time of this version. This field is read-only,
+     * i.e., it cannot be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1427,8 +1444,8 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
      *
      *
      * <pre>
-     * Output only. The status of this version. This field is read-only and cannot be set by
-     * create and update methods.
+     * Output only. The status of this version. This field is read-only and cannot
+     * be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1445,8 +1462,8 @@ public int getStatusValue() {
      *
      *
      * <pre>
-     * Output only. The status of this version. This field is read-only and cannot be set by
-     * create and update methods.
+     * Output only. The status of this version. This field is read-only and cannot
+     * be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1457,8 +1474,8 @@ public int getStatusValue() {
      * @return This builder for chaining.
      */
     public Builder setStatusValue(int value) {
-
       status_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1466,8 +1483,8 @@ public Builder setStatusValue(int value) {
      *
      *
      * <pre>
-     * Output only. The status of this version. This field is read-only and cannot be set by
-     * create and update methods.
+     * Output only. The status of this version. This field is read-only and cannot
+     * be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1478,9 +1495,8 @@ public Builder setStatusValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.Version.VersionStatus getStatus() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.Version.VersionStatus result =
-          com.google.cloud.dialogflow.v2.Version.VersionStatus.valueOf(status_);
+          com.google.cloud.dialogflow.v2.Version.VersionStatus.forNumber(status_);
       return result == null
           ? com.google.cloud.dialogflow.v2.Version.VersionStatus.UNRECOGNIZED
           : result;
@@ -1489,8 +1505,8 @@ public com.google.cloud.dialogflow.v2.Version.VersionStatus getStatus() {
      *
      *
      * <pre>
-     * Output only. The status of this version. This field is read-only and cannot be set by
-     * create and update methods.
+     * Output only. The status of this version. This field is read-only and cannot
+     * be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1504,7 +1520,7 @@ public Builder setStatus(com.google.cloud.dialogflow.v2.Version.VersionStatus va
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000010;
       status_ = value.getNumber();
       onChanged();
       return this;
@@ -1513,8 +1529,8 @@ public Builder setStatus(com.google.cloud.dialogflow.v2.Version.VersionStatus va
      *
      *
      * <pre>
-     * Output only. The status of this version. This field is read-only and cannot be set by
-     * create and update methods.
+     * Output only. The status of this version. This field is read-only and cannot
+     * be set by create and update methods.
      * </pre>
      *
      * <code>
@@ -1524,7 +1540,7 @@ public Builder setStatus(com.google.cloud.dialogflow.v2.Version.VersionStatus va
      * @return This builder for chaining.
      */
     public Builder clearStatus() {
-
+      bitField0_ = (bitField0_ & ~0x00000010);
       status_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/VersionOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/VersionOrBuilder.java
index ac81023256f2..fa300e08a9c2 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/VersionOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/VersionOrBuilder.java
@@ -85,8 +85,8 @@ public interface VersionOrBuilder
    *
    *
    * <pre>
-   * Output only. The sequential number of this version. This field is read-only which means
-   * it cannot be set by create and update methods.
+   * Output only. The sequential number of this version. This field is read-only
+   * which means it cannot be set by create and update methods.
    * </pre>
    *
    * <code>int32 version_number = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -99,8 +99,8 @@ public interface VersionOrBuilder
    *
    *
    * <pre>
-   * Output only. The creation time of this version. This field is read-only, i.e., it cannot
-   * be set by create and update methods.
+   * Output only. The creation time of this version. This field is read-only,
+   * i.e., it cannot be set by create and update methods.
    * </pre>
    *
    * <code>.google.protobuf.Timestamp create_time = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];
@@ -113,8 +113,8 @@ public interface VersionOrBuilder
    *
    *
    * <pre>
-   * Output only. The creation time of this version. This field is read-only, i.e., it cannot
-   * be set by create and update methods.
+   * Output only. The creation time of this version. This field is read-only,
+   * i.e., it cannot be set by create and update methods.
    * </pre>
    *
    * <code>.google.protobuf.Timestamp create_time = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];
@@ -127,8 +127,8 @@ public interface VersionOrBuilder
    *
    *
    * <pre>
-   * Output only. The creation time of this version. This field is read-only, i.e., it cannot
-   * be set by create and update methods.
+   * Output only. The creation time of this version. This field is read-only,
+   * i.e., it cannot be set by create and update methods.
    * </pre>
    *
    * <code>.google.protobuf.Timestamp create_time = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];
@@ -140,8 +140,8 @@ public interface VersionOrBuilder
    *
    *
    * <pre>
-   * Output only. The status of this version. This field is read-only and cannot be set by
-   * create and update methods.
+   * Output only. The status of this version. This field is read-only and cannot
+   * be set by create and update methods.
    * </pre>
    *
    * <code>
@@ -155,8 +155,8 @@ public interface VersionOrBuilder
    *
    *
    * <pre>
-   * Output only. The status of this version. This field is read-only and cannot be set by
-   * create and update methods.
+   * Output only. The status of this version. This field is read-only and cannot
+   * be set by create and update methods.
    * </pre>
    *
    * <code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/VersionProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/VersionProto.java
index 73124aba6690..ede93bd2be9e 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/VersionProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/VersionProto.java
@@ -131,11 +131,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "}\332A\004name\032x\312A\031dialogflow.googleapis.com\322A"
           + "Yhttps://www.googleapis.com/auth/cloud-p"
           + "latform,https://www.googleapis.com/auth/"
-          + "dialogflowB\233\001\n\036com.google.cloud.dialogfl"
-          + "ow.v2B\014VersionProtoP\001ZDgoogle.golang.org"
-          + "/genproto/googleapis/cloud/dialogflow/v2"
-          + ";dialogflow\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dialo"
-          + "gflow.V2b\006proto3"
+          + "dialogflowB\225\001\n\036com.google.cloud.dialogfl"
+          + "ow.v2B\014VersionProtoP\001Z>cloud.google.com/"
+          + "go/dialogflow/apiv2/dialogflowpb;dialogf"
+          + "lowpb\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dialogflow."
+          + "V2b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/VoiceSelectionParams.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/VoiceSelectionParams.java
index 4c720fe9a2d9..158383f11903 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/VoiceSelectionParams.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/VoiceSelectionParams.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -122,16 +124,17 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int SSML_GENDER_FIELD_NUMBER = 2;
-  private int ssmlGender_;
+  private int ssmlGender_ = 0;
   /**
    *
    *
    * <pre>
    * Optional. The preferred gender of the voice. If not set, the service will
    * choose a voice based on the other parameters such as language_code and
-   * [name][google.cloud.dialogflow.v2.VoiceSelectionParams.name]. Note that this is only a preference, not requirement. If a
-   * voice of the appropriate gender is not available, the synthesizer should
-   * substitute a voice with a different gender rather than failing the request.
+   * [name][google.cloud.dialogflow.v2.VoiceSelectionParams.name]. Note that
+   * this is only a preference, not requirement. If a voice of the appropriate
+   * gender is not available, the synthesizer should substitute a voice with a
+   * different gender rather than failing the request.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.SsmlVoiceGender ssml_gender = 2;</code>
@@ -148,9 +151,10 @@ public int getSsmlGenderValue() {
    * <pre>
    * Optional. The preferred gender of the voice. If not set, the service will
    * choose a voice based on the other parameters such as language_code and
-   * [name][google.cloud.dialogflow.v2.VoiceSelectionParams.name]. Note that this is only a preference, not requirement. If a
-   * voice of the appropriate gender is not available, the synthesizer should
-   * substitute a voice with a different gender rather than failing the request.
+   * [name][google.cloud.dialogflow.v2.VoiceSelectionParams.name]. Note that
+   * this is only a preference, not requirement. If a voice of the appropriate
+   * gender is not available, the synthesizer should substitute a voice with a
+   * different gender rather than failing the request.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.SsmlVoiceGender ssml_gender = 2;</code>
@@ -159,9 +163,8 @@ public int getSsmlGenderValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.SsmlVoiceGender getSsmlGender() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.SsmlVoiceGender result =
-        com.google.cloud.dialogflow.v2.SsmlVoiceGender.valueOf(ssmlGender_);
+        com.google.cloud.dialogflow.v2.SsmlVoiceGender.forNumber(ssmlGender_);
     return result == null ? com.google.cloud.dialogflow.v2.SsmlVoiceGender.UNRECOGNIZED : result;
   }
 
@@ -375,10 +378,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       ssmlGender_ = 0;
-
       return this;
     }
 
@@ -406,12 +408,23 @@ public com.google.cloud.dialogflow.v2.VoiceSelectionParams build() {
     public com.google.cloud.dialogflow.v2.VoiceSelectionParams buildPartial() {
       com.google.cloud.dialogflow.v2.VoiceSelectionParams result =
           new com.google.cloud.dialogflow.v2.VoiceSelectionParams(this);
-      result.name_ = name_;
-      result.ssmlGender_ = ssmlGender_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.VoiceSelectionParams result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.ssmlGender_ = ssmlGender_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -460,6 +473,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.VoiceSelectionParams oth
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.ssmlGender_ != 0) {
@@ -494,13 +508,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 ssmlGender_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             default:
@@ -520,6 +534,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -587,8 +603,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -606,8 +622,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -630,8 +646,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -643,9 +659,10 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      * <pre>
      * Optional. The preferred gender of the voice. If not set, the service will
      * choose a voice based on the other parameters such as language_code and
-     * [name][google.cloud.dialogflow.v2.VoiceSelectionParams.name]. Note that this is only a preference, not requirement. If a
-     * voice of the appropriate gender is not available, the synthesizer should
-     * substitute a voice with a different gender rather than failing the request.
+     * [name][google.cloud.dialogflow.v2.VoiceSelectionParams.name]. Note that
+     * this is only a preference, not requirement. If a voice of the appropriate
+     * gender is not available, the synthesizer should substitute a voice with a
+     * different gender rather than failing the request.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.SsmlVoiceGender ssml_gender = 2;</code>
@@ -662,9 +679,10 @@ public int getSsmlGenderValue() {
      * <pre>
      * Optional. The preferred gender of the voice. If not set, the service will
      * choose a voice based on the other parameters such as language_code and
-     * [name][google.cloud.dialogflow.v2.VoiceSelectionParams.name]. Note that this is only a preference, not requirement. If a
-     * voice of the appropriate gender is not available, the synthesizer should
-     * substitute a voice with a different gender rather than failing the request.
+     * [name][google.cloud.dialogflow.v2.VoiceSelectionParams.name]. Note that
+     * this is only a preference, not requirement. If a voice of the appropriate
+     * gender is not available, the synthesizer should substitute a voice with a
+     * different gender rather than failing the request.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.SsmlVoiceGender ssml_gender = 2;</code>
@@ -673,8 +691,8 @@ public int getSsmlGenderValue() {
      * @return This builder for chaining.
      */
     public Builder setSsmlGenderValue(int value) {
-
       ssmlGender_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -684,9 +702,10 @@ public Builder setSsmlGenderValue(int value) {
      * <pre>
      * Optional. The preferred gender of the voice. If not set, the service will
      * choose a voice based on the other parameters such as language_code and
-     * [name][google.cloud.dialogflow.v2.VoiceSelectionParams.name]. Note that this is only a preference, not requirement. If a
-     * voice of the appropriate gender is not available, the synthesizer should
-     * substitute a voice with a different gender rather than failing the request.
+     * [name][google.cloud.dialogflow.v2.VoiceSelectionParams.name]. Note that
+     * this is only a preference, not requirement. If a voice of the appropriate
+     * gender is not available, the synthesizer should substitute a voice with a
+     * different gender rather than failing the request.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.SsmlVoiceGender ssml_gender = 2;</code>
@@ -695,9 +714,8 @@ public Builder setSsmlGenderValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2.SsmlVoiceGender getSsmlGender() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.SsmlVoiceGender result =
-          com.google.cloud.dialogflow.v2.SsmlVoiceGender.valueOf(ssmlGender_);
+          com.google.cloud.dialogflow.v2.SsmlVoiceGender.forNumber(ssmlGender_);
       return result == null ? com.google.cloud.dialogflow.v2.SsmlVoiceGender.UNRECOGNIZED : result;
     }
     /**
@@ -706,9 +724,10 @@ public com.google.cloud.dialogflow.v2.SsmlVoiceGender getSsmlGender() {
      * <pre>
      * Optional. The preferred gender of the voice. If not set, the service will
      * choose a voice based on the other parameters such as language_code and
-     * [name][google.cloud.dialogflow.v2.VoiceSelectionParams.name]. Note that this is only a preference, not requirement. If a
-     * voice of the appropriate gender is not available, the synthesizer should
-     * substitute a voice with a different gender rather than failing the request.
+     * [name][google.cloud.dialogflow.v2.VoiceSelectionParams.name]. Note that
+     * this is only a preference, not requirement. If a voice of the appropriate
+     * gender is not available, the synthesizer should substitute a voice with a
+     * different gender rather than failing the request.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.SsmlVoiceGender ssml_gender = 2;</code>
@@ -720,7 +739,7 @@ public Builder setSsmlGender(com.google.cloud.dialogflow.v2.SsmlVoiceGender valu
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       ssmlGender_ = value.getNumber();
       onChanged();
       return this;
@@ -731,9 +750,10 @@ public Builder setSsmlGender(com.google.cloud.dialogflow.v2.SsmlVoiceGender valu
      * <pre>
      * Optional. The preferred gender of the voice. If not set, the service will
      * choose a voice based on the other parameters such as language_code and
-     * [name][google.cloud.dialogflow.v2.VoiceSelectionParams.name]. Note that this is only a preference, not requirement. If a
-     * voice of the appropriate gender is not available, the synthesizer should
-     * substitute a voice with a different gender rather than failing the request.
+     * [name][google.cloud.dialogflow.v2.VoiceSelectionParams.name]. Note that
+     * this is only a preference, not requirement. If a voice of the appropriate
+     * gender is not available, the synthesizer should substitute a voice with a
+     * different gender rather than failing the request.
      * </pre>
      *
      * <code>.google.cloud.dialogflow.v2.SsmlVoiceGender ssml_gender = 2;</code>
@@ -741,7 +761,7 @@ public Builder setSsmlGender(com.google.cloud.dialogflow.v2.SsmlVoiceGender valu
      * @return This builder for chaining.
      */
     public Builder clearSsmlGender() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       ssmlGender_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/VoiceSelectionParamsOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/VoiceSelectionParamsOrBuilder.java
index 55b8ed7ec77f..68541a8368a7 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/VoiceSelectionParamsOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/VoiceSelectionParamsOrBuilder.java
@@ -58,9 +58,10 @@ public interface VoiceSelectionParamsOrBuilder
    * <pre>
    * Optional. The preferred gender of the voice. If not set, the service will
    * choose a voice based on the other parameters such as language_code and
-   * [name][google.cloud.dialogflow.v2.VoiceSelectionParams.name]. Note that this is only a preference, not requirement. If a
-   * voice of the appropriate gender is not available, the synthesizer should
-   * substitute a voice with a different gender rather than failing the request.
+   * [name][google.cloud.dialogflow.v2.VoiceSelectionParams.name]. Note that
+   * this is only a preference, not requirement. If a voice of the appropriate
+   * gender is not available, the synthesizer should substitute a voice with a
+   * different gender rather than failing the request.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.SsmlVoiceGender ssml_gender = 2;</code>
@@ -74,9 +75,10 @@ public interface VoiceSelectionParamsOrBuilder
    * <pre>
    * Optional. The preferred gender of the voice. If not set, the service will
    * choose a voice based on the other parameters such as language_code and
-   * [name][google.cloud.dialogflow.v2.VoiceSelectionParams.name]. Note that this is only a preference, not requirement. If a
-   * voice of the appropriate gender is not available, the synthesizer should
-   * substitute a voice with a different gender rather than failing the request.
+   * [name][google.cloud.dialogflow.v2.VoiceSelectionParams.name]. Note that
+   * this is only a preference, not requirement. If a voice of the appropriate
+   * gender is not available, the synthesizer should substitute a voice with a
+   * different gender rather than failing the request.
    * </pre>
    *
    * <code>.google.cloud.dialogflow.v2.SsmlVoiceGender ssml_gender = 2;</code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookProto.java
index 8001cccbf502..c071a36babb2 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookProto.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookProto.java
@@ -72,11 +72,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "oogle.cloud.dialogflow.v2.SessionEntityT"
           + "ype\"h\n\033OriginalDetectIntentRequest\022\016\n\006so"
           + "urce\030\001 \001(\t\022\017\n\007version\030\002 \001(\t\022(\n\007payload\030\003"
-          + " \001(\0132\027.google.protobuf.StructB\233\001\n\036com.go"
+          + " \001(\0132\027.google.protobuf.StructB\225\001\n\036com.go"
           + "ogle.cloud.dialogflow.v2B\014WebhookProtoP\001"
-          + "ZDgoogle.golang.org/genproto/googleapis/"
-          + "cloud/dialogflow/v2;dialogflow\370\001\001\242\002\002DF\252\002"
-          + "\032Google.Cloud.Dialogflow.V2b\006proto3"
+          + "Z>cloud.google.com/go/dialogflow/apiv2/d"
+          + "ialogflowpb;dialogflowpb\370\001\001\242\002\002DF\252\002\032Googl"
+          + "e.Cloud.Dialogflow.V2b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookRequest.java
index 9011f1d39d8c..9fdc5a6c4d39 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SESSION_FIELD_NUMBER = 4;
-  private volatile java.lang.Object session_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object session_ = "";
   /**
    *
    *
@@ -126,7 +128,9 @@ public com.google.protobuf.ByteString getSessionBytes() {
   }
 
   public static final int RESPONSE_ID_FIELD_NUMBER = 1;
-  private volatile java.lang.Object responseId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object responseId_ = "";
   /**
    *
    *
@@ -224,7 +228,9 @@ public com.google.cloud.dialogflow.v2.QueryResult getQueryResult() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.QueryResultOrBuilder getQueryResultOrBuilder() {
-    return getQueryResult();
+    return queryResult_ == null
+        ? com.google.cloud.dialogflow.v2.QueryResult.getDefaultInstance()
+        : queryResult_;
   }
 
   public static final int ORIGINAL_DETECT_INTENT_REQUEST_FIELD_NUMBER = 3;
@@ -283,7 +289,9 @@ public boolean hasOriginalDetectIntentRequest() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.OriginalDetectIntentRequestOrBuilder
       getOriginalDetectIntentRequestOrBuilder() {
-    return getOriginalDetectIntentRequest();
+    return originalDetectIntentRequest_ == null
+        ? com.google.cloud.dialogflow.v2.OriginalDetectIntentRequest.getDefaultInstance()
+        : originalDetectIntentRequest_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -523,20 +531,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       session_ = "";
-
       responseId_ = "";
-
-      if (queryResultBuilder_ == null) {
-        queryResult_ = null;
-      } else {
-        queryResult_ = null;
+      queryResult_ = null;
+      if (queryResultBuilder_ != null) {
+        queryResultBuilder_.dispose();
         queryResultBuilder_ = null;
       }
-      if (originalDetectIntentRequestBuilder_ == null) {
-        originalDetectIntentRequest_ = null;
-      } else {
-        originalDetectIntentRequest_ = null;
+      originalDetectIntentRequest_ = null;
+      if (originalDetectIntentRequestBuilder_ != null) {
+        originalDetectIntentRequestBuilder_.dispose();
         originalDetectIntentRequestBuilder_ = null;
       }
       return this;
@@ -566,22 +571,33 @@ public com.google.cloud.dialogflow.v2.WebhookRequest build() {
     public com.google.cloud.dialogflow.v2.WebhookRequest buildPartial() {
       com.google.cloud.dialogflow.v2.WebhookRequest result =
           new com.google.cloud.dialogflow.v2.WebhookRequest(this);
-      result.session_ = session_;
-      result.responseId_ = responseId_;
-      if (queryResultBuilder_ == null) {
-        result.queryResult_ = queryResult_;
-      } else {
-        result.queryResult_ = queryResultBuilder_.build();
-      }
-      if (originalDetectIntentRequestBuilder_ == null) {
-        result.originalDetectIntentRequest_ = originalDetectIntentRequest_;
-      } else {
-        result.originalDetectIntentRequest_ = originalDetectIntentRequestBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2.WebhookRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.session_ = session_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.responseId_ = responseId_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.queryResult_ =
+            queryResultBuilder_ == null ? queryResult_ : queryResultBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.originalDetectIntentRequest_ =
+            originalDetectIntentRequestBuilder_ == null
+                ? originalDetectIntentRequest_
+                : originalDetectIntentRequestBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -629,10 +645,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.WebhookRequest other) {
       if (other == com.google.cloud.dialogflow.v2.WebhookRequest.getDefaultInstance()) return this;
       if (!other.getSession().isEmpty()) {
         session_ = other.session_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getResponseId().isEmpty()) {
         responseId_ = other.responseId_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasQueryResult()) {
@@ -670,26 +688,26 @@ public Builder mergeFrom(
             case 10:
               {
                 responseId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getQueryResultFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(
                     getOriginalDetectIntentRequestFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 26
             case 34:
               {
                 session_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 34
             default:
@@ -709,6 +727,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object session_ = "";
     /**
      *
@@ -782,8 +802,8 @@ public Builder setSession(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       session_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -803,8 +823,8 @@ public Builder setSession(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSession() {
-
       session_ = getDefaultInstance().getSession();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -829,8 +849,8 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       session_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -899,8 +919,8 @@ public Builder setResponseId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       responseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -917,8 +937,8 @@ public Builder setResponseId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearResponseId() {
-
       responseId_ = getDefaultInstance().getResponseId();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -940,8 +960,8 @@ public Builder setResponseIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       responseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -965,7 +985,7 @@ public Builder setResponseIdBytes(com.google.protobuf.ByteString value) {
      * @return Whether the queryResult field is set.
      */
     public boolean hasQueryResult() {
-      return queryResultBuilder_ != null || queryResult_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1004,11 +1024,11 @@ public Builder setQueryResult(com.google.cloud.dialogflow.v2.QueryResult value)
           throw new NullPointerException();
         }
         queryResult_ = value;
-        onChanged();
       } else {
         queryResultBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1025,11 +1045,11 @@ public Builder setQueryResult(
         com.google.cloud.dialogflow.v2.QueryResult.Builder builderForValue) {
       if (queryResultBuilder_ == null) {
         queryResult_ = builderForValue.build();
-        onChanged();
       } else {
         queryResultBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1044,19 +1064,18 @@ public Builder setQueryResult(
      */
     public Builder mergeQueryResult(com.google.cloud.dialogflow.v2.QueryResult value) {
       if (queryResultBuilder_ == null) {
-        if (queryResult_ != null) {
-          queryResult_ =
-              com.google.cloud.dialogflow.v2.QueryResult.newBuilder(queryResult_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && queryResult_ != null
+            && queryResult_ != com.google.cloud.dialogflow.v2.QueryResult.getDefaultInstance()) {
+          getQueryResultBuilder().mergeFrom(value);
         } else {
           queryResult_ = value;
         }
-        onChanged();
       } else {
         queryResultBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1070,14 +1089,13 @@ public Builder mergeQueryResult(com.google.cloud.dialogflow.v2.QueryResult value
      * <code>.google.cloud.dialogflow.v2.QueryResult query_result = 2;</code>
      */
     public Builder clearQueryResult() {
-      if (queryResultBuilder_ == null) {
-        queryResult_ = null;
-        onChanged();
-      } else {
-        queryResult_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      queryResult_ = null;
+      if (queryResultBuilder_ != null) {
+        queryResultBuilder_.dispose();
         queryResultBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1091,7 +1109,7 @@ public Builder clearQueryResult() {
      * <code>.google.cloud.dialogflow.v2.QueryResult query_result = 2;</code>
      */
     public com.google.cloud.dialogflow.v2.QueryResult.Builder getQueryResultBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getQueryResultFieldBuilder().getBuilder();
     }
@@ -1162,7 +1180,7 @@ public com.google.cloud.dialogflow.v2.QueryResultOrBuilder getQueryResultOrBuild
      * @return Whether the originalDetectIntentRequest field is set.
      */
     public boolean hasOriginalDetectIntentRequest() {
-      return originalDetectIntentRequestBuilder_ != null || originalDetectIntentRequest_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1207,11 +1225,11 @@ public Builder setOriginalDetectIntentRequest(
           throw new NullPointerException();
         }
         originalDetectIntentRequest_ = value;
-        onChanged();
       } else {
         originalDetectIntentRequestBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1230,11 +1248,11 @@ public Builder setOriginalDetectIntentRequest(
         com.google.cloud.dialogflow.v2.OriginalDetectIntentRequest.Builder builderForValue) {
       if (originalDetectIntentRequestBuilder_ == null) {
         originalDetectIntentRequest_ = builderForValue.build();
-        onChanged();
       } else {
         originalDetectIntentRequestBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1252,20 +1270,20 @@ public Builder setOriginalDetectIntentRequest(
     public Builder mergeOriginalDetectIntentRequest(
         com.google.cloud.dialogflow.v2.OriginalDetectIntentRequest value) {
       if (originalDetectIntentRequestBuilder_ == null) {
-        if (originalDetectIntentRequest_ != null) {
-          originalDetectIntentRequest_ =
-              com.google.cloud.dialogflow.v2.OriginalDetectIntentRequest.newBuilder(
-                      originalDetectIntentRequest_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && originalDetectIntentRequest_ != null
+            && originalDetectIntentRequest_
+                != com.google.cloud.dialogflow.v2.OriginalDetectIntentRequest
+                    .getDefaultInstance()) {
+          getOriginalDetectIntentRequestBuilder().mergeFrom(value);
         } else {
           originalDetectIntentRequest_ = value;
         }
-        onChanged();
       } else {
         originalDetectIntentRequestBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1281,14 +1299,13 @@ public Builder mergeOriginalDetectIntentRequest(
      * </code>
      */
     public Builder clearOriginalDetectIntentRequest() {
-      if (originalDetectIntentRequestBuilder_ == null) {
-        originalDetectIntentRequest_ = null;
-        onChanged();
-      } else {
-        originalDetectIntentRequest_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      originalDetectIntentRequest_ = null;
+      if (originalDetectIntentRequestBuilder_ != null) {
+        originalDetectIntentRequestBuilder_.dispose();
         originalDetectIntentRequestBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1305,7 +1322,7 @@ public Builder clearOriginalDetectIntentRequest() {
      */
     public com.google.cloud.dialogflow.v2.OriginalDetectIntentRequest.Builder
         getOriginalDetectIntentRequestBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getOriginalDetectIntentRequestFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookResponse.java
index 678c27fd9527..b5dedbd2d62e 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookResponse.java
@@ -24,9 +24,10 @@
  * <pre>
  * The response message for a webhook call.
  * This response is validated by the Dialogflow server. If validation fails,
- * an error will be returned in the [QueryResult.diagnostic_info][google.cloud.dialogflow.v2.QueryResult.diagnostic_info] field.
- * Setting JSON fields to an empty value with the wrong type is a common error.
- * To avoid this error:
+ * an error will be returned in the
+ * [QueryResult.diagnostic_info][google.cloud.dialogflow.v2.QueryResult.diagnostic_info]
+ * field. Setting JSON fields to an empty value with the wrong type is a common
+ * error. To avoid this error:
  * - Use `""` for empty strings
  * - Use `{}` or `null` for empty objects
  * - Use `[]` or `null` for empty arrays
@@ -82,7 +83,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int FULFILLMENT_TEXT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object fulfillmentText_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object fulfillmentText_ = "";
   /**
    *
    *
@@ -90,7 +93,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * Optional. The text response message intended for the end-user.
    * It is recommended to use `fulfillment_messages.text.text[0]` instead.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.fulfillment_text][google.cloud.dialogflow.v2.QueryResult.fulfillment_text] sent to the integration or API caller.
+   * [QueryResult.fulfillment_text][google.cloud.dialogflow.v2.QueryResult.fulfillment_text]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>string fulfillment_text = 1;</code>
@@ -116,7 +120,8 @@ public java.lang.String getFulfillmentText() {
    * Optional. The text response message intended for the end-user.
    * It is recommended to use `fulfillment_messages.text.text[0]` instead.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.fulfillment_text][google.cloud.dialogflow.v2.QueryResult.fulfillment_text] sent to the integration or API caller.
+   * [QueryResult.fulfillment_text][google.cloud.dialogflow.v2.QueryResult.fulfillment_text]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>string fulfillment_text = 1;</code>
@@ -137,6 +142,8 @@ public com.google.protobuf.ByteString getFulfillmentTextBytes() {
   }
 
   public static final int FULFILLMENT_MESSAGES_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Intent.Message> fulfillmentMessages_;
   /**
    *
@@ -144,7 +151,8 @@ public com.google.protobuf.ByteString getFulfillmentTextBytes() {
    * <pre>
    * Optional. The rich response messages intended for the end-user.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+   * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -160,7 +168,8 @@ public com.google.protobuf.ByteString getFulfillmentTextBytes() {
    * <pre>
    * Optional. The rich response messages intended for the end-user.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+   * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -176,7 +185,8 @@ public com.google.protobuf.ByteString getFulfillmentTextBytes() {
    * <pre>
    * Optional. The rich response messages intended for the end-user.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+   * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -191,7 +201,8 @@ public int getFulfillmentMessagesCount() {
    * <pre>
    * Optional. The rich response messages intended for the end-user.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+   * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -206,7 +217,8 @@ public com.google.cloud.dialogflow.v2.Intent.Message getFulfillmentMessages(int
    * <pre>
    * Optional. The rich response messages intended for the end-user.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+   * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -218,7 +230,9 @@ public com.google.cloud.dialogflow.v2.Intent.MessageOrBuilder getFulfillmentMess
   }
 
   public static final int SOURCE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object source_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object source_ = "";
   /**
    *
    *
@@ -226,7 +240,8 @@ public com.google.cloud.dialogflow.v2.Intent.MessageOrBuilder getFulfillmentMess
    * Optional. A custom field used to identify the webhook source.
    * Arbitrary strings are supported.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.webhook_source][google.cloud.dialogflow.v2.QueryResult.webhook_source] sent to the integration or API caller.
+   * [QueryResult.webhook_source][google.cloud.dialogflow.v2.QueryResult.webhook_source]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>string source = 3;</code>
@@ -252,7 +267,8 @@ public java.lang.String getSource() {
    * Optional. A custom field used to identify the webhook source.
    * Arbitrary strings are supported.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.webhook_source][google.cloud.dialogflow.v2.QueryResult.webhook_source] sent to the integration or API caller.
+   * [QueryResult.webhook_source][google.cloud.dialogflow.v2.QueryResult.webhook_source]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>string source = 3;</code>
@@ -278,11 +294,11 @@ public com.google.protobuf.ByteString getSourceBytes() {
    *
    *
    * <pre>
-   * Optional. This field can be used to pass custom data from your webhook to the
-   * integration or API caller. Arbitrary JSON objects are supported.
-   * When provided, Dialogflow uses this field to populate
-   * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload] sent to the integration or API caller.
-   * This field is also used by the
+   * Optional. This field can be used to pass custom data from your webhook to
+   * the integration or API caller. Arbitrary JSON objects are supported. When
+   * provided, Dialogflow uses this field to populate
+   * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload]
+   * sent to the integration or API caller. This field is also used by the
    * [Google Assistant
    * integration](https://cloud.google.com/dialogflow/docs/integrations/aog)
    * for rich response messages.
@@ -302,11 +318,11 @@ public boolean hasPayload() {
    *
    *
    * <pre>
-   * Optional. This field can be used to pass custom data from your webhook to the
-   * integration or API caller. Arbitrary JSON objects are supported.
-   * When provided, Dialogflow uses this field to populate
-   * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload] sent to the integration or API caller.
-   * This field is also used by the
+   * Optional. This field can be used to pass custom data from your webhook to
+   * the integration or API caller. Arbitrary JSON objects are supported. When
+   * provided, Dialogflow uses this field to populate
+   * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload]
+   * sent to the integration or API caller. This field is also used by the
    * [Google Assistant
    * integration](https://cloud.google.com/dialogflow/docs/integrations/aog)
    * for rich response messages.
@@ -326,11 +342,11 @@ public com.google.protobuf.Struct getPayload() {
    *
    *
    * <pre>
-   * Optional. This field can be used to pass custom data from your webhook to the
-   * integration or API caller. Arbitrary JSON objects are supported.
-   * When provided, Dialogflow uses this field to populate
-   * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload] sent to the integration or API caller.
-   * This field is also used by the
+   * Optional. This field can be used to pass custom data from your webhook to
+   * the integration or API caller. Arbitrary JSON objects are supported. When
+   * provided, Dialogflow uses this field to populate
+   * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload]
+   * sent to the integration or API caller. This field is also used by the
    * [Google Assistant
    * integration](https://cloud.google.com/dialogflow/docs/integrations/aog)
    * for rich response messages.
@@ -342,10 +358,12 @@ public com.google.protobuf.Struct getPayload() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() {
-    return getPayload();
+    return payload_ == null ? com.google.protobuf.Struct.getDefaultInstance() : payload_;
   }
 
   public static final int OUTPUT_CONTEXTS_FIELD_NUMBER = 5;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.Context> outputContexts_;
   /**
    *
@@ -354,7 +372,8 @@ public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() {
    * Optional. The collection of output contexts that will overwrite currently
    * active contexts for the session and reset their lifespans.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+   * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -370,7 +389,8 @@ public java.util.List<com.google.cloud.dialogflow.v2.Context> getOutputContextsL
    * Optional. The collection of output contexts that will overwrite currently
    * active contexts for the session and reset their lifespans.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+   * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -387,7 +407,8 @@ public java.util.List<com.google.cloud.dialogflow.v2.Context> getOutputContextsL
    * Optional. The collection of output contexts that will overwrite currently
    * active contexts for the session and reset their lifespans.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+   * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -403,7 +424,8 @@ public int getOutputContextsCount() {
    * Optional. The collection of output contexts that will overwrite currently
    * active contexts for the session and reset their lifespans.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+   * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -419,7 +441,8 @@ public com.google.cloud.dialogflow.v2.Context getOutputContexts(int index) {
    * Optional. The collection of output contexts that will overwrite currently
    * active contexts for the session and reset their lifespans.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+   * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -480,10 +503,14 @@ public com.google.cloud.dialogflow.v2.EventInput getFollowupEventInput() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2.EventInputOrBuilder getFollowupEventInputOrBuilder() {
-    return getFollowupEventInput();
+    return followupEventInput_ == null
+        ? com.google.cloud.dialogflow.v2.EventInput.getDefaultInstance()
+        : followupEventInput_;
   }
 
   public static final int SESSION_ENTITY_TYPES_FIELD_NUMBER = 10;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2.SessionEntityType> sessionEntityTypes_;
   /**
    *
@@ -493,7 +520,9 @@ public com.google.cloud.dialogflow.v2.EventInputOrBuilder getFollowupEventInputO
    * entity types with. The entity synonyms apply to all languages and persist
    * for the session. Setting this data from a webhook overwrites
    * the session entity types that have been set using `detectIntent`,
-   * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+   * `streamingDetectIntent` or
+   * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+   * management methods.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;</code>
@@ -511,7 +540,9 @@ public com.google.cloud.dialogflow.v2.EventInputOrBuilder getFollowupEventInputO
    * entity types with. The entity synonyms apply to all languages and persist
    * for the session. Setting this data from a webhook overwrites
    * the session entity types that have been set using `detectIntent`,
-   * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+   * `streamingDetectIntent` or
+   * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+   * management methods.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;</code>
@@ -529,7 +560,9 @@ public com.google.cloud.dialogflow.v2.EventInputOrBuilder getFollowupEventInputO
    * entity types with. The entity synonyms apply to all languages and persist
    * for the session. Setting this data from a webhook overwrites
    * the session entity types that have been set using `detectIntent`,
-   * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+   * `streamingDetectIntent` or
+   * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+   * management methods.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;</code>
@@ -546,7 +579,9 @@ public int getSessionEntityTypesCount() {
    * entity types with. The entity synonyms apply to all languages and persist
    * for the session. Setting this data from a webhook overwrites
    * the session entity types that have been set using `detectIntent`,
-   * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+   * `streamingDetectIntent` or
+   * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+   * management methods.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;</code>
@@ -563,7 +598,9 @@ public com.google.cloud.dialogflow.v2.SessionEntityType getSessionEntityTypes(in
    * entity types with. The entity synonyms apply to all languages and persist
    * for the session. Setting this data from a webhook overwrites
    * the session entity types that have been set using `detectIntent`,
-   * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+   * `streamingDetectIntent` or
+   * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+   * management methods.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;</code>
@@ -811,9 +848,10 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * <pre>
    * The response message for a webhook call.
    * This response is validated by the Dialogflow server. If validation fails,
-   * an error will be returned in the [QueryResult.diagnostic_info][google.cloud.dialogflow.v2.QueryResult.diagnostic_info] field.
-   * Setting JSON fields to an empty value with the wrong type is a common error.
-   * To avoid this error:
+   * an error will be returned in the
+   * [QueryResult.diagnostic_info][google.cloud.dialogflow.v2.QueryResult.diagnostic_info]
+   * field. Setting JSON fields to an empty value with the wrong type is a common
+   * error. To avoid this error:
    * - Use `""` for empty strings
    * - Use `{}` or `null` for empty objects
    * - Use `[]` or `null` for empty arrays
@@ -853,21 +891,19 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       fulfillmentText_ = "";
-
       if (fulfillmentMessagesBuilder_ == null) {
         fulfillmentMessages_ = java.util.Collections.emptyList();
       } else {
         fulfillmentMessages_ = null;
         fulfillmentMessagesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       source_ = "";
-
-      if (payloadBuilder_ == null) {
-        payload_ = null;
-      } else {
-        payload_ = null;
+      payload_ = null;
+      if (payloadBuilder_ != null) {
+        payloadBuilder_.dispose();
         payloadBuilder_ = null;
       }
       if (outputContextsBuilder_ == null) {
@@ -876,11 +912,10 @@ public Builder clear() {
         outputContexts_ = null;
         outputContextsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
-      if (followupEventInputBuilder_ == null) {
-        followupEventInput_ = null;
-      } else {
-        followupEventInput_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      followupEventInput_ = null;
+      if (followupEventInputBuilder_ != null) {
+        followupEventInputBuilder_.dispose();
         followupEventInputBuilder_ = null;
       }
       if (sessionEntityTypesBuilder_ == null) {
@@ -889,7 +924,7 @@ public Builder clear() {
         sessionEntityTypes_ = null;
         sessionEntityTypesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000004);
+      bitField0_ = (bitField0_ & ~0x00000040);
       return this;
     }
 
@@ -917,48 +952,61 @@ public com.google.cloud.dialogflow.v2.WebhookResponse build() {
     public com.google.cloud.dialogflow.v2.WebhookResponse buildPartial() {
       com.google.cloud.dialogflow.v2.WebhookResponse result =
           new com.google.cloud.dialogflow.v2.WebhookResponse(this);
-      int from_bitField0_ = bitField0_;
-      result.fulfillmentText_ = fulfillmentText_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.cloud.dialogflow.v2.WebhookResponse result) {
       if (fulfillmentMessagesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           fulfillmentMessages_ = java.util.Collections.unmodifiableList(fulfillmentMessages_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.fulfillmentMessages_ = fulfillmentMessages_;
       } else {
         result.fulfillmentMessages_ = fulfillmentMessagesBuilder_.build();
       }
-      result.source_ = source_;
-      if (payloadBuilder_ == null) {
-        result.payload_ = payload_;
-      } else {
-        result.payload_ = payloadBuilder_.build();
-      }
       if (outputContextsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000010) != 0)) {
           outputContexts_ = java.util.Collections.unmodifiableList(outputContexts_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000010);
         }
         result.outputContexts_ = outputContexts_;
       } else {
         result.outputContexts_ = outputContextsBuilder_.build();
       }
-      if (followupEventInputBuilder_ == null) {
-        result.followupEventInput_ = followupEventInput_;
-      } else {
-        result.followupEventInput_ = followupEventInputBuilder_.build();
-      }
       if (sessionEntityTypesBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)) {
+        if (((bitField0_ & 0x00000040) != 0)) {
           sessionEntityTypes_ = java.util.Collections.unmodifiableList(sessionEntityTypes_);
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000040);
         }
         result.sessionEntityTypes_ = sessionEntityTypes_;
       } else {
         result.sessionEntityTypes_ = sessionEntityTypesBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2.WebhookResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.fulfillmentText_ = fulfillmentText_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.source_ = source_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.payload_ = payloadBuilder_ == null ? payload_ : payloadBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.followupEventInput_ =
+            followupEventInputBuilder_ == null
+                ? followupEventInput_
+                : followupEventInputBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -1008,13 +1056,14 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.WebhookResponse other) {
       if (other == com.google.cloud.dialogflow.v2.WebhookResponse.getDefaultInstance()) return this;
       if (!other.getFulfillmentText().isEmpty()) {
         fulfillmentText_ = other.fulfillmentText_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (fulfillmentMessagesBuilder_ == null) {
         if (!other.fulfillmentMessages_.isEmpty()) {
           if (fulfillmentMessages_.isEmpty()) {
             fulfillmentMessages_ = other.fulfillmentMessages_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureFulfillmentMessagesIsMutable();
             fulfillmentMessages_.addAll(other.fulfillmentMessages_);
@@ -1027,7 +1076,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.WebhookResponse other) {
             fulfillmentMessagesBuilder_.dispose();
             fulfillmentMessagesBuilder_ = null;
             fulfillmentMessages_ = other.fulfillmentMessages_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             fulfillmentMessagesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getFulfillmentMessagesFieldBuilder()
@@ -1039,6 +1088,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.WebhookResponse other) {
       }
       if (!other.getSource().isEmpty()) {
         source_ = other.source_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.hasPayload()) {
@@ -1048,7 +1098,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.WebhookResponse other) {
         if (!other.outputContexts_.isEmpty()) {
           if (outputContexts_.isEmpty()) {
             outputContexts_ = other.outputContexts_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
             ensureOutputContextsIsMutable();
             outputContexts_.addAll(other.outputContexts_);
@@ -1061,7 +1111,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.WebhookResponse other) {
             outputContextsBuilder_.dispose();
             outputContextsBuilder_ = null;
             outputContexts_ = other.outputContexts_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000010);
             outputContextsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getOutputContextsFieldBuilder()
@@ -1078,7 +1128,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.WebhookResponse other) {
         if (!other.sessionEntityTypes_.isEmpty()) {
           if (sessionEntityTypes_.isEmpty()) {
             sessionEntityTypes_ = other.sessionEntityTypes_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000040);
           } else {
             ensureSessionEntityTypesIsMutable();
             sessionEntityTypes_.addAll(other.sessionEntityTypes_);
@@ -1091,7 +1141,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.WebhookResponse other) {
             sessionEntityTypesBuilder_.dispose();
             sessionEntityTypesBuilder_ = null;
             sessionEntityTypes_ = other.sessionEntityTypes_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000040);
             sessionEntityTypesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getSessionEntityTypesFieldBuilder()
@@ -1130,7 +1180,7 @@ public Builder mergeFrom(
             case 10:
               {
                 fulfillmentText_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -1149,13 +1199,13 @@ public Builder mergeFrom(
             case 26:
               {
                 source_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(getPayloadFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 42:
@@ -1175,7 +1225,7 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getFollowupEventInputFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 50
             case 82:
@@ -1219,7 +1269,8 @@ public Builder mergeFrom(
      * Optional. The text response message intended for the end-user.
      * It is recommended to use `fulfillment_messages.text.text[0]` instead.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_text][google.cloud.dialogflow.v2.QueryResult.fulfillment_text] sent to the integration or API caller.
+     * [QueryResult.fulfillment_text][google.cloud.dialogflow.v2.QueryResult.fulfillment_text]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>string fulfillment_text = 1;</code>
@@ -1244,7 +1295,8 @@ public java.lang.String getFulfillmentText() {
      * Optional. The text response message intended for the end-user.
      * It is recommended to use `fulfillment_messages.text.text[0]` instead.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_text][google.cloud.dialogflow.v2.QueryResult.fulfillment_text] sent to the integration or API caller.
+     * [QueryResult.fulfillment_text][google.cloud.dialogflow.v2.QueryResult.fulfillment_text]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>string fulfillment_text = 1;</code>
@@ -1269,7 +1321,8 @@ public com.google.protobuf.ByteString getFulfillmentTextBytes() {
      * Optional. The text response message intended for the end-user.
      * It is recommended to use `fulfillment_messages.text.text[0]` instead.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_text][google.cloud.dialogflow.v2.QueryResult.fulfillment_text] sent to the integration or API caller.
+     * [QueryResult.fulfillment_text][google.cloud.dialogflow.v2.QueryResult.fulfillment_text]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>string fulfillment_text = 1;</code>
@@ -1281,8 +1334,8 @@ public Builder setFulfillmentText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       fulfillmentText_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1293,7 +1346,8 @@ public Builder setFulfillmentText(java.lang.String value) {
      * Optional. The text response message intended for the end-user.
      * It is recommended to use `fulfillment_messages.text.text[0]` instead.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_text][google.cloud.dialogflow.v2.QueryResult.fulfillment_text] sent to the integration or API caller.
+     * [QueryResult.fulfillment_text][google.cloud.dialogflow.v2.QueryResult.fulfillment_text]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>string fulfillment_text = 1;</code>
@@ -1301,8 +1355,8 @@ public Builder setFulfillmentText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFulfillmentText() {
-
       fulfillmentText_ = getDefaultInstance().getFulfillmentText();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1313,7 +1367,8 @@ public Builder clearFulfillmentText() {
      * Optional. The text response message intended for the end-user.
      * It is recommended to use `fulfillment_messages.text.text[0]` instead.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_text][google.cloud.dialogflow.v2.QueryResult.fulfillment_text] sent to the integration or API caller.
+     * [QueryResult.fulfillment_text][google.cloud.dialogflow.v2.QueryResult.fulfillment_text]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>string fulfillment_text = 1;</code>
@@ -1326,8 +1381,8 @@ public Builder setFulfillmentTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       fulfillmentText_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1336,11 +1391,11 @@ public Builder setFulfillmentTextBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureFulfillmentMessagesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         fulfillmentMessages_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.Intent.Message>(
                 fulfillmentMessages_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -1356,7 +1411,8 @@ private void ensureFulfillmentMessagesIsMutable() {
      * <pre>
      * Optional. The rich response messages intended for the end-user.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -1375,7 +1431,8 @@ private void ensureFulfillmentMessagesIsMutable() {
      * <pre>
      * Optional. The rich response messages intended for the end-user.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -1393,7 +1450,8 @@ public int getFulfillmentMessagesCount() {
      * <pre>
      * Optional. The rich response messages intended for the end-user.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -1411,7 +1469,8 @@ public com.google.cloud.dialogflow.v2.Intent.Message getFulfillmentMessages(int
      * <pre>
      * Optional. The rich response messages intended for the end-user.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -1436,7 +1495,8 @@ public Builder setFulfillmentMessages(
      * <pre>
      * Optional. The rich response messages intended for the end-user.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -1458,7 +1518,8 @@ public Builder setFulfillmentMessages(
      * <pre>
      * Optional. The rich response messages intended for the end-user.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -1482,7 +1543,8 @@ public Builder addFulfillmentMessages(com.google.cloud.dialogflow.v2.Intent.Mess
      * <pre>
      * Optional. The rich response messages intended for the end-user.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -1507,7 +1569,8 @@ public Builder addFulfillmentMessages(
      * <pre>
      * Optional. The rich response messages intended for the end-user.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -1529,7 +1592,8 @@ public Builder addFulfillmentMessages(
      * <pre>
      * Optional. The rich response messages intended for the end-user.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -1551,7 +1615,8 @@ public Builder addFulfillmentMessages(
      * <pre>
      * Optional. The rich response messages intended for the end-user.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -1573,7 +1638,8 @@ public Builder addAllFulfillmentMessages(
      * <pre>
      * Optional. The rich response messages intended for the end-user.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -1581,7 +1647,7 @@ public Builder addAllFulfillmentMessages(
     public Builder clearFulfillmentMessages() {
       if (fulfillmentMessagesBuilder_ == null) {
         fulfillmentMessages_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         fulfillmentMessagesBuilder_.clear();
@@ -1594,7 +1660,8 @@ public Builder clearFulfillmentMessages() {
      * <pre>
      * Optional. The rich response messages intended for the end-user.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -1615,7 +1682,8 @@ public Builder removeFulfillmentMessages(int index) {
      * <pre>
      * Optional. The rich response messages intended for the end-user.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -1630,7 +1698,8 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Builder getFulfillmentMessa
      * <pre>
      * Optional. The rich response messages intended for the end-user.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -1649,7 +1718,8 @@ public com.google.cloud.dialogflow.v2.Intent.MessageOrBuilder getFulfillmentMess
      * <pre>
      * Optional. The rich response messages intended for the end-user.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -1668,7 +1738,8 @@ public com.google.cloud.dialogflow.v2.Intent.MessageOrBuilder getFulfillmentMess
      * <pre>
      * Optional. The rich response messages intended for the end-user.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -1683,7 +1754,8 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Builder addFulfillmentMessa
      * <pre>
      * Optional. The rich response messages intended for the end-user.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -1699,7 +1771,8 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Builder addFulfillmentMessa
      * <pre>
      * Optional. The rich response messages intended for the end-user.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+     * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -1721,7 +1794,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Builder addFulfillmentMessa
                 com.google.cloud.dialogflow.v2.Intent.Message.Builder,
                 com.google.cloud.dialogflow.v2.Intent.MessageOrBuilder>(
                 fulfillmentMessages_,
-                ((bitField0_ & 0x00000001) != 0),
+                ((bitField0_ & 0x00000002) != 0),
                 getParentForChildren(),
                 isClean());
         fulfillmentMessages_ = null;
@@ -1737,7 +1810,8 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Builder addFulfillmentMessa
      * Optional. A custom field used to identify the webhook source.
      * Arbitrary strings are supported.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.webhook_source][google.cloud.dialogflow.v2.QueryResult.webhook_source] sent to the integration or API caller.
+     * [QueryResult.webhook_source][google.cloud.dialogflow.v2.QueryResult.webhook_source]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>string source = 3;</code>
@@ -1762,7 +1836,8 @@ public java.lang.String getSource() {
      * Optional. A custom field used to identify the webhook source.
      * Arbitrary strings are supported.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.webhook_source][google.cloud.dialogflow.v2.QueryResult.webhook_source] sent to the integration or API caller.
+     * [QueryResult.webhook_source][google.cloud.dialogflow.v2.QueryResult.webhook_source]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>string source = 3;</code>
@@ -1787,7 +1862,8 @@ public com.google.protobuf.ByteString getSourceBytes() {
      * Optional. A custom field used to identify the webhook source.
      * Arbitrary strings are supported.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.webhook_source][google.cloud.dialogflow.v2.QueryResult.webhook_source] sent to the integration or API caller.
+     * [QueryResult.webhook_source][google.cloud.dialogflow.v2.QueryResult.webhook_source]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>string source = 3;</code>
@@ -1799,8 +1875,8 @@ public Builder setSource(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       source_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1811,7 +1887,8 @@ public Builder setSource(java.lang.String value) {
      * Optional. A custom field used to identify the webhook source.
      * Arbitrary strings are supported.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.webhook_source][google.cloud.dialogflow.v2.QueryResult.webhook_source] sent to the integration or API caller.
+     * [QueryResult.webhook_source][google.cloud.dialogflow.v2.QueryResult.webhook_source]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>string source = 3;</code>
@@ -1819,8 +1896,8 @@ public Builder setSource(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSource() {
-
       source_ = getDefaultInstance().getSource();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1831,7 +1908,8 @@ public Builder clearSource() {
      * Optional. A custom field used to identify the webhook source.
      * Arbitrary strings are supported.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.webhook_source][google.cloud.dialogflow.v2.QueryResult.webhook_source] sent to the integration or API caller.
+     * [QueryResult.webhook_source][google.cloud.dialogflow.v2.QueryResult.webhook_source]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>string source = 3;</code>
@@ -1844,8 +1922,8 @@ public Builder setSourceBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       source_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1860,11 +1938,11 @@ public Builder setSourceBytes(com.google.protobuf.ByteString value) {
      *
      *
      * <pre>
-     * Optional. This field can be used to pass custom data from your webhook to the
-     * integration or API caller. Arbitrary JSON objects are supported.
-     * When provided, Dialogflow uses this field to populate
-     * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload] sent to the integration or API caller.
-     * This field is also used by the
+     * Optional. This field can be used to pass custom data from your webhook to
+     * the integration or API caller. Arbitrary JSON objects are supported. When
+     * provided, Dialogflow uses this field to populate
+     * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload]
+     * sent to the integration or API caller. This field is also used by the
      * [Google Assistant
      * integration](https://cloud.google.com/dialogflow/docs/integrations/aog)
      * for rich response messages.
@@ -1877,17 +1955,17 @@ public Builder setSourceBytes(com.google.protobuf.ByteString value) {
      * @return Whether the payload field is set.
      */
     public boolean hasPayload() {
-      return payloadBuilder_ != null || payload_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
      *
      * <pre>
-     * Optional. This field can be used to pass custom data from your webhook to the
-     * integration or API caller. Arbitrary JSON objects are supported.
-     * When provided, Dialogflow uses this field to populate
-     * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload] sent to the integration or API caller.
-     * This field is also used by the
+     * Optional. This field can be used to pass custom data from your webhook to
+     * the integration or API caller. Arbitrary JSON objects are supported. When
+     * provided, Dialogflow uses this field to populate
+     * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload]
+     * sent to the integration or API caller. This field is also used by the
      * [Google Assistant
      * integration](https://cloud.google.com/dialogflow/docs/integrations/aog)
      * for rich response messages.
@@ -1910,11 +1988,11 @@ public com.google.protobuf.Struct getPayload() {
      *
      *
      * <pre>
-     * Optional. This field can be used to pass custom data from your webhook to the
-     * integration or API caller. Arbitrary JSON objects are supported.
-     * When provided, Dialogflow uses this field to populate
-     * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload] sent to the integration or API caller.
-     * This field is also used by the
+     * Optional. This field can be used to pass custom data from your webhook to
+     * the integration or API caller. Arbitrary JSON objects are supported. When
+     * provided, Dialogflow uses this field to populate
+     * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload]
+     * sent to the integration or API caller. This field is also used by the
      * [Google Assistant
      * integration](https://cloud.google.com/dialogflow/docs/integrations/aog)
      * for rich response messages.
@@ -1930,22 +2008,22 @@ public Builder setPayload(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         payload_ = value;
-        onChanged();
       } else {
         payloadBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Optional. This field can be used to pass custom data from your webhook to the
-     * integration or API caller. Arbitrary JSON objects are supported.
-     * When provided, Dialogflow uses this field to populate
-     * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload] sent to the integration or API caller.
-     * This field is also used by the
+     * Optional. This field can be used to pass custom data from your webhook to
+     * the integration or API caller. Arbitrary JSON objects are supported. When
+     * provided, Dialogflow uses this field to populate
+     * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload]
+     * sent to the integration or API caller. This field is also used by the
      * [Google Assistant
      * integration](https://cloud.google.com/dialogflow/docs/integrations/aog)
      * for rich response messages.
@@ -1958,22 +2036,22 @@ public Builder setPayload(com.google.protobuf.Struct value) {
     public Builder setPayload(com.google.protobuf.Struct.Builder builderForValue) {
       if (payloadBuilder_ == null) {
         payload_ = builderForValue.build();
-        onChanged();
       } else {
         payloadBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Optional. This field can be used to pass custom data from your webhook to the
-     * integration or API caller. Arbitrary JSON objects are supported.
-     * When provided, Dialogflow uses this field to populate
-     * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload] sent to the integration or API caller.
-     * This field is also used by the
+     * Optional. This field can be used to pass custom data from your webhook to
+     * the integration or API caller. Arbitrary JSON objects are supported. When
+     * provided, Dialogflow uses this field to populate
+     * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload]
+     * sent to the integration or API caller. This field is also used by the
      * [Google Assistant
      * integration](https://cloud.google.com/dialogflow/docs/integrations/aog)
      * for rich response messages.
@@ -1985,28 +2063,29 @@ public Builder setPayload(com.google.protobuf.Struct.Builder builderForValue) {
      */
     public Builder mergePayload(com.google.protobuf.Struct value) {
       if (payloadBuilder_ == null) {
-        if (payload_ != null) {
-          payload_ =
-              com.google.protobuf.Struct.newBuilder(payload_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && payload_ != null
+            && payload_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getPayloadBuilder().mergeFrom(value);
         } else {
           payload_ = value;
         }
-        onChanged();
       } else {
         payloadBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Optional. This field can be used to pass custom data from your webhook to the
-     * integration or API caller. Arbitrary JSON objects are supported.
-     * When provided, Dialogflow uses this field to populate
-     * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload] sent to the integration or API caller.
-     * This field is also used by the
+     * Optional. This field can be used to pass custom data from your webhook to
+     * the integration or API caller. Arbitrary JSON objects are supported. When
+     * provided, Dialogflow uses this field to populate
+     * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload]
+     * sent to the integration or API caller. This field is also used by the
      * [Google Assistant
      * integration](https://cloud.google.com/dialogflow/docs/integrations/aog)
      * for rich response messages.
@@ -2017,25 +2096,24 @@ public Builder mergePayload(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct payload = 4;</code>
      */
     public Builder clearPayload() {
-      if (payloadBuilder_ == null) {
-        payload_ = null;
-        onChanged();
-      } else {
-        payload_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      payload_ = null;
+      if (payloadBuilder_ != null) {
+        payloadBuilder_.dispose();
         payloadBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
      *
      *
      * <pre>
-     * Optional. This field can be used to pass custom data from your webhook to the
-     * integration or API caller. Arbitrary JSON objects are supported.
-     * When provided, Dialogflow uses this field to populate
-     * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload] sent to the integration or API caller.
-     * This field is also used by the
+     * Optional. This field can be used to pass custom data from your webhook to
+     * the integration or API caller. Arbitrary JSON objects are supported. When
+     * provided, Dialogflow uses this field to populate
+     * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload]
+     * sent to the integration or API caller. This field is also used by the
      * [Google Assistant
      * integration](https://cloud.google.com/dialogflow/docs/integrations/aog)
      * for rich response messages.
@@ -2046,7 +2124,7 @@ public Builder clearPayload() {
      * <code>.google.protobuf.Struct payload = 4;</code>
      */
     public com.google.protobuf.Struct.Builder getPayloadBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getPayloadFieldBuilder().getBuilder();
     }
@@ -2054,11 +2132,11 @@ public com.google.protobuf.Struct.Builder getPayloadBuilder() {
      *
      *
      * <pre>
-     * Optional. This field can be used to pass custom data from your webhook to the
-     * integration or API caller. Arbitrary JSON objects are supported.
-     * When provided, Dialogflow uses this field to populate
-     * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload] sent to the integration or API caller.
-     * This field is also used by the
+     * Optional. This field can be used to pass custom data from your webhook to
+     * the integration or API caller. Arbitrary JSON objects are supported. When
+     * provided, Dialogflow uses this field to populate
+     * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload]
+     * sent to the integration or API caller. This field is also used by the
      * [Google Assistant
      * integration](https://cloud.google.com/dialogflow/docs/integrations/aog)
      * for rich response messages.
@@ -2079,11 +2157,11 @@ public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() {
      *
      *
      * <pre>
-     * Optional. This field can be used to pass custom data from your webhook to the
-     * integration or API caller. Arbitrary JSON objects are supported.
-     * When provided, Dialogflow uses this field to populate
-     * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload] sent to the integration or API caller.
-     * This field is also used by the
+     * Optional. This field can be used to pass custom data from your webhook to
+     * the integration or API caller. Arbitrary JSON objects are supported. When
+     * provided, Dialogflow uses this field to populate
+     * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload]
+     * sent to the integration or API caller. This field is also used by the
      * [Google Assistant
      * integration](https://cloud.google.com/dialogflow/docs/integrations/aog)
      * for rich response messages.
@@ -2114,10 +2192,10 @@ public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() {
         java.util.Collections.emptyList();
 
     private void ensureOutputContextsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         outputContexts_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.Context>(outputContexts_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000010;
       }
     }
 
@@ -2134,7 +2212,8 @@ private void ensureOutputContextsIsMutable() {
      * Optional. The collection of output contexts that will overwrite currently
      * active contexts for the session and reset their lifespans.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -2153,7 +2232,8 @@ public java.util.List<com.google.cloud.dialogflow.v2.Context> getOutputContextsL
      * Optional. The collection of output contexts that will overwrite currently
      * active contexts for the session and reset their lifespans.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -2172,7 +2252,8 @@ public int getOutputContextsCount() {
      * Optional. The collection of output contexts that will overwrite currently
      * active contexts for the session and reset their lifespans.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -2191,7 +2272,8 @@ public com.google.cloud.dialogflow.v2.Context getOutputContexts(int index) {
      * Optional. The collection of output contexts that will overwrite currently
      * active contexts for the session and reset their lifespans.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -2216,7 +2298,8 @@ public Builder setOutputContexts(int index, com.google.cloud.dialogflow.v2.Conte
      * Optional. The collection of output contexts that will overwrite currently
      * active contexts for the session and reset their lifespans.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -2239,7 +2322,8 @@ public Builder setOutputContexts(
      * Optional. The collection of output contexts that will overwrite currently
      * active contexts for the session and reset their lifespans.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -2264,7 +2348,8 @@ public Builder addOutputContexts(com.google.cloud.dialogflow.v2.Context value) {
      * Optional. The collection of output contexts that will overwrite currently
      * active contexts for the session and reset their lifespans.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -2289,7 +2374,8 @@ public Builder addOutputContexts(int index, com.google.cloud.dialogflow.v2.Conte
      * Optional. The collection of output contexts that will overwrite currently
      * active contexts for the session and reset their lifespans.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -2312,7 +2398,8 @@ public Builder addOutputContexts(
      * Optional. The collection of output contexts that will overwrite currently
      * active contexts for the session and reset their lifespans.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -2335,7 +2422,8 @@ public Builder addOutputContexts(
      * Optional. The collection of output contexts that will overwrite currently
      * active contexts for the session and reset their lifespans.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -2358,7 +2446,8 @@ public Builder addAllOutputContexts(
      * Optional. The collection of output contexts that will overwrite currently
      * active contexts for the session and reset their lifespans.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -2366,7 +2455,7 @@ public Builder addAllOutputContexts(
     public Builder clearOutputContexts() {
       if (outputContextsBuilder_ == null) {
         outputContexts_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
       } else {
         outputContextsBuilder_.clear();
@@ -2380,7 +2469,8 @@ public Builder clearOutputContexts() {
      * Optional. The collection of output contexts that will overwrite currently
      * active contexts for the session and reset their lifespans.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -2402,7 +2492,8 @@ public Builder removeOutputContexts(int index) {
      * Optional. The collection of output contexts that will overwrite currently
      * active contexts for the session and reset their lifespans.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -2417,7 +2508,8 @@ public com.google.cloud.dialogflow.v2.Context.Builder getOutputContextsBuilder(i
      * Optional. The collection of output contexts that will overwrite currently
      * active contexts for the session and reset their lifespans.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -2436,7 +2528,8 @@ public com.google.cloud.dialogflow.v2.ContextOrBuilder getOutputContextsOrBuilde
      * Optional. The collection of output contexts that will overwrite currently
      * active contexts for the session and reset their lifespans.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -2456,7 +2549,8 @@ public com.google.cloud.dialogflow.v2.ContextOrBuilder getOutputContextsOrBuilde
      * Optional. The collection of output contexts that will overwrite currently
      * active contexts for the session and reset their lifespans.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -2472,7 +2566,8 @@ public com.google.cloud.dialogflow.v2.Context.Builder addOutputContextsBuilder()
      * Optional. The collection of output contexts that will overwrite currently
      * active contexts for the session and reset their lifespans.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -2488,7 +2583,8 @@ public com.google.cloud.dialogflow.v2.Context.Builder addOutputContextsBuilder(i
      * Optional. The collection of output contexts that will overwrite currently
      * active contexts for the session and reset their lifespans.
      * When provided, Dialogflow uses this field to populate
-     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+     * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+     * sent to the integration or API caller.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -2510,7 +2606,7 @@ public com.google.cloud.dialogflow.v2.Context.Builder addOutputContextsBuilder(i
                 com.google.cloud.dialogflow.v2.Context.Builder,
                 com.google.cloud.dialogflow.v2.ContextOrBuilder>(
                 outputContexts_,
-                ((bitField0_ & 0x00000002) != 0),
+                ((bitField0_ & 0x00000010) != 0),
                 getParentForChildren(),
                 isClean());
         outputContexts_ = null;
@@ -2538,7 +2634,7 @@ public com.google.cloud.dialogflow.v2.Context.Builder addOutputContextsBuilder(i
      * @return Whether the followupEventInput field is set.
      */
     public boolean hasFollowupEventInput() {
-      return followupEventInputBuilder_ != null || followupEventInput_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -2579,11 +2675,11 @@ public Builder setFollowupEventInput(com.google.cloud.dialogflow.v2.EventInput v
           throw new NullPointerException();
         }
         followupEventInput_ = value;
-        onChanged();
       } else {
         followupEventInputBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2601,11 +2697,11 @@ public Builder setFollowupEventInput(
         com.google.cloud.dialogflow.v2.EventInput.Builder builderForValue) {
       if (followupEventInputBuilder_ == null) {
         followupEventInput_ = builderForValue.build();
-        onChanged();
       } else {
         followupEventInputBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2621,19 +2717,19 @@ public Builder setFollowupEventInput(
      */
     public Builder mergeFollowupEventInput(com.google.cloud.dialogflow.v2.EventInput value) {
       if (followupEventInputBuilder_ == null) {
-        if (followupEventInput_ != null) {
-          followupEventInput_ =
-              com.google.cloud.dialogflow.v2.EventInput.newBuilder(followupEventInput_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && followupEventInput_ != null
+            && followupEventInput_
+                != com.google.cloud.dialogflow.v2.EventInput.getDefaultInstance()) {
+          getFollowupEventInputBuilder().mergeFrom(value);
         } else {
           followupEventInput_ = value;
         }
-        onChanged();
       } else {
         followupEventInputBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2648,14 +2744,13 @@ public Builder mergeFollowupEventInput(com.google.cloud.dialogflow.v2.EventInput
      * <code>.google.cloud.dialogflow.v2.EventInput followup_event_input = 6;</code>
      */
     public Builder clearFollowupEventInput() {
-      if (followupEventInputBuilder_ == null) {
-        followupEventInput_ = null;
-        onChanged();
-      } else {
-        followupEventInput_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      followupEventInput_ = null;
+      if (followupEventInputBuilder_ != null) {
+        followupEventInputBuilder_.dispose();
         followupEventInputBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2670,7 +2765,7 @@ public Builder clearFollowupEventInput() {
      * <code>.google.cloud.dialogflow.v2.EventInput followup_event_input = 6;</code>
      */
     public com.google.cloud.dialogflow.v2.EventInput.Builder getFollowupEventInputBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getFollowupEventInputFieldBuilder().getBuilder();
     }
@@ -2726,11 +2821,11 @@ public com.google.cloud.dialogflow.v2.EventInputOrBuilder getFollowupEventInputO
         java.util.Collections.emptyList();
 
     private void ensureSessionEntityTypesIsMutable() {
-      if (!((bitField0_ & 0x00000004) != 0)) {
+      if (!((bitField0_ & 0x00000040) != 0)) {
         sessionEntityTypes_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2.SessionEntityType>(
                 sessionEntityTypes_);
-        bitField0_ |= 0x00000004;
+        bitField0_ |= 0x00000040;
       }
     }
 
@@ -2748,7 +2843,9 @@ private void ensureSessionEntityTypesIsMutable() {
      * entity types with. The entity synonyms apply to all languages and persist
      * for the session. Setting this data from a webhook overwrites
      * the session entity types that have been set using `detectIntent`,
-     * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+     * `streamingDetectIntent` or
+     * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+     * management methods.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;
@@ -2770,7 +2867,9 @@ private void ensureSessionEntityTypesIsMutable() {
      * entity types with. The entity synonyms apply to all languages and persist
      * for the session. Setting this data from a webhook overwrites
      * the session entity types that have been set using `detectIntent`,
-     * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+     * `streamingDetectIntent` or
+     * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+     * management methods.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;
@@ -2791,7 +2890,9 @@ public int getSessionEntityTypesCount() {
      * entity types with. The entity synonyms apply to all languages and persist
      * for the session. Setting this data from a webhook overwrites
      * the session entity types that have been set using `detectIntent`,
-     * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+     * `streamingDetectIntent` or
+     * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+     * management methods.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;
@@ -2812,7 +2913,9 @@ public com.google.cloud.dialogflow.v2.SessionEntityType getSessionEntityTypes(in
      * entity types with. The entity synonyms apply to all languages and persist
      * for the session. Setting this data from a webhook overwrites
      * the session entity types that have been set using `detectIntent`,
-     * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+     * `streamingDetectIntent` or
+     * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+     * management methods.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;
@@ -2840,7 +2943,9 @@ public Builder setSessionEntityTypes(
      * entity types with. The entity synonyms apply to all languages and persist
      * for the session. Setting this data from a webhook overwrites
      * the session entity types that have been set using `detectIntent`,
-     * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+     * `streamingDetectIntent` or
+     * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+     * management methods.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;
@@ -2865,7 +2970,9 @@ public Builder setSessionEntityTypes(
      * entity types with. The entity synonyms apply to all languages and persist
      * for the session. Setting this data from a webhook overwrites
      * the session entity types that have been set using `detectIntent`,
-     * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+     * `streamingDetectIntent` or
+     * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+     * management methods.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;
@@ -2892,7 +2999,9 @@ public Builder addSessionEntityTypes(com.google.cloud.dialogflow.v2.SessionEntit
      * entity types with. The entity synonyms apply to all languages and persist
      * for the session. Setting this data from a webhook overwrites
      * the session entity types that have been set using `detectIntent`,
-     * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+     * `streamingDetectIntent` or
+     * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+     * management methods.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;
@@ -2920,7 +3029,9 @@ public Builder addSessionEntityTypes(
      * entity types with. The entity synonyms apply to all languages and persist
      * for the session. Setting this data from a webhook overwrites
      * the session entity types that have been set using `detectIntent`,
-     * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+     * `streamingDetectIntent` or
+     * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+     * management methods.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;
@@ -2945,7 +3056,9 @@ public Builder addSessionEntityTypes(
      * entity types with. The entity synonyms apply to all languages and persist
      * for the session. Setting this data from a webhook overwrites
      * the session entity types that have been set using `detectIntent`,
-     * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+     * `streamingDetectIntent` or
+     * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+     * management methods.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;
@@ -2970,7 +3083,9 @@ public Builder addSessionEntityTypes(
      * entity types with. The entity synonyms apply to all languages and persist
      * for the session. Setting this data from a webhook overwrites
      * the session entity types that have been set using `detectIntent`,
-     * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+     * `streamingDetectIntent` or
+     * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+     * management methods.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;
@@ -2995,7 +3110,9 @@ public Builder addAllSessionEntityTypes(
      * entity types with. The entity synonyms apply to all languages and persist
      * for the session. Setting this data from a webhook overwrites
      * the session entity types that have been set using `detectIntent`,
-     * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+     * `streamingDetectIntent` or
+     * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+     * management methods.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;
@@ -3004,7 +3121,7 @@ public Builder addAllSessionEntityTypes(
     public Builder clearSessionEntityTypes() {
       if (sessionEntityTypesBuilder_ == null) {
         sessionEntityTypes_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000040);
         onChanged();
       } else {
         sessionEntityTypesBuilder_.clear();
@@ -3019,7 +3136,9 @@ public Builder clearSessionEntityTypes() {
      * entity types with. The entity synonyms apply to all languages and persist
      * for the session. Setting this data from a webhook overwrites
      * the session entity types that have been set using `detectIntent`,
-     * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+     * `streamingDetectIntent` or
+     * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+     * management methods.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;
@@ -3043,7 +3162,9 @@ public Builder removeSessionEntityTypes(int index) {
      * entity types with. The entity synonyms apply to all languages and persist
      * for the session. Setting this data from a webhook overwrites
      * the session entity types that have been set using `detectIntent`,
-     * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+     * `streamingDetectIntent` or
+     * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+     * management methods.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;
@@ -3061,7 +3182,9 @@ public com.google.cloud.dialogflow.v2.SessionEntityType.Builder getSessionEntity
      * entity types with. The entity synonyms apply to all languages and persist
      * for the session. Setting this data from a webhook overwrites
      * the session entity types that have been set using `detectIntent`,
-     * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+     * `streamingDetectIntent` or
+     * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+     * management methods.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;
@@ -3083,7 +3206,9 @@ public com.google.cloud.dialogflow.v2.SessionEntityTypeOrBuilder getSessionEntit
      * entity types with. The entity synonyms apply to all languages and persist
      * for the session. Setting this data from a webhook overwrites
      * the session entity types that have been set using `detectIntent`,
-     * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+     * `streamingDetectIntent` or
+     * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+     * management methods.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;
@@ -3105,7 +3230,9 @@ public com.google.cloud.dialogflow.v2.SessionEntityTypeOrBuilder getSessionEntit
      * entity types with. The entity synonyms apply to all languages and persist
      * for the session. Setting this data from a webhook overwrites
      * the session entity types that have been set using `detectIntent`,
-     * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+     * `streamingDetectIntent` or
+     * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+     * management methods.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;
@@ -3123,7 +3250,9 @@ public com.google.cloud.dialogflow.v2.SessionEntityType.Builder addSessionEntity
      * entity types with. The entity synonyms apply to all languages and persist
      * for the session. Setting this data from a webhook overwrites
      * the session entity types that have been set using `detectIntent`,
-     * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+     * `streamingDetectIntent` or
+     * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+     * management methods.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;
@@ -3142,7 +3271,9 @@ public com.google.cloud.dialogflow.v2.SessionEntityType.Builder addSessionEntity
      * entity types with. The entity synonyms apply to all languages and persist
      * for the session. Setting this data from a webhook overwrites
      * the session entity types that have been set using `detectIntent`,
-     * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+     * `streamingDetectIntent` or
+     * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+     * management methods.
      * </pre>
      *
      * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;
@@ -3165,7 +3296,7 @@ public com.google.cloud.dialogflow.v2.SessionEntityType.Builder addSessionEntity
                 com.google.cloud.dialogflow.v2.SessionEntityType.Builder,
                 com.google.cloud.dialogflow.v2.SessionEntityTypeOrBuilder>(
                 sessionEntityTypes_,
-                ((bitField0_ & 0x00000004) != 0),
+                ((bitField0_ & 0x00000040) != 0),
                 getParentForChildren(),
                 isClean());
         sessionEntityTypes_ = null;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookResponseOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookResponseOrBuilder.java
index 7ad5d980f151..c9faccdfe61e 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookResponseOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookResponseOrBuilder.java
@@ -30,7 +30,8 @@ public interface WebhookResponseOrBuilder
    * Optional. The text response message intended for the end-user.
    * It is recommended to use `fulfillment_messages.text.text[0]` instead.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.fulfillment_text][google.cloud.dialogflow.v2.QueryResult.fulfillment_text] sent to the integration or API caller.
+   * [QueryResult.fulfillment_text][google.cloud.dialogflow.v2.QueryResult.fulfillment_text]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>string fulfillment_text = 1;</code>
@@ -45,7 +46,8 @@ public interface WebhookResponseOrBuilder
    * Optional. The text response message intended for the end-user.
    * It is recommended to use `fulfillment_messages.text.text[0]` instead.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.fulfillment_text][google.cloud.dialogflow.v2.QueryResult.fulfillment_text] sent to the integration or API caller.
+   * [QueryResult.fulfillment_text][google.cloud.dialogflow.v2.QueryResult.fulfillment_text]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>string fulfillment_text = 1;</code>
@@ -60,7 +62,8 @@ public interface WebhookResponseOrBuilder
    * <pre>
    * Optional. The rich response messages intended for the end-user.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+   * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -72,7 +75,8 @@ public interface WebhookResponseOrBuilder
    * <pre>
    * Optional. The rich response messages intended for the end-user.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+   * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -84,7 +88,8 @@ public interface WebhookResponseOrBuilder
    * <pre>
    * Optional. The rich response messages intended for the end-user.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+   * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -96,7 +101,8 @@ public interface WebhookResponseOrBuilder
    * <pre>
    * Optional. The rich response messages intended for the end-user.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+   * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -109,7 +115,8 @@ public interface WebhookResponseOrBuilder
    * <pre>
    * Optional. The rich response messages intended for the end-user.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+   * [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.Intent.Message fulfillment_messages = 2;</code>
@@ -123,7 +130,8 @@ public interface WebhookResponseOrBuilder
    * Optional. A custom field used to identify the webhook source.
    * Arbitrary strings are supported.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.webhook_source][google.cloud.dialogflow.v2.QueryResult.webhook_source] sent to the integration or API caller.
+   * [QueryResult.webhook_source][google.cloud.dialogflow.v2.QueryResult.webhook_source]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>string source = 3;</code>
@@ -138,7 +146,8 @@ public interface WebhookResponseOrBuilder
    * Optional. A custom field used to identify the webhook source.
    * Arbitrary strings are supported.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.webhook_source][google.cloud.dialogflow.v2.QueryResult.webhook_source] sent to the integration or API caller.
+   * [QueryResult.webhook_source][google.cloud.dialogflow.v2.QueryResult.webhook_source]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>string source = 3;</code>
@@ -151,11 +160,11 @@ public interface WebhookResponseOrBuilder
    *
    *
    * <pre>
-   * Optional. This field can be used to pass custom data from your webhook to the
-   * integration or API caller. Arbitrary JSON objects are supported.
-   * When provided, Dialogflow uses this field to populate
-   * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload] sent to the integration or API caller.
-   * This field is also used by the
+   * Optional. This field can be used to pass custom data from your webhook to
+   * the integration or API caller. Arbitrary JSON objects are supported. When
+   * provided, Dialogflow uses this field to populate
+   * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload]
+   * sent to the integration or API caller. This field is also used by the
    * [Google Assistant
    * integration](https://cloud.google.com/dialogflow/docs/integrations/aog)
    * for rich response messages.
@@ -172,11 +181,11 @@ public interface WebhookResponseOrBuilder
    *
    *
    * <pre>
-   * Optional. This field can be used to pass custom data from your webhook to the
-   * integration or API caller. Arbitrary JSON objects are supported.
-   * When provided, Dialogflow uses this field to populate
-   * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload] sent to the integration or API caller.
-   * This field is also used by the
+   * Optional. This field can be used to pass custom data from your webhook to
+   * the integration or API caller. Arbitrary JSON objects are supported. When
+   * provided, Dialogflow uses this field to populate
+   * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload]
+   * sent to the integration or API caller. This field is also used by the
    * [Google Assistant
    * integration](https://cloud.google.com/dialogflow/docs/integrations/aog)
    * for rich response messages.
@@ -193,11 +202,11 @@ public interface WebhookResponseOrBuilder
    *
    *
    * <pre>
-   * Optional. This field can be used to pass custom data from your webhook to the
-   * integration or API caller. Arbitrary JSON objects are supported.
-   * When provided, Dialogflow uses this field to populate
-   * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload] sent to the integration or API caller.
-   * This field is also used by the
+   * Optional. This field can be used to pass custom data from your webhook to
+   * the integration or API caller. Arbitrary JSON objects are supported. When
+   * provided, Dialogflow uses this field to populate
+   * [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload]
+   * sent to the integration or API caller. This field is also used by the
    * [Google Assistant
    * integration](https://cloud.google.com/dialogflow/docs/integrations/aog)
    * for rich response messages.
@@ -216,7 +225,8 @@ public interface WebhookResponseOrBuilder
    * Optional. The collection of output contexts that will overwrite currently
    * active contexts for the session and reset their lifespans.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+   * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -229,7 +239,8 @@ public interface WebhookResponseOrBuilder
    * Optional. The collection of output contexts that will overwrite currently
    * active contexts for the session and reset their lifespans.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+   * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -242,7 +253,8 @@ public interface WebhookResponseOrBuilder
    * Optional. The collection of output contexts that will overwrite currently
    * active contexts for the session and reset their lifespans.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+   * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -255,7 +267,8 @@ public interface WebhookResponseOrBuilder
    * Optional. The collection of output contexts that will overwrite currently
    * active contexts for the session and reset their lifespans.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+   * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -269,7 +282,8 @@ public interface WebhookResponseOrBuilder
    * Optional. The collection of output contexts that will overwrite currently
    * active contexts for the session and reset their lifespans.
    * When provided, Dialogflow uses this field to populate
-   * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+   * [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+   * sent to the integration or API caller.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.Context output_contexts = 5;</code>
@@ -325,7 +339,9 @@ public interface WebhookResponseOrBuilder
    * entity types with. The entity synonyms apply to all languages and persist
    * for the session. Setting this data from a webhook overwrites
    * the session entity types that have been set using `detectIntent`,
-   * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+   * `streamingDetectIntent` or
+   * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+   * management methods.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;</code>
@@ -339,7 +355,9 @@ public interface WebhookResponseOrBuilder
    * entity types with. The entity synonyms apply to all languages and persist
    * for the session. Setting this data from a webhook overwrites
    * the session entity types that have been set using `detectIntent`,
-   * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+   * `streamingDetectIntent` or
+   * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+   * management methods.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;</code>
@@ -353,7 +371,9 @@ public interface WebhookResponseOrBuilder
    * entity types with. The entity synonyms apply to all languages and persist
    * for the session. Setting this data from a webhook overwrites
    * the session entity types that have been set using `detectIntent`,
-   * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+   * `streamingDetectIntent` or
+   * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+   * management methods.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;</code>
@@ -367,7 +387,9 @@ public interface WebhookResponseOrBuilder
    * entity types with. The entity synonyms apply to all languages and persist
    * for the session. Setting this data from a webhook overwrites
    * the session entity types that have been set using `detectIntent`,
-   * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+   * `streamingDetectIntent` or
+   * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+   * management methods.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;</code>
@@ -382,7 +404,9 @@ public interface WebhookResponseOrBuilder
    * entity types with. The entity synonyms apply to all languages and persist
    * for the session. Setting this data from a webhook overwrites
    * the session entity types that have been set using `detectIntent`,
-   * `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+   * `streamingDetectIntent` or
+   * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+   * management methods.
    * </pre>
    *
    * <code>repeated .google.cloud.dialogflow.v2.SessionEntityType session_entity_types = 10;</code>
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/agent.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/agent.proto
index fa16a4c2af2d..df767631b180 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/agent.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/agent.proto
@@ -27,7 +27,7 @@ import "google/protobuf/field_mask.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "AgentProto";
 option java_package = "com.google.cloud.dialogflow.v2";
@@ -44,9 +44,7 @@ service Agents {
   rpc GetAgent(GetAgentRequest) returns (Agent) {
     option (google.api.http) = {
       get: "/v2/{parent=projects/*}/agent"
-      additional_bindings {
-        get: "/v2/{parent=projects/*/locations/*}/agent"
-      }
+      additional_bindings { get: "/v2/{parent=projects/*/locations/*}/agent" }
     };
     option (google.api.method_signature) = "parent";
   }
@@ -134,7 +132,8 @@ service Agents {
   //
   // - `metadata`: An empty [Struct
   //   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#struct)
-  // - `response`: [ExportAgentResponse][google.cloud.dialogflow.v2.ExportAgentResponse]
+  // - `response`:
+  // [ExportAgentResponse][google.cloud.dialogflow.v2.ExportAgentResponse]
   rpc ExportAgent(ExportAgentRequest) returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{parent=projects/*}/agent:export"
@@ -155,11 +154,13 @@ service Agents {
   //
   // Uploads new intents and entity types without deleting the existing ones.
   // Intents and entity types with the same name are replaced with the new
-  // versions from [ImportAgentRequest][google.cloud.dialogflow.v2.ImportAgentRequest]. After the import, the imported draft
-  // agent will be trained automatically (unless disabled in agent settings).
-  // However, once the import is done, training may not be completed yet. Please
-  // call [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the operation it returns in order to train
-  // explicitly.
+  // versions from
+  // [ImportAgentRequest][google.cloud.dialogflow.v2.ImportAgentRequest]. After
+  // the import, the imported draft agent will be trained automatically (unless
+  // disabled in agent settings). However, once the import is done, training may
+  // not be completed yet. Please call
+  // [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the
+  // operation it returns in order to train explicitly.
   //
   // This method is a [long-running
   // operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
@@ -197,8 +198,9 @@ service Agents {
   // entity types in the older version are deleted. After the restore, the
   // restored draft agent will be trained automatically (unless disabled in
   // agent settings). However, once the restore is done, training may not be
-  // completed yet. Please call [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the operation it
-  // returns in order to train explicitly.
+  // completed yet. Please call
+  // [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the
+  // operation it returns in order to train explicitly.
   //
   // This method is a [long-running
   // operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
@@ -232,7 +234,8 @@ service Agents {
 
   // Gets agent validation result. Agent validation is performed during
   // training time and is updated automatically when training is completed.
-  rpc GetValidationResult(GetValidationResultRequest) returns (ValidationResult) {
+  rpc GetValidationResult(GetValidationResultRequest)
+      returns (ValidationResult) {
     option (google.api.http) = {
       get: "/v2/{parent=projects/*}/agent/validationResult"
       additional_bindings {
@@ -325,7 +328,8 @@ message Agent {
 
   // Optional. The list of all languages supported by this agent (except for the
   // `default_language_code`).
-  repeated string supported_language_codes = 4 [(google.api.field_behavior) = OPTIONAL];
+  repeated string supported_language_codes = 4
+      [(google.api.field_behavior) = OPTIONAL];
 
   // Required. The time zone of this agent from the
   // [time zone database](https://www.iana.org/time-zones), e.g.,
@@ -347,10 +351,8 @@ message Agent {
   bool enable_logging = 8 [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. Determines how intents are detected from user queries.
-  MatchMode match_mode = 9 [
-    deprecated = true,
-    (google.api.field_behavior) = OPTIONAL
-  ];
+  MatchMode match_mode = 9
+      [deprecated = true, (google.api.field_behavior) = OPTIONAL];
 
   // Optional. To filter out false positive results and still get variety in
   // matched natural language inputs for your agent, you can tune the machine
@@ -371,7 +373,8 @@ message Agent {
   Tier tier = 15 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The request message for [Agents.GetAgent][google.cloud.dialogflow.v2.Agents.GetAgent].
+// The request message for
+// [Agents.GetAgent][google.cloud.dialogflow.v2.Agents.GetAgent].
 message GetAgentRequest {
   // Required. The project that the agent to fetch is associated with.
   // Format: `projects/<Project ID>`.
@@ -383,16 +386,19 @@ message GetAgentRequest {
   ];
 }
 
-// The request message for [Agents.SetAgent][google.cloud.dialogflow.v2.Agents.SetAgent].
+// The request message for
+// [Agents.SetAgent][google.cloud.dialogflow.v2.Agents.SetAgent].
 message SetAgentRequest {
   // Required. The agent to update.
   Agent agent = 1 [(google.api.field_behavior) = REQUIRED];
 
   // Optional. The mask to control which fields get updated.
-  google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = OPTIONAL];
+  google.protobuf.FieldMask update_mask = 2
+      [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The request message for [Agents.DeleteAgent][google.cloud.dialogflow.v2.Agents.DeleteAgent].
+// The request message for
+// [Agents.DeleteAgent][google.cloud.dialogflow.v2.Agents.DeleteAgent].
 message DeleteAgentRequest {
   // Required. The project that the agent to delete is associated with.
   // Format: `projects/<Project ID>`.
@@ -404,7 +410,8 @@ message DeleteAgentRequest {
   ];
 }
 
-// The request message for [Agents.SearchAgents][google.cloud.dialogflow.v2.Agents.SearchAgents].
+// The request message for
+// [Agents.SearchAgents][google.cloud.dialogflow.v2.Agents.SearchAgents].
 message SearchAgentsRequest {
   // Required. The project to list agents from.
   // Format: `projects/<Project ID or '-'>`.
@@ -423,7 +430,8 @@ message SearchAgentsRequest {
   string page_token = 3;
 }
 
-// The response message for [Agents.SearchAgents][google.cloud.dialogflow.v2.Agents.SearchAgents].
+// The response message for
+// [Agents.SearchAgents][google.cloud.dialogflow.v2.Agents.SearchAgents].
 message SearchAgentsResponse {
   // The list of agents. There will be a maximum number of items returned based
   // on the page_size field in the request.
@@ -434,7 +442,8 @@ message SearchAgentsResponse {
   string next_page_token = 2;
 }
 
-// The request message for [Agents.TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent].
+// The request message for
+// [Agents.TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent].
 message TrainAgentRequest {
   // Required. The project that the agent to train is associated with.
   // Format: `projects/<Project ID>`.
@@ -446,7 +455,8 @@ message TrainAgentRequest {
   ];
 }
 
-// The request message for [Agents.ExportAgent][google.cloud.dialogflow.v2.Agents.ExportAgent].
+// The request message for
+// [Agents.ExportAgent][google.cloud.dialogflow.v2.Agents.ExportAgent].
 message ExportAgentRequest {
   // Required. The project that the agent to export is associated with.
   // Format: `projects/<Project ID>`.
@@ -457,10 +467,10 @@ message ExportAgentRequest {
     }
   ];
 
-  // Required. The [Google Cloud Storage](https://cloud.google.com/storage/docs/)
-  // URI to export the agent to.
-  // The format of this URI must be `gs://<bucket-name>/<object-name>`.
-  // If left unspecified, the serialized agent is returned inline.
+  // Required. The [Google Cloud
+  // Storage](https://cloud.google.com/storage/docs/) URI to export the agent
+  // to. The format of this URI must be `gs://<bucket-name>/<object-name>`. If
+  // left unspecified, the serialized agent is returned inline.
   //
   // Dialogflow performs a write operation for the Cloud Storage object
   // on the caller's behalf, so your request authentication must
@@ -470,7 +480,8 @@ message ExportAgentRequest {
   string agent_uri = 2 [(google.api.field_behavior) = REQUIRED];
 }
 
-// The response message for [Agents.ExportAgent][google.cloud.dialogflow.v2.Agents.ExportAgent].
+// The response message for
+// [Agents.ExportAgent][google.cloud.dialogflow.v2.Agents.ExportAgent].
 message ExportAgentResponse {
   // The exported agent.
   oneof agent {
@@ -483,7 +494,8 @@ message ExportAgentResponse {
   }
 }
 
-// The request message for [Agents.ImportAgent][google.cloud.dialogflow.v2.Agents.ImportAgent].
+// The request message for
+// [Agents.ImportAgent][google.cloud.dialogflow.v2.Agents.ImportAgent].
 message ImportAgentRequest {
   // Required. The project that the agent to import is associated with.
   // Format: `projects/<Project ID>`.
@@ -511,7 +523,8 @@ message ImportAgentRequest {
   }
 }
 
-// The request message for [Agents.RestoreAgent][google.cloud.dialogflow.v2.Agents.RestoreAgent].
+// The request message for
+// [Agents.RestoreAgent][google.cloud.dialogflow.v2.Agents.RestoreAgent].
 message RestoreAgentRequest {
   // Required. The project that the agent to restore is associated with.
   // Format: `projects/<Project ID>`.
@@ -539,7 +552,8 @@ message RestoreAgentRequest {
   }
 }
 
-// The request message for [Agents.GetValidationResult][google.cloud.dialogflow.v2.Agents.GetValidationResult].
+// The request message for
+// [Agents.GetValidationResult][google.cloud.dialogflow.v2.Agents.GetValidationResult].
 message GetValidationResultRequest {
   // Required. The project that the agent is associated with.
   // Format: `projects/<Project ID>`.
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/answer_record.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/answer_record.proto
index 14ab41e15ad2..0eb5216a8c5f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/answer_record.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/answer_record.proto
@@ -26,13 +26,14 @@ import "google/protobuf/timestamp.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "AnswerRecordsProto";
 option java_package = "com.google.cloud.dialogflow.v2";
 option objc_class_prefix = "DF";
 
-// Service for managing [AnswerRecords][google.cloud.dialogflow.v2.AnswerRecord].
+// Service for managing
+// [AnswerRecords][google.cloud.dialogflow.v2.AnswerRecord].
 service AnswerRecords {
   option (google.api.default_host) = "dialogflow.googleapis.com";
   option (google.api.oauth_scopes) =
@@ -41,7 +42,8 @@ service AnswerRecords {
 
   // Returns the list of all answer records in the specified project in reverse
   // chronological order.
-  rpc ListAnswerRecords(ListAnswerRecordsRequest) returns (ListAnswerRecordsResponse) {
+  rpc ListAnswerRecords(ListAnswerRecordsRequest)
+      returns (ListAnswerRecordsResponse) {
     option (google.api.http) = {
       get: "/v2/{parent=projects/*}/answerRecords"
       additional_bindings {
@@ -86,9 +88,11 @@ service AnswerRecords {
 // A typical workflow for customers provide feedback to an answer is:
 //
 // 1. For human agent assistant, customers get suggestion via ListSuggestions
-//    API. Together with the answers, [AnswerRecord.name][google.cloud.dialogflow.v2.AnswerRecord.name] are returned to the
-//    customers.
-// 2. The customer uses the [AnswerRecord.name][google.cloud.dialogflow.v2.AnswerRecord.name] to call the
+//    API. Together with the answers,
+//    [AnswerRecord.name][google.cloud.dialogflow.v2.AnswerRecord.name] are
+//    returned to the customers.
+// 2. The customer uses the
+// [AnswerRecord.name][google.cloud.dialogflow.v2.AnswerRecord.name] to call the
 //    [UpdateAnswerRecord][] method to send feedback about a specific answer
 //    that they believe is wrong.
 message AnswerRecord {
@@ -104,18 +108,20 @@ message AnswerRecord {
   string name = 1;
 
   // Required. The AnswerFeedback for this record. You can set this with
-  // [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord] in order to give us feedback about
-  // this answer.
+  // [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord]
+  // in order to give us feedback about this answer.
   AnswerFeedback answer_feedback = 2 [(google.api.field_behavior) = REQUIRED];
 
   // The record for this answer.
   oneof record {
     // Output only. The record for human agent assistant.
-    AgentAssistantRecord agent_assistant_record = 4 [(google.api.field_behavior) = OUTPUT_ONLY];
+    AgentAssistantRecord agent_assistant_record = 4
+        [(google.api.field_behavior) = OUTPUT_ONLY];
   }
 }
 
-// Request message for [AnswerRecords.ListAnswerRecords][google.cloud.dialogflow.v2.AnswerRecords.ListAnswerRecords].
+// Request message for
+// [AnswerRecords.ListAnswerRecords][google.cloud.dialogflow.v2.AnswerRecords.ListAnswerRecords].
 message ListAnswerRecordsRequest {
   // Required. The project to list all answer records for in reverse
   // chronological order. Format: `projects/<Project ID>/locations/<Location
@@ -133,10 +139,7 @@ message ListAnswerRecordsRequest {
   //
   // For more information about filtering, see
   // [API Filtering](https://aip.dev/160).
-  string filter = 2 [
-    deprecated = true,
-    (google.api.field_behavior) = OPTIONAL
-  ];
+  string filter = 2 [deprecated = true, (google.api.field_behavior) = OPTIONAL];
 
   // Optional. The maximum number of records to return in a single page.
   // The server may return fewer records than this. If unspecified, we use 10.
@@ -150,7 +153,8 @@ message ListAnswerRecordsRequest {
   string page_token = 4 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// Response message for [AnswerRecords.ListAnswerRecords][google.cloud.dialogflow.v2.AnswerRecords.ListAnswerRecords].
+// Response message for
+// [AnswerRecords.ListAnswerRecords][google.cloud.dialogflow.v2.AnswerRecords.ListAnswerRecords].
 message ListAnswerRecordsResponse {
   // The list of answer records.
   repeated AnswerRecord answer_records = 1;
@@ -164,13 +168,15 @@ message ListAnswerRecordsResponse {
   string next_page_token = 2;
 }
 
-// Request message for [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord].
+// Request message for
+// [AnswerRecords.UpdateAnswerRecord][google.cloud.dialogflow.v2.AnswerRecords.UpdateAnswerRecord].
 message UpdateAnswerRecordRequest {
   // Required. Answer record to update.
   AnswerRecord answer_record = 1 [(google.api.field_behavior) = REQUIRED];
 
   // Required. The mask to control which fields get updated.
-  google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED];
+  google.protobuf.FieldMask update_mask = 2
+      [(google.api.field_behavior) = REQUIRED];
 }
 
 // Represents feedback the customer has about the quality & correctness of a
@@ -253,6 +259,18 @@ message AgentAssistantFeedback {
     EFFICIENT = 2;
   }
 
+  // Feedback for conversation summarization.
+  message SummarizationFeedback {
+    // Timestamp when composing of the summary starts.
+    google.protobuf.Timestamp start_time = 1;
+
+    // Timestamp when the summary was submitted.
+    google.protobuf.Timestamp submit_time = 2;
+
+    // Text of actual submitted summary.
+    string summary_text = 3;
+  }
+
   // Optional. Whether or not the suggested answer is relevant.
   //
   // For example:
@@ -272,13 +290,21 @@ message AgentAssistantFeedback {
   //   days of the purchase date."
   // * Ground truth: "No return or exchange is allowed."
   // * [document_correctness]: INCORRECT
-  DocumentCorrectness document_correctness = 2 [(google.api.field_behavior) = OPTIONAL];
+  DocumentCorrectness document_correctness = 2
+      [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. Whether or not the suggested document is efficient. For example,
   // if the document is poorly written, hard to understand, hard to use or
-  // too long to find useful information, [document_efficiency][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_efficiency] is
+  // too long to find useful information,
+  // [document_efficiency][google.cloud.dialogflow.v2.AgentAssistantFeedback.document_efficiency]
+  // is
   // [DocumentEfficiency.INEFFICIENT][google.cloud.dialogflow.v2.AgentAssistantFeedback.DocumentEfficiency.INEFFICIENT].
-  DocumentEfficiency document_efficiency = 3 [(google.api.field_behavior) = OPTIONAL];
+  DocumentEfficiency document_efficiency = 3
+      [(google.api.field_behavior) = OPTIONAL];
+
+  // Optional. Feedback for conversation summarization.
+  SummarizationFeedback summarization_feedback = 4
+      [(google.api.field_behavior) = OPTIONAL];
 }
 
 // Represents a record of a human agent assist answer.
@@ -286,7 +312,8 @@ message AgentAssistantRecord {
   // Output only. The agent assist answer.
   oneof answer {
     // Output only. The article suggestion answer.
-    ArticleAnswer article_suggestion_answer = 5 [(google.api.field_behavior) = OUTPUT_ONLY];
+    ArticleAnswer article_suggestion_answer = 5
+        [(google.api.field_behavior) = OUTPUT_ONLY];
 
     // Output only. The FAQ answer.
     FaqAnswer faq_answer = 6 [(google.api.field_behavior) = OUTPUT_ONLY];
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/audio_config.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/audio_config.proto
index b86a9d3a1d45..c86ec797ce91 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/audio_config.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/audio_config.proto
@@ -22,7 +22,7 @@ import "google/protobuf/duration.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "AudioConfigProto";
 option java_package = "com.google.cloud.dialogflow.v2";
@@ -115,7 +115,8 @@ message SpeechContext {
   float boost = 2;
 }
 
-// Variant of the specified [Speech model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
+// Variant of the specified [Speech
+// model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
 //
 // See the [Cloud Speech
 // documentation](https://cloud.google.com/speech-to-text/docs/enhanced-models)
@@ -144,8 +145,8 @@ enum SpeechModelVariant {
   // Use an enhanced model variant:
   //
   // * If an enhanced variant does not exist for the given
-  //   [model][google.cloud.dialogflow.v2.InputAudioConfig.model] and request language, Dialogflow falls
-  //   back to the standard variant.
+  //   [model][google.cloud.dialogflow.v2.InputAudioConfig.model] and request
+  //   language, Dialogflow falls back to the standard variant.
   //
   //   The [Cloud Speech
   //   documentation](https://cloud.google.com/speech-to-text/docs/enhanced-models)
@@ -202,10 +203,12 @@ message InputAudioConfig {
   // the same session do not necessarily need to specify the same language.
   string language_code = 3;
 
-  // If `true`, Dialogflow returns [SpeechWordInfo][google.cloud.dialogflow.v2.SpeechWordInfo] in
-  // [StreamingRecognitionResult][google.cloud.dialogflow.v2.StreamingRecognitionResult] with information about the recognized speech
-  // words, e.g. start and end time offsets. If false or unspecified, Speech
-  // doesn't return any word-level information.
+  // If `true`, Dialogflow returns
+  // [SpeechWordInfo][google.cloud.dialogflow.v2.SpeechWordInfo] in
+  // [StreamingRecognitionResult][google.cloud.dialogflow.v2.StreamingRecognitionResult]
+  // with information about the recognized speech words, e.g. start and end time
+  // offsets. If false or unspecified, Speech doesn't return any word-level
+  // information.
   bool enable_word_info = 13;
 
   // A list of strings containing words and phrases that the speech
@@ -240,7 +243,8 @@ message InputAudioConfig {
   // for more details.
   string model = 7;
 
-  // Which variant of the [Speech model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
+  // Which variant of the [Speech
+  // model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
   SpeechModelVariant model_variant = 10;
 
   // If `false` (default), recognition does not cease until the
@@ -255,7 +259,9 @@ message InputAudioConfig {
   // over StreamingDetectIntentRequest.single_utterance.
   bool single_utterance = 8;
 
-  // Only used in [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent] and
+  // Only used in
+  // [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent]
+  // and
   // [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent].
   // If `false` and recognition doesn't return any result, trigger
   // `NO_SPEECH_RECOGNIZED` event to Dialogflow agent.
@@ -288,9 +294,10 @@ message VoiceSelectionParams {
 
   // Optional. The preferred gender of the voice. If not set, the service will
   // choose a voice based on the other parameters such as language_code and
-  // [name][google.cloud.dialogflow.v2.VoiceSelectionParams.name]. Note that this is only a preference, not requirement. If a
-  // voice of the appropriate gender is not available, the synthesizer should
-  // substitute a voice with a different gender rather than failing the request.
+  // [name][google.cloud.dialogflow.v2.VoiceSelectionParams.name]. Note that
+  // this is only a preference, not requirement. If a voice of the appropriate
+  // gender is not available, the synthesizer should substitute a voice with a
+  // different gender rather than failing the request.
   SsmlVoiceGender ssml_gender = 2;
 }
 
@@ -356,7 +363,8 @@ enum OutputAudioEncoding {
 // text-to-speech settings applied to the agent.
 message OutputAudioConfig {
   // Required. Audio encoding of the synthesized audio content.
-  OutputAudioEncoding audio_encoding = 1 [(google.api.field_behavior) = REQUIRED];
+  OutputAudioEncoding audio_encoding = 1
+      [(google.api.field_behavior) = REQUIRED];
 
   // The synthesis sample rate (in hertz) for this audio. If not
   // provided, then the synthesizer will use the default sample rate based on
@@ -430,15 +438,18 @@ message TelephonyDtmfEvents {
   repeated TelephonyDtmf dtmf_events = 1;
 }
 
-// Configures speech transcription for [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile].
+// Configures speech transcription for
+// [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile].
 message SpeechToTextConfig {
   // The speech model used in speech to text.
   // `SPEECH_MODEL_VARIANT_UNSPECIFIED`, `USE_BEST_AVAILABLE` will be treated as
-  // `USE_ENHANCED`. It can be overridden in [AnalyzeContentRequest][google.cloud.dialogflow.v2.AnalyzeContentRequest] and
-  // [StreamingAnalyzeContentRequest][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest] request.
-  // If enhanced model variant is specified and an enhanced
-  // version of the specified model for the language does not exist, then it
-  // would emit an error.
+  // `USE_ENHANCED`. It can be overridden in
+  // [AnalyzeContentRequest][google.cloud.dialogflow.v2.AnalyzeContentRequest]
+  // and
+  // [StreamingAnalyzeContentRequest][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest]
+  // request. If enhanced model variant is specified and an enhanced version of
+  // the specified model for the language does not exist, then it would emit an
+  // error.
   SpeechModelVariant speech_model_variant = 1;
 
   // Which Speech model to select. Select the model best suited to your domain
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/context.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/context.proto
index 53dc7874dd1d..fad65640e57c 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/context.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/context.proto
@@ -26,7 +26,7 @@ import "google/protobuf/struct.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "ContextProto";
 option java_package = "com.google.cloud.dialogflow.v2";
@@ -135,7 +135,8 @@ service Contexts {
   }
 
   // Deletes all active contexts in the specified session.
-  rpc DeleteAllContexts(DeleteAllContextsRequest) returns (google.protobuf.Empty) {
+  rpc DeleteAllContexts(DeleteAllContextsRequest)
+      returns (google.protobuf.Empty) {
     option (google.api.http) = {
       delete: "/v2/{parent=projects/*/agent/sessions/*}/contexts"
       additional_bindings {
@@ -217,10 +218,12 @@ message Context {
   //     -   If parameter's entity type is a composite entity:
   //         map from composite entity property names to property values
   //     -   Else: parameter value
-  google.protobuf.Struct parameters = 3 [(google.api.field_behavior) = OPTIONAL];
+  google.protobuf.Struct parameters = 3
+      [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The request message for [Contexts.ListContexts][google.cloud.dialogflow.v2.Contexts.ListContexts].
+// The request message for
+// [Contexts.ListContexts][google.cloud.dialogflow.v2.Contexts.ListContexts].
 message ListContextsRequest {
   // Required. The session to list all contexts from.
   // Format: `projects/<Project ID>/agent/sessions/<Session ID>` or
@@ -243,7 +246,8 @@ message ListContextsRequest {
   string page_token = 3 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The response message for [Contexts.ListContexts][google.cloud.dialogflow.v2.Contexts.ListContexts].
+// The response message for
+// [Contexts.ListContexts][google.cloud.dialogflow.v2.Contexts.ListContexts].
 message ListContextsResponse {
   // The list of contexts. There will be a maximum number of items
   // returned based on the page_size field in the request.
@@ -254,7 +258,8 @@ message ListContextsResponse {
   string next_page_token = 2;
 }
 
-// The request message for [Contexts.GetContext][google.cloud.dialogflow.v2.Contexts.GetContext].
+// The request message for
+// [Contexts.GetContext][google.cloud.dialogflow.v2.Contexts.GetContext].
 message GetContextRequest {
   // Required. The name of the context. Format:
   // `projects/<Project ID>/agent/sessions/<Session ID>/contexts/<Context ID>`
@@ -270,7 +275,8 @@ message GetContextRequest {
   ];
 }
 
-// The request message for [Contexts.CreateContext][google.cloud.dialogflow.v2.Contexts.CreateContext].
+// The request message for
+// [Contexts.CreateContext][google.cloud.dialogflow.v2.Contexts.CreateContext].
 message CreateContextRequest {
   // Required. The session to create a context for.
   // Format: `projects/<Project ID>/agent/sessions/<Session ID>` or
@@ -289,16 +295,19 @@ message CreateContextRequest {
   Context context = 2 [(google.api.field_behavior) = REQUIRED];
 }
 
-// The request message for [Contexts.UpdateContext][google.cloud.dialogflow.v2.Contexts.UpdateContext].
+// The request message for
+// [Contexts.UpdateContext][google.cloud.dialogflow.v2.Contexts.UpdateContext].
 message UpdateContextRequest {
   // Required. The context to update.
   Context context = 1 [(google.api.field_behavior) = REQUIRED];
 
   // Optional. The mask to control which fields get updated.
-  google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = OPTIONAL];
+  google.protobuf.FieldMask update_mask = 2
+      [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The request message for [Contexts.DeleteContext][google.cloud.dialogflow.v2.Contexts.DeleteContext].
+// The request message for
+// [Contexts.DeleteContext][google.cloud.dialogflow.v2.Contexts.DeleteContext].
 message DeleteContextRequest {
   // Required. The name of the context to delete. Format:
   // `projects/<Project ID>/agent/sessions/<Session ID>/contexts/<Context ID>`
@@ -314,7 +323,8 @@ message DeleteContextRequest {
   ];
 }
 
-// The request message for [Contexts.DeleteAllContexts][google.cloud.dialogflow.v2.Contexts.DeleteAllContexts].
+// The request message for
+// [Contexts.DeleteAllContexts][google.cloud.dialogflow.v2.Contexts.DeleteAllContexts].
 message DeleteAllContextsRequest {
   // Required. The name of the session to delete all contexts from. Format:
   // `projects/<Project ID>/agent/sessions/<Session ID>` or `projects/<Project
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation.proto
index 6266354ae9a4..6d3a7867c202 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation.proto
@@ -25,13 +25,14 @@ import "google/protobuf/timestamp.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "ConversationProto";
 option java_package = "com.google.cloud.dialogflow.v2";
 option objc_class_prefix = "DF";
 
-// Service for managing [Conversations][google.cloud.dialogflow.v2.Conversation].
+// Service for managing
+// [Conversations][google.cloud.dialogflow.v2.Conversation].
 service Conversations {
   option (google.api.default_host) = "dialogflow.googleapis.com";
   option (google.api.oauth_scopes) =
@@ -51,11 +52,14 @@ service Conversations {
   // For Assist Stage, there's no dialogflow agent responding to user queries.
   // But we will provide suggestions which are generated from conversation.
   //
-  // If [Conversation.conversation_profile][google.cloud.dialogflow.v2.Conversation.conversation_profile] is configured for a dialogflow
-  // agent, conversation will start from `Automated Agent Stage`, otherwise, it
-  // will start from `Assist Stage`. And during `Automated Agent Stage`, once an
-  // [Intent][google.cloud.dialogflow.v2.Intent] with [Intent.live_agent_handoff][google.cloud.dialogflow.v2.Intent.live_agent_handoff] is triggered, conversation
-  // will transfer to Assist Stage.
+  // If
+  // [Conversation.conversation_profile][google.cloud.dialogflow.v2.Conversation.conversation_profile]
+  // is configured for a dialogflow agent, conversation will start from
+  // `Automated Agent Stage`, otherwise, it will start from `Assist Stage`. And
+  // during `Automated Agent Stage`, once an
+  // [Intent][google.cloud.dialogflow.v2.Intent] with
+  // [Intent.live_agent_handoff][google.cloud.dialogflow.v2.Intent.live_agent_handoff]
+  // is triggered, conversation will transfer to Assist Stage.
   rpc CreateConversation(CreateConversationRequest) returns (Conversation) {
     option (google.api.http) = {
       post: "/v2/{parent=projects/*}/conversations"
@@ -69,7 +73,8 @@ service Conversations {
   }
 
   // Returns the list of all conversations in the specified project.
-  rpc ListConversations(ListConversationsRequest) returns (ListConversationsResponse) {
+  rpc ListConversations(ListConversationsRequest)
+      returns (ListConversationsResponse) {
     option (google.api.http) = {
       get: "/v2/{parent=projects/*}/conversations"
       additional_bindings {
@@ -118,6 +123,22 @@ service Conversations {
     };
     option (google.api.method_signature) = "parent";
   }
+
+  // Suggests summary for a conversation based on specific historical messages.
+  // The range of the messages to be used for summary can be specified in the
+  // request.
+  rpc SuggestConversationSummary(SuggestConversationSummaryRequest)
+      returns (SuggestConversationSummaryResponse) {
+    option (google.api.http) = {
+      post: "/v2/{conversation=projects/*/conversations/*}/suggestions:suggestConversationSummary"
+      body: "*"
+      additional_bindings {
+        post: "/v2/{conversation=projects/*/locations/*/conversations/*}/suggestions:suggestConversationSummary"
+        body: "*"
+      }
+    };
+    option (google.api.method_signature) = "conversation";
+  }
 }
 
 // Represents a conversation.
@@ -166,7 +187,8 @@ message Conversation {
   string name = 1 [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. The current state of the Conversation.
-  LifecycleState lifecycle_state = 2 [(google.api.field_behavior) = OUTPUT_ONLY];
+  LifecycleState lifecycle_state = 2
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Required. The Conversation Profile to be used to configure this
   // Conversation. This field cannot be updated.
@@ -179,33 +201,40 @@ message Conversation {
     }
   ];
 
-  // Output only. It will not be empty if the conversation is to be connected over
-  // telephony.
-  ConversationPhoneNumber phone_number = 4 [(google.api.field_behavior) = OUTPUT_ONLY];
+  // Output only. It will not be empty if the conversation is to be connected
+  // over telephony.
+  ConversationPhoneNumber phone_number = 4
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. The time the conversation was started.
-  google.protobuf.Timestamp start_time = 5 [(google.api.field_behavior) = OUTPUT_ONLY];
+  google.protobuf.Timestamp start_time = 5
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. The time the conversation was finished.
-  google.protobuf.Timestamp end_time = 6 [(google.api.field_behavior) = OUTPUT_ONLY];
+  google.protobuf.Timestamp end_time = 6
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // The stage of a conversation. It indicates whether the virtual agent or a
   // human agent is handling the conversation.
   //
   // If the conversation is created with the conversation profile that has
   // Dialogflow config set, defaults to
-  // [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE]; Otherwise, defaults to
+  // [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE];
+  // Otherwise, defaults to
   // [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE].
   //
   // If the conversation is created with the conversation profile that has
   // Dialogflow config set but explicitly sets conversation_stage to
-  // [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE], it skips
-  // [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE] stage and directly goes to
+  // [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE],
+  // it skips
+  // [ConversationStage.VIRTUAL_AGENT_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.VIRTUAL_AGENT_STAGE]
+  // stage and directly goes to
   // [ConversationStage.HUMAN_ASSIST_STAGE][google.cloud.dialogflow.v2.Conversation.ConversationStage.HUMAN_ASSIST_STAGE].
   ConversationStage conversation_stage = 7;
 }
 
-// The request message for [Conversations.CreateConversation][google.cloud.dialogflow.v2.Conversations.CreateConversation].
+// The request message for
+// [Conversations.CreateConversation][google.cloud.dialogflow.v2.Conversations.CreateConversation].
 message CreateConversationRequest {
   // Required. Resource identifier of the project creating the conversation.
   // Format: `projects/<Project ID>/locations/<Location ID>`.
@@ -219,8 +248,8 @@ message CreateConversationRequest {
   // Required. The conversation to create.
   Conversation conversation = 2 [(google.api.field_behavior) = REQUIRED];
 
-  // Optional. Identifier of the conversation. Generally it's auto generated by Google.
-  // Only set it if you cannot wait for the response to return a
+  // Optional. Identifier of the conversation. Generally it's auto generated by
+  // Google. Only set it if you cannot wait for the response to return a
   // auto-generated one to you.
   //
   // The conversation ID must be compliant with the regression fomula
@@ -232,7 +261,8 @@ message CreateConversationRequest {
   string conversation_id = 3 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The request message for [Conversations.ListConversations][google.cloud.dialogflow.v2.Conversations.ListConversations].
+// The request message for
+// [Conversations.ListConversations][google.cloud.dialogflow.v2.Conversations.ListConversations].
 message ListConversationsRequest {
   // Required. The project from which to list all conversation.
   // Format: `projects/<Project ID>/locations/<Location ID>`.
@@ -270,7 +300,8 @@ message ListConversationsRequest {
   string filter = 4;
 }
 
-// The response message for [Conversations.ListConversations][google.cloud.dialogflow.v2.Conversations.ListConversations].
+// The response message for
+// [Conversations.ListConversations][google.cloud.dialogflow.v2.Conversations.ListConversations].
 message ListConversationsResponse {
   // The list of conversations. There will be a maximum number of items
   // returned based on the page_size field in the request.
@@ -281,7 +312,8 @@ message ListConversationsResponse {
   string next_page_token = 2;
 }
 
-// The request message for [Conversations.GetConversation][google.cloud.dialogflow.v2.Conversations.GetConversation].
+// The request message for
+// [Conversations.GetConversation][google.cloud.dialogflow.v2.Conversations.GetConversation].
 message GetConversationRequest {
   // Required. The name of the conversation. Format:
   // `projects/<Project ID>/locations/<Location ID>/conversations/<Conversation
@@ -294,7 +326,8 @@ message GetConversationRequest {
   ];
 }
 
-// The request message for [Conversations.CompleteConversation][google.cloud.dialogflow.v2.Conversations.CompleteConversation].
+// The request message for
+// [Conversations.CompleteConversation][google.cloud.dialogflow.v2.Conversations.CompleteConversation].
 message CompleteConversationRequest {
   // Required. Resource identifier of the conversation to close.
   // Format: `projects/<Project ID>/locations/<Location
@@ -307,7 +340,8 @@ message CompleteConversationRequest {
   ];
 }
 
-// The request message for [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages].
+// The request message for
+// [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages].
 message ListMessagesRequest {
   // Required. The name of the conversation to list messages for.
   // Format: `projects/<Project ID>/locations/<Location
@@ -337,7 +371,8 @@ message ListMessagesRequest {
   string page_token = 3 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The response message for [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages].
+// The response message for
+// [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages].
 message ListMessagesResponse {
   // The list of messages. There will be a maximum number of items
   // returned based on the page_size field in the request.
@@ -355,3 +390,71 @@ message ConversationPhoneNumber {
   // Output only. The phone number to connect to this conversation.
   string phone_number = 3 [(google.api.field_behavior) = OUTPUT_ONLY];
 }
+
+// The request message for
+// [Conversations.SuggestConversationSummary][google.cloud.dialogflow.v2.Conversations.SuggestConversationSummary].
+message SuggestConversationSummaryRequest {
+  // Required. The conversation to fetch suggestion for.
+  // Format: `projects/<Project ID>/locations/<Location
+  // ID>/conversations/<Conversation ID>`.
+  string conversation = 1 [
+    (google.api.field_behavior) = REQUIRED,
+    (google.api.resource_reference) = {
+      type: "dialogflow.googleapis.com/Conversation"
+    }
+  ];
+
+  // The name of the latest conversation message used as context for
+  // compiling suggestion. If empty, the latest message of the conversation will
+  // be used.
+  //
+  // Format: `projects/<Project ID>/locations/<Location
+  // ID>/conversations/<Conversation ID>/messages/<Message ID>`.
+  string latest_message = 3 [(google.api.resource_reference) = {
+    type: "dialogflow.googleapis.com/Message"
+  }];
+
+  // Max number of messages prior to and including
+  // [latest_message] to use as context when compiling the
+  // suggestion. By default 500 and at most 1000.
+  int32 context_size = 4;
+}
+
+// The response message for
+// [Conversations.SuggestConversationSummary][google.cloud.dialogflow.v2.Conversations.SuggestConversationSummary].
+message SuggestConversationSummaryResponse {
+  // Generated summary for a conversation.
+  message Summary {
+    // The summary content that is concatenated into one string.
+    string text = 1;
+
+    // The summary content that is divided into sections. The key is the
+    // section's name and the value is the section's content. There is no
+    // specific format for the key or value.
+    map<string, string> text_sections = 4;
+
+    // The name of the answer record. Format:
+    // "projects/<Project ID>/answerRecords/<Answer Record ID>"
+    string answer_record = 3 [(google.api.resource_reference) = {
+      type: "dialogflow.googleapis.com/AnswerRecord"
+    }];
+  }
+
+  // Generated summary.
+  Summary summary = 1;
+
+  // The name of the latest conversation message used as context for
+  // compiling suggestion.
+  //
+  // Format: `projects/<Project ID>/locations/<Location
+  // ID>/conversations/<Conversation ID>/messages/<Message ID>`.
+  string latest_message = 2 [(google.api.resource_reference) = {
+    type: "dialogflow.googleapis.com/Message"
+  }];
+
+  // Number of messages prior to and including
+  // [last_conversation_message][] used to compile the suggestion. It may be
+  // smaller than the [SuggestSummaryRequest.context_size][] field in the
+  // request if there weren't that many messages in the conversation.
+  int32 context_size = 3;
+}
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation_dataset.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation_dataset.proto
index 282bdda3923d..1790d2ca2960 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation_dataset.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation_dataset.proto
@@ -27,7 +27,7 @@ import "google/rpc/status.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "ConversationDatasetProto";
 option java_package = "com.google.cloud.dialogflow.v2";
@@ -49,9 +49,12 @@ service ConversationDatasets {
   // operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
   // The returned `Operation` type has the following method-specific fields:
   //
-  // - `metadata`: [CreateConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata]
-  // - `response`: [ConversationDataset][google.cloud.dialogflow.v2.ConversationDataset]
-  rpc CreateConversationDataset(CreateConversationDatasetRequest) returns (google.longrunning.Operation) {
+  // - `metadata`:
+  // [CreateConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata]
+  // - `response`:
+  // [ConversationDataset][google.cloud.dialogflow.v2.ConversationDataset]
+  rpc CreateConversationDataset(CreateConversationDatasetRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{parent=projects/*/locations/*}/conversationDatasets"
       body: "conversation_dataset"
@@ -64,7 +67,8 @@ service ConversationDatasets {
   }
 
   // Retrieves the specified conversation dataset.
-  rpc GetConversationDataset(GetConversationDatasetRequest) returns (ConversationDataset) {
+  rpc GetConversationDataset(GetConversationDatasetRequest)
+      returns (ConversationDataset) {
     option (google.api.http) = {
       get: "/v2/{name=projects/*/conversationDatasets/*}"
       additional_bindings {
@@ -76,7 +80,8 @@ service ConversationDatasets {
 
   // Returns the list of all conversation datasets in the specified
   // project and location.
-  rpc ListConversationDatasets(ListConversationDatasetsRequest) returns (ListConversationDatasetsResponse) {
+  rpc ListConversationDatasets(ListConversationDatasetsRequest)
+      returns (ListConversationDatasetsResponse) {
     option (google.api.http) = {
       get: "/v2/{parent=projects/*}/conversationDatasets"
       additional_bindings {
@@ -92,10 +97,12 @@ service ConversationDatasets {
   // operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
   // The returned `Operation` type has the following method-specific fields:
   //
-  // - `metadata`: [DeleteConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationDatasetOperationMetadata]
+  // - `metadata`:
+  // [DeleteConversationDatasetOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationDatasetOperationMetadata]
   // - `response`: An [Empty
   //   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
-  rpc DeleteConversationDataset(DeleteConversationDatasetRequest) returns (google.longrunning.Operation) {
+  rpc DeleteConversationDataset(DeleteConversationDatasetRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       delete: "/v2/{name=projects/*/locations/*/conversationDatasets/*}"
     };
@@ -114,9 +121,12 @@ service ConversationDatasets {
   // operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
   // The returned `Operation` type has the following method-specific fields:
   //
-  // - `metadata`: [ImportConversationDataOperationMetadata][google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata]
-  // - `response`: [ImportConversationDataOperationResponse][google.cloud.dialogflow.v2.ImportConversationDataOperationResponse]
-  rpc ImportConversationData(ImportConversationDataRequest) returns (google.longrunning.Operation) {
+  // - `metadata`:
+  // [ImportConversationDataOperationMetadata][google.cloud.dialogflow.v2.ImportConversationDataOperationMetadata]
+  // - `response`:
+  // [ImportConversationDataOperationResponse][google.cloud.dialogflow.v2.ImportConversationDataOperationResponse]
+  rpc ImportConversationData(ImportConversationDataRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{name=projects/*/conversationDatasets/*}:importConversationData"
       body: "*"
@@ -134,9 +144,9 @@ service ConversationDatasets {
 
 // Represents metadata of a conversation.
 message ConversationInfo {
-  // Optional. The language code of the conversation data within this dataset. See
-  // https://cloud.google.com/apis/design/standard_fields for more information.
-  // Supports all UTF-8 languages.
+  // Optional. The language code of the conversation data within this dataset.
+  // See https://cloud.google.com/apis/design/standard_fields for more
+  // information. Supports all UTF-8 languages.
   string language_code = 1 [(google.api.field_behavior) = OPTIONAL];
 }
 
@@ -174,15 +184,18 @@ message ConversationDataset {
   string description = 3 [(google.api.field_behavior) = OPTIONAL];
 
   // Output only. Creation time of this dataset.
-  google.protobuf.Timestamp create_time = 4 [(google.api.field_behavior) = OUTPUT_ONLY];
+  google.protobuf.Timestamp create_time = 4
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. Input configurations set during conversation data import.
   InputConfig input_config = 5 [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. Metadata set during conversation data import.
-  ConversationInfo conversation_info = 6 [(google.api.field_behavior) = OUTPUT_ONLY];
+  ConversationInfo conversation_info = 6
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
-  // Output only. The number of conversations this conversation dataset contains.
+  // Output only. The number of conversations this conversation dataset
+  // contains.
   int64 conversation_count = 7 [(google.api.field_behavior) = OUTPUT_ONLY];
 }
 
@@ -194,7 +207,8 @@ message CreateConversationDatasetRequest {
   string parent = 1 [(google.api.field_behavior) = REQUIRED];
 
   // Required. The conversation dataset to create.
-  ConversationDataset conversation_dataset = 2 [(google.api.field_behavior) = REQUIRED];
+  ConversationDataset conversation_dataset = 2
+      [(google.api.field_behavior) = REQUIRED];
 }
 
 // The request message for
@@ -214,8 +228,8 @@ message GetConversationDatasetRequest {
 // The request message for
 // [ConversationDatasets.ListConversationDatasets][google.cloud.dialogflow.v2.ConversationDatasets.ListConversationDatasets].
 message ListConversationDatasetsRequest {
-  // Required. The project and location name to list all conversation datasets for.
-  // Format: `projects/<Project ID>/locations/<Location ID>`
+  // Required. The project and location name to list all conversation datasets
+  // for. Format: `projects/<Project ID>/locations/<Location ID>`
   string parent = 1 [
     (google.api.field_behavior) = REQUIRED,
     (google.api.resource_reference) = {
@@ -256,7 +270,8 @@ message DeleteConversationDatasetRequest {
   ];
 }
 
-// The request message for [ConversationDatasets.ImportConversationData][google.cloud.dialogflow.v2.ConversationDatasets.ImportConversationData].
+// The request message for
+// [ConversationDatasets.ImportConversationData][google.cloud.dialogflow.v2.ConversationDatasets.ImportConversationData].
 message ImportConversationDataRequest {
   // Required. Dataset resource name. Format:
   // `projects/<Project ID>/locations/<Location
@@ -272,14 +287,16 @@ message ImportConversationDataRequest {
   InputConfig input_config = 2 [(google.api.field_behavior) = REQUIRED];
 }
 
-// Metadata for a [ConversationDatasets.ImportConversationData][google.cloud.dialogflow.v2.ConversationDatasets.ImportConversationData] operation.
+// Metadata for a
+// [ConversationDatasets.ImportConversationData][google.cloud.dialogflow.v2.ConversationDatasets.ImportConversationData]
+// operation.
 message ImportConversationDataOperationMetadata {
   // The resource name of the imported conversation dataset. Format:
   // `projects/<Project ID>/locations/<Location
   // ID>/conversationDatasets/<Conversation Dataset Id>`
   string conversation_dataset = 1 [(google.api.resource_reference) = {
-                                     type: "dialogflow.googleapis.com/ConversationDataset"
-                                   }];
+    type: "dialogflow.googleapis.com/ConversationDataset"
+  }];
 
   // Partial failures are failures that don't fail the whole long running
   // operation, e.g. single files that couldn't be read.
@@ -290,15 +307,16 @@ message ImportConversationDataOperationMetadata {
   google.protobuf.Timestamp create_time = 3;
 }
 
-// Response used for [ConversationDatasets.ImportConversationData][google.cloud.dialogflow.v2.ConversationDatasets.ImportConversationData] long
-// running operation.
+// Response used for
+// [ConversationDatasets.ImportConversationData][google.cloud.dialogflow.v2.ConversationDatasets.ImportConversationData]
+// long running operation.
 message ImportConversationDataOperationResponse {
   // The resource name of the imported conversation dataset. Format:
   // `projects/<Project ID>/locations/<Location
   // ID>/conversationDatasets/<Conversation Dataset Id>`
   string conversation_dataset = 1 [(google.api.resource_reference) = {
-                                     type: "dialogflow.googleapis.com/ConversationDataset"
-                                   }];
+    type: "dialogflow.googleapis.com/ConversationDataset"
+  }];
 
   // Number of conversations imported successfully.
   int32 import_count = 3;
@@ -310,11 +328,9 @@ message CreateConversationDatasetOperationMetadata {
   // `projects/<Project ID>/locations/<Location
   // ID>/conversationDatasets/<Conversation Dataset Id>`
   string conversation_dataset = 1 [(google.api.resource_reference) = {
-                                     type: "dialogflow.googleapis.com/ConversationDataset"
-                                   }];
+    type: "dialogflow.googleapis.com/ConversationDataset"
+  }];
 }
 
 // Metadata for [ConversationDatasets][DeleteConversationDataset].
-message DeleteConversationDatasetOperationMetadata {
-
-}
+message DeleteConversationDatasetOperationMetadata {}
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation_event.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation_event.proto
index 6c45e895f143..4ce33c7cd031 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation_event.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation_event.proto
@@ -21,7 +21,7 @@ import "google/rpc/status.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "ConversationEventProto";
 option java_package = "com.google.cloud.dialogflow.v2";
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation_model.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation_model.proto
index 065290df5f04..64756eca5c37 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation_model.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation_model.proto
@@ -25,7 +25,7 @@ import "google/protobuf/timestamp.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "ConversationModelProto";
 option java_package = "com.google.cloud.dialogflow.v2";
@@ -44,9 +44,12 @@ service ConversationModels {
   // operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
   // The returned `Operation` type has the following method-specific fields:
   //
-  // - `metadata`: [CreateConversationModelOperationMetadata][google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata]
-  // - `response`: [ConversationModel][google.cloud.dialogflow.v2.ConversationModel]
-  rpc CreateConversationModel(CreateConversationModelRequest) returns (google.longrunning.Operation) {
+  // - `metadata`:
+  // [CreateConversationModelOperationMetadata][google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata]
+  // - `response`:
+  // [ConversationModel][google.cloud.dialogflow.v2.ConversationModel]
+  rpc CreateConversationModel(CreateConversationModelRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{parent=projects/*}/conversationModels"
       body: "conversation_model"
@@ -63,7 +66,8 @@ service ConversationModels {
   }
 
   // Gets conversation model.
-  rpc GetConversationModel(GetConversationModelRequest) returns (ConversationModel) {
+  rpc GetConversationModel(GetConversationModelRequest)
+      returns (ConversationModel) {
     option (google.api.http) = {
       get: "/v2/{name=projects/*/conversationModels/*}"
       additional_bindings {
@@ -74,7 +78,8 @@ service ConversationModels {
   }
 
   // Lists conversation models.
-  rpc ListConversationModels(ListConversationModelsRequest) returns (ListConversationModelsResponse) {
+  rpc ListConversationModels(ListConversationModelsRequest)
+      returns (ListConversationModelsResponse) {
     option (google.api.http) = {
       get: "/v2/{parent=projects/*}/conversationModels"
       additional_bindings {
@@ -90,10 +95,12 @@ service ConversationModels {
   // operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
   // The returned `Operation` type has the following method-specific fields:
   //
-  // - `metadata`: [DeleteConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata]
+  // - `metadata`:
+  // [DeleteConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeleteConversationModelOperationMetadata]
   // - `response`: An [Empty
   //   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
-  rpc DeleteConversationModel(DeleteConversationModelRequest) returns (google.longrunning.Operation) {
+  rpc DeleteConversationModel(DeleteConversationModelRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       delete: "/v2/{name=projects/*/conversationModels/*}"
       additional_bindings {
@@ -116,10 +123,12 @@ service ConversationModels {
   // operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
   // The returned `Operation` type has the following method-specific fields:
   //
-  // - `metadata`: [DeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata]
+  // - `metadata`:
+  // [DeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.DeployConversationModelOperationMetadata]
   // - `response`: An [Empty
   //   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
-  rpc DeployConversationModel(DeployConversationModelRequest) returns (google.longrunning.Operation) {
+  rpc DeployConversationModel(DeployConversationModelRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{name=projects/*/conversationModels/*}:deploy"
       body: "*"
@@ -143,10 +152,12 @@ service ConversationModels {
   // operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
   // The returned `Operation` type has the following method-specific fields:
   //
-  // - `metadata`: [UndeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata]
+  // - `metadata`:
+  // [UndeployConversationModelOperationMetadata][google.cloud.dialogflow.v2.UndeployConversationModelOperationMetadata]
   // - `response`: An [Empty
   //   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
-  rpc UndeployConversationModel(UndeployConversationModelRequest) returns (google.longrunning.Operation) {
+  rpc UndeployConversationModel(UndeployConversationModelRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{name=projects/*/conversationModels/*}:undeploy"
       body: "*"
@@ -162,7 +173,8 @@ service ConversationModels {
   }
 
   // Gets an evaluation of conversation model.
-  rpc GetConversationModelEvaluation(GetConversationModelEvaluationRequest) returns (ConversationModelEvaluation) {
+  rpc GetConversationModelEvaluation(GetConversationModelEvaluationRequest)
+      returns (ConversationModelEvaluation) {
     option (google.api.http) = {
       get: "/v2/{name=projects/*/conversationModels/*/evaluations/*}"
       additional_bindings {
@@ -173,7 +185,8 @@ service ConversationModels {
   }
 
   // Lists evaluations of a conversation model.
-  rpc ListConversationModelEvaluations(ListConversationModelEvaluationsRequest) returns (ListConversationModelEvaluationsResponse) {
+  rpc ListConversationModelEvaluations(ListConversationModelEvaluationsRequest)
+      returns (ListConversationModelEvaluationsResponse) {
     option (google.api.http) = {
       get: "/v2/{parent=projects/*/conversationModels/*}/evaluations"
       additional_bindings {
@@ -184,12 +197,15 @@ service ConversationModels {
   }
 
   // Creates evaluation of a conversation model.
-  rpc CreateConversationModelEvaluation(CreateConversationModelEvaluationRequest) returns (google.longrunning.Operation) {
+  rpc CreateConversationModelEvaluation(
+      CreateConversationModelEvaluationRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{parent=projects/*/locations/*/conversationModels/*}/evaluations"
       body: "*"
     };
-    option (google.api.method_signature) = "parent,conversation_model_evaluation";
+    option (google.api.method_signature) =
+        "parent,conversation_model_evaluation";
     option (google.longrunning.operation_info) = {
       response_type: "ConversationModelEvaluation"
       metadata_type: "CreateConversationModelEvaluationOperationMetadata"
@@ -257,7 +273,8 @@ message ConversationModel {
   string display_name = 2 [(google.api.field_behavior) = REQUIRED];
 
   // Output only. Creation time of this model.
-  google.protobuf.Timestamp create_time = 3 [(google.api.field_behavior) = OUTPUT_ONLY];
+  google.protobuf.Timestamp create_time = 3
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Required. Datasets used to create model.
   repeated InputDataset datasets = 4 [(google.api.field_behavior) = REQUIRED];
@@ -302,16 +319,37 @@ message ConversationModelEvaluation {
   string display_name = 2 [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. The configuration of the evaluation task.
-  EvaluationConfig evaluation_config = 6 [(google.api.field_behavior) = OPTIONAL];
+  EvaluationConfig evaluation_config = 6
+      [(google.api.field_behavior) = OPTIONAL];
 
   // Output only. Creation time of this model.
-  google.protobuf.Timestamp create_time = 3 [(google.api.field_behavior) = OUTPUT_ONLY];
+  google.protobuf.Timestamp create_time = 3
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Metrics details.
   oneof metrics {
     // Output only. Only available when model is for smart reply.
-    SmartReplyMetrics smart_reply_metrics = 5 [(google.api.field_behavior) = OUTPUT_ONLY];
+    SmartReplyMetrics smart_reply_metrics = 5
+        [(google.api.field_behavior) = OUTPUT_ONLY];
   }
+
+  // Output only. Human eval template in csv format.
+  // It tooks real-world conversations provided through input dataset, generates
+  // example suggestions for customer to verify quality of the model.
+  // For Smart Reply, the generated csv file contains columns of
+  // Context, (Suggestions,Q1,Q2)*3, Actual reply.
+  // Context contains at most 10 latest messages in the conversation prior to
+  // the current suggestion.
+  // Q1: "Would you send it as the next message of agent?"
+  // Evaluated based on whether the suggest is appropriate to be sent by
+  // agent in current context.
+  // Q2: "Does the suggestion move the conversation closer to resolution?"
+  // Evaluated based on whether the suggestion provide solutions, or answers
+  // customer's question or collect information from customer to resolve the
+  // customer's issue.
+  // Actual reply column contains the actual agent reply sent in the context.
+  string raw_human_eval_template_csv = 8
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 }
 
 // The configuration for model evaluation.
@@ -322,13 +360,13 @@ message EvaluationConfig {
     // Format: `projects/<Project ID>/knowledgeBases/<Knowledge Base
     // ID>/documents/<Document ID>`. Only used for smart reply model.
     string allowlist_document = 1 [(google.api.resource_reference) = {
-                                     type: "dialogflow.googleapis.com/Document"
-                                   }];
+      type: "dialogflow.googleapis.com/Document"
+    }];
 
-    // Required. The model to be evaluated can return multiple results with confidence
-    // score on each query. These results will be sorted by the descending order
-    // of the scores and we only keep the first max_result_count results as the
-    // final results to evaluate.
+    // Required. The model to be evaluated can return multiple results with
+    // confidence score on each query. These results will be sorted by the
+    // descending order of the scores and we only keep the first
+    // max_result_count results as the final results to evaluate.
     int32 max_result_count = 2 [(google.api.field_behavior) = REQUIRED];
   }
 
@@ -338,13 +376,13 @@ message EvaluationConfig {
     // Format: `projects/<Project ID>/knowledgeBases/<Knowledge Base
     // ID>/documents/<Document ID>`. Only used for smart compose model.
     string allowlist_document = 1 [(google.api.resource_reference) = {
-                                     type: "dialogflow.googleapis.com/Document"
-                                   }];
+      type: "dialogflow.googleapis.com/Document"
+    }];
 
-    // Required. The model to be evaluated can return multiple results with confidence
-    // score on each query. These results will be sorted by the descending order
-    // of the scores and we only keep the first max_result_count results as the
-    // final results to evaluate.
+    // Required. The model to be evaluated can return multiple results with
+    // confidence score on each query. These results will be sorted by the
+    // descending order of the scores and we only keep the first
+    // max_result_count results as the final results to evaluate.
     int32 max_result_count = 2 [(google.api.field_behavior) = REQUIRED];
   }
 
@@ -377,14 +415,18 @@ message InputDataset {
 
 // Metadata for article suggestion models.
 message ArticleSuggestionModelMetadata {
-  // Optional. Type of the article suggestion model. If not provided, model_type is used.
-  ConversationModel.ModelType training_model_type = 3 [(google.api.field_behavior) = OPTIONAL];
+  // Optional. Type of the article suggestion model. If not provided, model_type
+  // is used.
+  ConversationModel.ModelType training_model_type = 3
+      [(google.api.field_behavior) = OPTIONAL];
 }
 
 // Metadata for smart reply models.
 message SmartReplyModelMetadata {
-  // Optional. Type of the smart reply model. If not provided, model_type is used.
-  ConversationModel.ModelType training_model_type = 6 [(google.api.field_behavior) = OPTIONAL];
+  // Optional. Type of the smart reply model. If not provided, model_type is
+  // used.
+  ConversationModel.ModelType training_model_type = 6
+      [(google.api.field_behavior) = OPTIONAL];
 }
 
 // The evaluation metrics for smart reply model.
@@ -423,7 +465,8 @@ message CreateConversationModelRequest {
   string parent = 1;
 
   // Required. The conversation model to create.
-  ConversationModel conversation_model = 2 [(google.api.field_behavior) = REQUIRED];
+  ConversationModel conversation_model = 2
+      [(google.api.field_behavior) = REQUIRED];
 }
 
 // The request message for
@@ -533,10 +576,13 @@ message CreateConversationModelEvaluationRequest {
   ];
 
   // Required. The conversation model evaluation to be created.
-  ConversationModelEvaluation conversation_model_evaluation = 2 [(google.api.field_behavior) = REQUIRED];
+  ConversationModelEvaluation conversation_model_evaluation = 2
+      [(google.api.field_behavior) = REQUIRED];
 }
 
-// Metadata for a [ConversationModels.CreateConversationModel][google.cloud.dialogflow.v2.ConversationModels.CreateConversationModel] operation.
+// Metadata for a
+// [ConversationModels.CreateConversationModel][google.cloud.dialogflow.v2.ConversationModels.CreateConversationModel]
+// operation.
 message CreateConversationModelOperationMetadata {
   // State of CreateConversationModel operation.
   enum State {
@@ -576,7 +622,9 @@ message CreateConversationModelOperationMetadata {
   google.protobuf.Timestamp create_time = 3;
 }
 
-// Metadata for a [ConversationModels.DeployConversationModel][google.cloud.dialogflow.v2.ConversationModels.DeployConversationModel] operation.
+// Metadata for a
+// [ConversationModels.DeployConversationModel][google.cloud.dialogflow.v2.ConversationModels.DeployConversationModel]
+// operation.
 message DeployConversationModelOperationMetadata {
   // The resource name of the conversation model. Format:
   // `projects/<Project ID>/conversationModels/<Conversation Model Id>`
@@ -587,7 +635,9 @@ message DeployConversationModelOperationMetadata {
   google.protobuf.Timestamp create_time = 3;
 }
 
-// Metadata for a [ConversationModels.UndeployConversationModel][google.cloud.dialogflow.v2.ConversationModels.UndeployConversationModel] operation.
+// Metadata for a
+// [ConversationModels.UndeployConversationModel][google.cloud.dialogflow.v2.ConversationModels.UndeployConversationModel]
+// operation.
 message UndeployConversationModelOperationMetadata {
   // The resource name of the conversation model. Format:
   // `projects/<Project ID>/conversationModels/<Conversation Model Id>`
@@ -598,7 +648,9 @@ message UndeployConversationModelOperationMetadata {
   google.protobuf.Timestamp create_time = 3;
 }
 
-// Metadata for a [ConversationModels.DeleteConversationModel][google.cloud.dialogflow.v2.ConversationModels.DeleteConversationModel] operation.
+// Metadata for a
+// [ConversationModels.DeleteConversationModel][google.cloud.dialogflow.v2.ConversationModels.DeleteConversationModel]
+// operation.
 message DeleteConversationModelOperationMetadata {
   // The resource name of the conversation model. Format:
   // `projects/<Project ID>/conversationModels/<Conversation Model Id>`
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation_profile.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation_profile.proto
index d1a33bb80257..98751d7cf189 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation_profile.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation_profile.proto
@@ -29,7 +29,7 @@ import "google/protobuf/timestamp.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "ConversationProfileProto";
 option java_package = "com.google.cloud.dialogflow.v2";
@@ -39,7 +39,8 @@ option (google.api.resource_definition) = {
   pattern: "projects/{project}/locations/{location}/securitySettings/{security_settings}"
 };
 
-// Service for managing [ConversationProfiles][google.cloud.dialogflow.v2.ConversationProfile].
+// Service for managing
+// [ConversationProfiles][google.cloud.dialogflow.v2.ConversationProfile].
 service ConversationProfiles {
   option (google.api.default_host) = "dialogflow.googleapis.com";
   option (google.api.oauth_scopes) =
@@ -47,7 +48,8 @@ service ConversationProfiles {
       "https://www.googleapis.com/auth/dialogflow";
 
   // Returns the list of all conversation profiles in the specified project.
-  rpc ListConversationProfiles(ListConversationProfilesRequest) returns (ListConversationProfilesResponse) {
+  rpc ListConversationProfiles(ListConversationProfilesRequest)
+      returns (ListConversationProfilesResponse) {
     option (google.api.http) = {
       get: "/v2/{parent=projects/*}/conversationProfiles"
       additional_bindings {
@@ -58,7 +60,8 @@ service ConversationProfiles {
   }
 
   // Retrieves the specified conversation profile.
-  rpc GetConversationProfile(GetConversationProfileRequest) returns (ConversationProfile) {
+  rpc GetConversationProfile(GetConversationProfileRequest)
+      returns (ConversationProfile) {
     option (google.api.http) = {
       get: "/v2/{name=projects/*/conversationProfiles/*}"
       additional_bindings {
@@ -72,8 +75,10 @@ service ConversationProfiles {
   //
   // [ConversationProfile.CreateTime][] and [ConversationProfile.UpdateTime][]
   // aren't populated in the response. You can retrieve them via
-  // [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile] API.
-  rpc CreateConversationProfile(CreateConversationProfileRequest) returns (ConversationProfile) {
+  // [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile]
+  // API.
+  rpc CreateConversationProfile(CreateConversationProfileRequest)
+      returns (ConversationProfile) {
     option (google.api.http) = {
       post: "/v2/{parent=projects/*}/conversationProfiles"
       body: "conversation_profile"
@@ -89,8 +94,10 @@ service ConversationProfiles {
   //
   // [ConversationProfile.CreateTime][] and [ConversationProfile.UpdateTime][]
   // aren't populated in the response. You can retrieve them via
-  // [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile] API.
-  rpc UpdateConversationProfile(UpdateConversationProfileRequest) returns (ConversationProfile) {
+  // [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile]
+  // API.
+  rpc UpdateConversationProfile(UpdateConversationProfileRequest)
+      returns (ConversationProfile) {
     option (google.api.http) = {
       patch: "/v2/{conversation_profile.name=projects/*/conversationProfiles/*}"
       body: "conversation_profile"
@@ -103,7 +110,8 @@ service ConversationProfiles {
   }
 
   // Deletes the specified conversation profile.
-  rpc DeleteConversationProfile(DeleteConversationProfileRequest) returns (google.protobuf.Empty) {
+  rpc DeleteConversationProfile(DeleteConversationProfileRequest)
+      returns (google.protobuf.Empty) {
     option (google.api.http) = {
       delete: "/v2/{name=projects/*/conversationProfiles/*}"
       additional_bindings {
@@ -122,14 +130,17 @@ service ConversationProfiles {
   // operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
   // The returned `Operation` type has the following method-specific fields:
   //
-  // - `metadata`: [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadata]
-  // - `response`: [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile]
+  // - `metadata`:
+  // [SetSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.SetSuggestionFeatureConfigOperationMetadata]
+  // - `response`:
+  // [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile]
   //
   // If a long running operation to add or update suggestion feature
   // config for the same conversation profile, participant role and suggestion
   // feature type exists, please cancel the existing long running operation
   // before sending such request, otherwise the request will be rejected.
-  rpc SetSuggestionFeatureConfig(SetSuggestionFeatureConfigRequest) returns (google.longrunning.Operation) {
+  rpc SetSuggestionFeatureConfig(SetSuggestionFeatureConfigRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{conversation_profile=projects/*/conversationProfiles/*}:setSuggestionFeatureConfig"
       body: "*"
@@ -152,9 +163,12 @@ service ConversationProfiles {
   // operation](https://cloud.google.com/dialogflow/es/docs/how/long-running-operations).
   // The returned `Operation` type has the following method-specific fields:
   //
-  // - `metadata`: [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetadata]
-  // - `response`: [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile]
-  rpc ClearSuggestionFeatureConfig(ClearSuggestionFeatureConfigRequest) returns (google.longrunning.Operation) {
+  // - `metadata`:
+  // [ClearSuggestionFeatureConfigOperationMetadata][google.cloud.dialogflow.v2.ClearSuggestionFeatureConfigOperationMetadata]
+  // - `response`:
+  // [ConversationProfile][google.cloud.dialogflow.v2.ConversationProfile]
+  rpc ClearSuggestionFeatureConfig(ClearSuggestionFeatureConfigRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{conversation_profile=projects/*/conversationProfiles/*}:clearSuggestionFeatureConfig"
       body: "*"
@@ -188,10 +202,12 @@ message ConversationProfile {
   string display_name = 2 [(google.api.field_behavior) = REQUIRED];
 
   // Output only. Create time of the conversation profile.
-  google.protobuf.Timestamp create_time = 11 [(google.api.field_behavior) = OUTPUT_ONLY];
+  google.protobuf.Timestamp create_time = 11
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. Update time of the conversation profile.
-  google.protobuf.Timestamp update_time = 12 [(google.api.field_behavior) = OUTPUT_ONLY];
+  google.protobuf.Timestamp update_time = 12
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Configuration for an automated agent to use with this profile.
   AutomatedAgentConfig automated_agent_config = 3;
@@ -234,11 +250,12 @@ message ConversationProfile {
   // Format: `projects/<Project ID>/locations/<Location
   // ID>/securitySettings/<Security Settings ID>`.
   string security_settings = 13 [(google.api.resource_reference) = {
-                                   type: "dialogflow.googleapis.com/CXSecuritySettings"
-                                 }];
+    type: "dialogflow.googleapis.com/CXSecuritySettings"
+  }];
 }
 
-// The request message for [ConversationProfiles.ListConversationProfiles][google.cloud.dialogflow.v2.ConversationProfiles.ListConversationProfiles].
+// The request message for
+// [ConversationProfiles.ListConversationProfiles][google.cloud.dialogflow.v2.ConversationProfiles.ListConversationProfiles].
 message ListConversationProfilesRequest {
   // Required. The project to list all conversation profiles from.
   // Format: `projects/<Project ID>/locations/<Location ID>`.
@@ -257,7 +274,8 @@ message ListConversationProfilesRequest {
   string page_token = 3;
 }
 
-// The response message for [ConversationProfiles.ListConversationProfiles][google.cloud.dialogflow.v2.ConversationProfiles.ListConversationProfiles].
+// The response message for
+// [ConversationProfiles.ListConversationProfiles][google.cloud.dialogflow.v2.ConversationProfiles.ListConversationProfiles].
 message ListConversationProfilesResponse {
   // The list of project conversation profiles. There is a maximum number
   // of items returned based on the page_size field in the request.
@@ -268,7 +286,8 @@ message ListConversationProfilesResponse {
   string next_page_token = 2;
 }
 
-// The request message for [ConversationProfiles.GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile].
+// The request message for
+// [ConversationProfiles.GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile].
 message GetConversationProfileRequest {
   // Required. The resource name of the conversation profile.
   // Format: `projects/<Project ID>/locations/<Location
@@ -281,7 +300,8 @@ message GetConversationProfileRequest {
   ];
 }
 
-// The request message for [ConversationProfiles.CreateConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.CreateConversationProfile].
+// The request message for
+// [ConversationProfiles.CreateConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.CreateConversationProfile].
 message CreateConversationProfileRequest {
   // Required. The project to create a conversation profile for.
   // Format: `projects/<Project ID>/locations/<Location ID>`.
@@ -293,19 +313,24 @@ message CreateConversationProfileRequest {
   ];
 
   // Required. The conversation profile to create.
-  ConversationProfile conversation_profile = 2 [(google.api.field_behavior) = REQUIRED];
+  ConversationProfile conversation_profile = 2
+      [(google.api.field_behavior) = REQUIRED];
 }
 
-// The request message for [ConversationProfiles.UpdateConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.UpdateConversationProfile].
+// The request message for
+// [ConversationProfiles.UpdateConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.UpdateConversationProfile].
 message UpdateConversationProfileRequest {
   // Required. The conversation profile to update.
-  ConversationProfile conversation_profile = 1 [(google.api.field_behavior) = REQUIRED];
+  ConversationProfile conversation_profile = 1
+      [(google.api.field_behavior) = REQUIRED];
 
   // Required. The mask to control which fields to update.
-  google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED];
+  google.protobuf.FieldMask update_mask = 2
+      [(google.api.field_behavior) = REQUIRED];
 }
 
-// The request message for [ConversationProfiles.DeleteConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.DeleteConversationProfile].
+// The request message for
+// [ConversationProfiles.DeleteConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.DeleteConversationProfile].
 //
 // This operation fails if the conversation profile is still referenced from
 // a phone number.
@@ -443,8 +468,8 @@ message HumanAgentAssistantConfig {
     //
     // Supported feature: DIALOGFLOW_ASSIST.
     message DialogflowQuerySource {
-      // Required. The name of a Dialogflow virtual agent used for end user side intent
-      // detection and suggestion. Format: `projects/<Project Number/
+      // Required. The name of a Dialogflow virtual agent used for end user side
+      // intent detection and suggestion. Format: `projects/<Project Number/
       // ID>/locations/<Location ID>/agent`. When multiple agents are allowed in
       // the same Dialogflow project.
       string agent = 1 [
@@ -521,8 +546,8 @@ message HumanAgentAssistantConfig {
     // Conversation model resource name. Format: `projects/<Project
     // ID>/conversationModels/<Model ID>`.
     string model = 1 [(google.api.resource_reference) = {
-                        type: "dialogflow.googleapis.com/ConversationModel"
-                      }];
+      type: "dialogflow.googleapis.com/ConversationModel"
+    }];
   }
 
   // Config to process conversation.
@@ -548,11 +573,17 @@ message HumanAgentAssistantConfig {
     // and identifies the prevailing subjective opinion, especially to determine
     // a user's attitude as positive, negative, or neutral:
     // https://cloud.google.com/natural-language/docs/basics#sentiment_analysis
-    // For [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent] method, result will be in
+    // For
+    // [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent]
+    // method, result will be in
     // [StreamingAnalyzeContentResponse.message.SentimentAnalysisResult][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.message].
-    // For [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent] method, result will be in
+    // For
+    // [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent]
+    // method, result will be in
     // [AnalyzeContentResponse.message.SentimentAnalysisResult][google.cloud.dialogflow.v2.AnalyzeContentResponse.message]
-    // For [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages] method, result will be in
+    // For
+    // [Conversations.ListMessages][google.cloud.dialogflow.v2.Conversations.ListMessages]
+    // method, result will be in
     // [ListMessagesResponse.messages.SentimentAnalysisResult][google.cloud.dialogflow.v2.ListMessagesResponse.messages]
     // If Pub/Sub notification is configured, result will be in
     // [ConversationEvent.new_message_payload.SentimentAnalysisResult][google.cloud.dialogflow.v2.ConversationEvent.new_message_payload].
@@ -632,8 +663,9 @@ message NotificationConfig {
 
   // Name of the Pub/Sub topic to publish conversation
   // events like
-  // [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED] as
-  // serialized [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
+  // [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED]
+  // as serialized
+  // [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
   //
   // For telephony integration to receive notification, make sure either this
   // topic is in the same project as the conversation or you grant
@@ -654,8 +686,8 @@ message NotificationConfig {
 // Defines logging behavior for conversation lifecycle events.
 message LoggingConfig {
   // Whether to log conversation events like
-  // [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED] to
-  // Stackdriver in the conversation project as JSON format
+  // [CONVERSATION_STARTED][google.cloud.dialogflow.v2.ConversationEvent.Type.CONVERSATION_STARTED]
+  // to Stackdriver in the conversation project as JSON format
   // [ConversationEvent][google.cloud.dialogflow.v2.ConversationEvent] protos.
   bool enable_stackdriver_logging = 3;
 }
@@ -693,10 +725,12 @@ message SetSuggestionFeatureConfigRequest {
 
   // Required. The participant role to add or update the suggestion feature
   // config. Only HUMAN_AGENT or END_USER can be used.
-  Participant.Role participant_role = 2 [(google.api.field_behavior) = REQUIRED];
+  Participant.Role participant_role = 2
+      [(google.api.field_behavior) = REQUIRED];
 
   // Required. The suggestion feature config to add or update.
-  HumanAgentAssistantConfig.SuggestionFeatureConfig suggestion_feature_config = 3 [(google.api.field_behavior) = REQUIRED];
+  HumanAgentAssistantConfig.SuggestionFeatureConfig suggestion_feature_config =
+      3 [(google.api.field_behavior) = REQUIRED];
 }
 
 // The request message for [ConversationProfiles.ClearFeature][].
@@ -708,10 +742,12 @@ message ClearSuggestionFeatureConfigRequest {
 
   // Required. The participant role to remove the suggestion feature
   // config. Only HUMAN_AGENT or END_USER can be used.
-  Participant.Role participant_role = 2 [(google.api.field_behavior) = REQUIRED];
+  Participant.Role participant_role = 2
+      [(google.api.field_behavior) = REQUIRED];
 
   // Required. The type of the suggestion feature to remove.
-  SuggestionFeature.Type suggestion_feature_type = 3 [(google.api.field_behavior) = REQUIRED];
+  SuggestionFeature.Type suggestion_feature_type = 3
+      [(google.api.field_behavior) = REQUIRED];
 }
 
 // Metadata for a [ConversationProfile.SetSuggestionFeatureConfig][]
@@ -724,10 +760,12 @@ message SetSuggestionFeatureConfigOperationMetadata {
 
   // Required. The participant role to add or update the suggestion feature
   // config. Only HUMAN_AGENT or END_USER can be used.
-  Participant.Role participant_role = 2 [(google.api.field_behavior) = REQUIRED];
+  Participant.Role participant_role = 2
+      [(google.api.field_behavior) = REQUIRED];
 
   // Required. The type of the suggestion feature to add or update.
-  SuggestionFeature.Type suggestion_feature_type = 3 [(google.api.field_behavior) = REQUIRED];
+  SuggestionFeature.Type suggestion_feature_type = 3
+      [(google.api.field_behavior) = REQUIRED];
 
   // Timestamp whe the request was created. The time is measured on server side.
   google.protobuf.Timestamp create_time = 4;
@@ -743,10 +781,12 @@ message ClearSuggestionFeatureConfigOperationMetadata {
 
   // Required. The participant role to remove the suggestion feature
   // config. Only HUMAN_AGENT or END_USER can be used.
-  Participant.Role participant_role = 2 [(google.api.field_behavior) = REQUIRED];
+  Participant.Role participant_role = 2
+      [(google.api.field_behavior) = REQUIRED];
 
   // Required. The type of the suggestion feature to remove.
-  SuggestionFeature.Type suggestion_feature_type = 3 [(google.api.field_behavior) = REQUIRED];
+  SuggestionFeature.Type suggestion_feature_type = 3
+      [(google.api.field_behavior) = REQUIRED];
 
   // Timestamp whe the request was created. The time is measured on server side.
   google.protobuf.Timestamp create_time = 4;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/document.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/document.proto
index 1241621948f1..3293d29bfc48 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/document.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/document.proto
@@ -28,13 +28,14 @@ import "google/rpc/status.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "DocumentProto";
 option java_package = "com.google.cloud.dialogflow.v2";
 option objc_class_prefix = "DF";
 
-// Service for managing knowledge [Documents][google.cloud.dialogflow.v2.Document].
+// Service for managing knowledge
+// [Documents][google.cloud.dialogflow.v2.Document].
 service Documents {
   option (google.api.default_host) = "dialogflow.googleapis.com";
   option (google.api.oauth_scopes) =
@@ -75,9 +76,11 @@ service Documents {
   // operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
   // The returned `Operation` type has the following method-specific fields:
   //
-  // - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+  // - `metadata`:
+  // [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
   // - `response`: [Document][google.cloud.dialogflow.v2.Document]
-  rpc CreateDocument(CreateDocumentRequest) returns (google.longrunning.Operation) {
+  rpc CreateDocument(CreateDocumentRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{parent=projects/*/knowledgeBases/*}/documents"
       body: "document"
@@ -105,9 +108,12 @@ service Documents {
   // operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
   // The returned `Operation` type has the following method-specific fields:
   //
-  // - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
-  // - `response`: [ImportDocumentsResponse][google.cloud.dialogflow.v2.ImportDocumentsResponse]
-  rpc ImportDocuments(ImportDocumentsRequest) returns (google.longrunning.Operation) {
+  // - `metadata`:
+  // [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+  // - `response`:
+  // [ImportDocumentsResponse][google.cloud.dialogflow.v2.ImportDocumentsResponse]
+  rpc ImportDocuments(ImportDocumentsRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{parent=projects/*/knowledgeBases/*}/documents:import"
       body: "*"
@@ -128,10 +134,12 @@ service Documents {
   // operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
   // The returned `Operation` type has the following method-specific fields:
   //
-  // - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+  // - `metadata`:
+  // [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
   // - `response`: An [Empty
   //   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#empty)
-  rpc DeleteDocument(DeleteDocumentRequest) returns (google.longrunning.Operation) {
+  rpc DeleteDocument(DeleteDocumentRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       delete: "/v2/{name=projects/*/knowledgeBases/*/documents/*}"
       additional_bindings {
@@ -154,9 +162,11 @@ service Documents {
   // operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
   // The returned `Operation` type has the following method-specific fields:
   //
-  // - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+  // - `metadata`:
+  // [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
   // - `response`: [Document][google.cloud.dialogflow.v2.Document]
-  rpc UpdateDocument(UpdateDocumentRequest) returns (google.longrunning.Operation) {
+  rpc UpdateDocument(UpdateDocumentRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       patch: "/v2/{document.name=projects/*/knowledgeBases/*/documents/*}"
       body: "document"
@@ -185,12 +195,14 @@ service Documents {
   // operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
   // The returned `Operation` type has the following method-specific fields:
   //
-  // - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+  // - `metadata`:
+  // [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
   // - `response`: [Document][google.cloud.dialogflow.v2.Document]
   //
   // Note: The `projects.agent.knowledgeBases.documents` resource is deprecated;
   // only use `projects.knowledgeBases.documents`.
-  rpc ReloadDocument(ReloadDocumentRequest) returns (google.longrunning.Operation) {
+  rpc ReloadDocument(ReloadDocumentRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{name=projects/*/knowledgeBases/*/documents/*}:reload"
       body: "*"
@@ -217,9 +229,11 @@ service Documents {
   // operation](https://cloud.google.com/dialogflow/cx/docs/how/long-running-operation).
   // The returned `Operation` type has the following method-specific fields:
   //
-  // - `metadata`: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
+  // - `metadata`:
+  // [KnowledgeOperationMetadata][google.cloud.dialogflow.v2.KnowledgeOperationMetadata]
   // - `response`: [Document][google.cloud.dialogflow.v2.Document]
-  rpc ExportDocument(ExportDocumentRequest) returns (google.longrunning.Operation) {
+  rpc ExportDocument(ExportDocumentRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{name=projects/*/knowledgeBases/*/documents/*}:export"
       body: "*"
@@ -235,7 +249,8 @@ service Documents {
   }
 }
 
-// A knowledge document to be used by a [KnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBase].
+// A knowledge document to be used by a
+// [KnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBase].
 //
 // For more information, see the [knowledge base
 // guide](https://cloud.google.com/dialogflow/docs/how/knowledge-bases).
@@ -321,7 +336,8 @@ message Document {
   string mime_type = 3 [(google.api.field_behavior) = REQUIRED];
 
   // Required. The knowledge type of document content.
-  repeated KnowledgeType knowledge_types = 4 [(google.api.field_behavior) = REQUIRED];
+  repeated KnowledgeType knowledge_types = 4
+      [(google.api.field_behavior) = REQUIRED];
 
   // Required. The source of this document.
   oneof source {
@@ -362,7 +378,8 @@ message Document {
   // Output only. The time and status of the latest reload.
   // This reload may have been triggered automatically or manually
   // and may not have succeeded.
-  ReloadStatus latest_reload_status = 12 [(google.api.field_behavior) = OUTPUT_ONLY];
+  ReloadStatus latest_reload_status = 12
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Optional. Metadata for the document. The metadata supports arbitrary
   // key-value pairs. Suggested use cases include storing a document's title,
@@ -374,7 +391,8 @@ message Document {
   State state = 13 [(google.api.field_behavior) = OUTPUT_ONLY];
 }
 
-// Request message for [Documents.GetDocument][google.cloud.dialogflow.v2.Documents.GetDocument].
+// Request message for
+// [Documents.GetDocument][google.cloud.dialogflow.v2.Documents.GetDocument].
 message GetDocumentRequest {
   // Required. The name of the document to retrieve.
   // Format `projects/<Project ID>/locations/<Location
@@ -387,7 +405,8 @@ message GetDocumentRequest {
   ];
 }
 
-// Request message for [Documents.ListDocuments][google.cloud.dialogflow.v2.Documents.ListDocuments].
+// Request message for
+// [Documents.ListDocuments][google.cloud.dialogflow.v2.Documents.ListDocuments].
 message ListDocumentsRequest {
   // Required. The knowledge base to list all documents for.
   // Format: `projects/<Project ID>/locations/<Location
@@ -430,7 +449,8 @@ message ListDocumentsRequest {
   string filter = 4;
 }
 
-// Response message for [Documents.ListDocuments][google.cloud.dialogflow.v2.Documents.ListDocuments].
+// Response message for
+// [Documents.ListDocuments][google.cloud.dialogflow.v2.Documents.ListDocuments].
 message ListDocumentsResponse {
   // The list of documents.
   repeated Document documents = 1;
@@ -440,7 +460,8 @@ message ListDocumentsResponse {
   string next_page_token = 2;
 }
 
-// Request message for [Documents.CreateDocument][google.cloud.dialogflow.v2.Documents.CreateDocument].
+// Request message for
+// [Documents.CreateDocument][google.cloud.dialogflow.v2.Documents.CreateDocument].
 message CreateDocumentRequest {
   // Required. The knowledge base to create a document for.
   // Format: `projects/<Project ID>/locations/<Location
@@ -456,7 +477,8 @@ message CreateDocumentRequest {
   Document document = 2 [(google.api.field_behavior) = REQUIRED];
 }
 
-// Request message for [Documents.ImportDocuments][google.cloud.dialogflow.v2.Documents.ImportDocuments].
+// Request message for
+// [Documents.ImportDocuments][google.cloud.dialogflow.v2.Documents.ImportDocuments].
 message ImportDocumentsRequest {
   // Required. The knowledge base to import documents into.
   // Format: `projects/<Project ID>/locations/<Location
@@ -487,7 +509,8 @@ message ImportDocumentsRequest {
   }
 
   // Required. Document template used for importing all the documents.
-  ImportDocumentTemplate document_template = 3 [(google.api.field_behavior) = REQUIRED];
+  ImportDocumentTemplate document_template = 3
+      [(google.api.field_behavior) = REQUIRED];
 
   // Whether to import custom metadata from Google Cloud Storage.
   // Only valid when the document source is Google Cloud Storage URI.
@@ -500,7 +523,8 @@ message ImportDocumentTemplate {
   string mime_type = 1 [(google.api.field_behavior) = REQUIRED];
 
   // Required. The knowledge type of document content.
-  repeated Document.KnowledgeType knowledge_types = 2 [(google.api.field_behavior) = REQUIRED];
+  repeated Document.KnowledgeType knowledge_types = 2
+      [(google.api.field_behavior) = REQUIRED];
 
   // Metadata for the document. The metadata supports arbitrary
   // key-value pairs. Suggested use cases include storing a document's title,
@@ -509,13 +533,15 @@ message ImportDocumentTemplate {
   map<string, string> metadata = 3;
 }
 
-// Response message for [Documents.ImportDocuments][google.cloud.dialogflow.v2.Documents.ImportDocuments].
+// Response message for
+// [Documents.ImportDocuments][google.cloud.dialogflow.v2.Documents.ImportDocuments].
 message ImportDocumentsResponse {
   // Includes details about skipped documents or any other warnings.
   repeated google.rpc.Status warnings = 1;
 }
 
-// Request message for [Documents.DeleteDocument][google.cloud.dialogflow.v2.Documents.DeleteDocument].
+// Request message for
+// [Documents.DeleteDocument][google.cloud.dialogflow.v2.Documents.DeleteDocument].
 message DeleteDocumentRequest {
   // Required. The name of the document to delete.
   // Format: `projects/<Project ID>/locations/<Location
@@ -528,7 +554,8 @@ message DeleteDocumentRequest {
   ];
 }
 
-// Request message for [Documents.UpdateDocument][google.cloud.dialogflow.v2.Documents.UpdateDocument].
+// Request message for
+// [Documents.UpdateDocument][google.cloud.dialogflow.v2.Documents.UpdateDocument].
 message UpdateDocumentRequest {
   // Required. The document to update.
   Document document = 1 [(google.api.field_behavior) = REQUIRED];
@@ -536,10 +563,12 @@ message UpdateDocumentRequest {
   // Optional. Not specified means `update all`.
   // Currently, only `display_name` can be updated, an InvalidArgument will be
   // returned for attempting to update other fields.
-  google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = OPTIONAL];
+  google.protobuf.FieldMask update_mask = 2
+      [(google.api.field_behavior) = OPTIONAL];
 }
 
-// Request message for [Documents.ReloadDocument][google.cloud.dialogflow.v2.Documents.ReloadDocument].
+// Request message for
+// [Documents.ReloadDocument][google.cloud.dialogflow.v2.Documents.ReloadDocument].
 message ReloadDocumentRequest {
   // Required. The name of the document to reload.
   // Format: `projects/<Project ID>/locations/<Location
@@ -555,8 +584,8 @@ message ReloadDocumentRequest {
   // If provided, the service will load the contents from the source
   // and update document in the knowledge base.
   oneof source {
-    // Optional. The path of gcs source file for reloading document content. For now,
-    // only gcs uri is supported.
+    // Optional. The path of gcs source file for reloading document content. For
+    // now, only gcs uri is supported.
     //
     // For documents stored in Google Cloud Storage, these URIs must have
     // the form `gs://<bucket-name>/<object-name>`.
@@ -567,12 +596,14 @@ message ReloadDocumentRequest {
   // Only valid when the document source is Google Cloud Storage URI.
   bool import_gcs_custom_metadata = 4 [(google.api.field_behavior) = OPTIONAL];
 
-  // Optional. When enabled, the reload request is to apply partial update to the smart
-  // messaging allowlist.
-  bool smart_messaging_partial_update = 5 [(google.api.field_behavior) = OPTIONAL];
+  // Optional. When enabled, the reload request is to apply partial update to
+  // the smart messaging allowlist.
+  bool smart_messaging_partial_update = 5
+      [(google.api.field_behavior) = OPTIONAL];
 }
 
-// Request message for [Documents.ExportDocument][google.cloud.dialogflow.v2.Documents.ExportDocument].
+// Request message for
+// [Documents.ExportDocument][google.cloud.dialogflow.v2.Documents.ExportDocument].
 message ExportDocumentRequest {
   // Required. The name of the document to export.
   // Format: `projects/<Project ID>/locations/<Location
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/entity_type.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/entity_type.proto
index acb5b94f25e4..3a3e40d60857 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/entity_type.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/entity_type.proto
@@ -26,7 +26,7 @@ import "google/protobuf/field_mask.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "EntityTypeProto";
 option java_package = "com.google.cloud.dialogflow.v2";
@@ -40,7 +40,8 @@ service EntityTypes {
       "https://www.googleapis.com/auth/dialogflow";
 
   // Returns the list of all entity types in the specified agent.
-  rpc ListEntityTypes(ListEntityTypesRequest) returns (ListEntityTypesResponse) {
+  rpc ListEntityTypes(ListEntityTypesRequest)
+      returns (ListEntityTypesResponse) {
     option (google.api.http) = {
       get: "/v2/{parent=projects/*/agent}/entityTypes"
       additional_bindings {
@@ -104,7 +105,8 @@ service EntityTypes {
   // Note: You should always train an agent prior to sending it queries. See the
   // [training
   // documentation](https://cloud.google.com/dialogflow/es/docs/training).
-  rpc DeleteEntityType(DeleteEntityTypeRequest) returns (google.protobuf.Empty) {
+  rpc DeleteEntityType(DeleteEntityTypeRequest)
+      returns (google.protobuf.Empty) {
     option (google.api.http) = {
       delete: "/v2/{name=projects/*/agent/entityTypes/*}"
       additional_bindings {
@@ -122,12 +124,14 @@ service EntityTypes {
   //
   // - `metadata`: An empty [Struct
   //   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#struct)
-  // - `response`: [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse]
+  // - `response`:
+  // [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse]
   //
   // Note: You should always train an agent prior to sending it queries. See the
   // [training
   // documentation](https://cloud.google.com/dialogflow/es/docs/training).
-  rpc BatchUpdateEntityTypes(BatchUpdateEntityTypesRequest) returns (google.longrunning.Operation) {
+  rpc BatchUpdateEntityTypes(BatchUpdateEntityTypesRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{parent=projects/*/agent}/entityTypes:batchUpdate"
       body: "*"
@@ -156,7 +160,8 @@ service EntityTypes {
   // Note: You should always train an agent prior to sending it queries. See the
   // [training
   // documentation](https://cloud.google.com/dialogflow/es/docs/training).
-  rpc BatchDeleteEntityTypes(BatchDeleteEntityTypesRequest) returns (google.longrunning.Operation) {
+  rpc BatchDeleteEntityTypes(BatchDeleteEntityTypesRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{parent=projects/*/agent}/entityTypes:batchDelete"
       body: "*"
@@ -186,7 +191,8 @@ service EntityTypes {
   // Note: You should always train an agent prior to sending it queries. See the
   // [training
   // documentation](https://cloud.google.com/dialogflow/es/docs/training).
-  rpc BatchCreateEntities(BatchCreateEntitiesRequest) returns (google.longrunning.Operation) {
+  rpc BatchCreateEntities(BatchCreateEntitiesRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{parent=projects/*/agent/entityTypes/*}/entities:batchCreate"
       body: "*"
@@ -220,7 +226,8 @@ service EntityTypes {
   // [training
   // documentation](https://cloud.google.com/dialogflow/es/docs/training).
   //
-  rpc BatchUpdateEntities(BatchUpdateEntitiesRequest) returns (google.longrunning.Operation) {
+  rpc BatchUpdateEntities(BatchUpdateEntitiesRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{parent=projects/*/agent/entityTypes/*}/entities:batchUpdate"
       body: "*"
@@ -251,7 +258,8 @@ service EntityTypes {
   // Note: You should always train an agent prior to sending it queries. See the
   // [training
   // documentation](https://cloud.google.com/dialogflow/es/docs/training).
-  rpc BatchDeleteEntities(BatchDeleteEntitiesRequest) returns (google.longrunning.Operation) {
+  rpc BatchDeleteEntities(BatchDeleteEntitiesRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{parent=projects/*/agent/entityTypes/*}/entities:batchDelete"
       body: "*"
@@ -346,9 +354,12 @@ message EntityType {
   }
 
   // The unique identifier of the entity type.
-  // Required for [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType] and
-  // [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes] methods.
-  // Format: `projects/<Project ID>/agent/entityTypes/<Entity Type ID>`.
+  // Required for
+  // [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType]
+  // and
+  // [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes]
+  // methods. Format: `projects/<Project ID>/agent/entityTypes/<Entity Type
+  // ID>`.
   string name = 1;
 
   // Required. The name of the entity type.
@@ -359,7 +370,8 @@ message EntityType {
 
   // Optional. Indicates whether the entity type can be automatically
   // expanded.
-  AutoExpansionMode auto_expansion_mode = 4 [(google.api.field_behavior) = OPTIONAL];
+  AutoExpansionMode auto_expansion_mode = 4
+      [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. The collection of entity entries associated with the entity type.
   repeated Entity entities = 6 [(google.api.field_behavior) = OPTIONAL];
@@ -368,7 +380,8 @@ message EntityType {
   bool enable_fuzzy_extraction = 7 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The request message for [EntityTypes.ListEntityTypes][google.cloud.dialogflow.v2.EntityTypes.ListEntityTypes].
+// The request message for
+// [EntityTypes.ListEntityTypes][google.cloud.dialogflow.v2.EntityTypes.ListEntityTypes].
 message ListEntityTypesRequest {
   // Required. The agent to list all entity types from.
   // Format: `projects/<Project ID>/agent`.
@@ -394,7 +407,8 @@ message ListEntityTypesRequest {
   string page_token = 4 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The response message for [EntityTypes.ListEntityTypes][google.cloud.dialogflow.v2.EntityTypes.ListEntityTypes].
+// The response message for
+// [EntityTypes.ListEntityTypes][google.cloud.dialogflow.v2.EntityTypes.ListEntityTypes].
 message ListEntityTypesResponse {
   // The list of agent entity types. There will be a maximum number of items
   // returned based on the page_size field in the request.
@@ -405,7 +419,8 @@ message ListEntityTypesResponse {
   string next_page_token = 2;
 }
 
-// The request message for [EntityTypes.GetEntityType][google.cloud.dialogflow.v2.EntityTypes.GetEntityType].
+// The request message for
+// [EntityTypes.GetEntityType][google.cloud.dialogflow.v2.EntityTypes.GetEntityType].
 message GetEntityTypeRequest {
   // Required. The name of the entity type.
   // Format: `projects/<Project ID>/agent/entityTypes/<EntityType ID>`.
@@ -424,7 +439,8 @@ message GetEntityTypeRequest {
   string language_code = 2 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The request message for [EntityTypes.CreateEntityType][google.cloud.dialogflow.v2.EntityTypes.CreateEntityType].
+// The request message for
+// [EntityTypes.CreateEntityType][google.cloud.dialogflow.v2.EntityTypes.CreateEntityType].
 message CreateEntityTypeRequest {
   // Required. The agent to create a entity type for.
   // Format: `projects/<Project ID>/agent`.
@@ -446,7 +462,8 @@ message CreateEntityTypeRequest {
   string language_code = 3 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The request message for [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType].
+// The request message for
+// [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType].
 message UpdateEntityTypeRequest {
   // Required. The entity type to update.
   EntityType entity_type = 1 [(google.api.field_behavior) = REQUIRED];
@@ -459,10 +476,12 @@ message UpdateEntityTypeRequest {
   string language_code = 2 [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. The mask to control which fields get updated.
-  google.protobuf.FieldMask update_mask = 3 [(google.api.field_behavior) = OPTIONAL];
+  google.protobuf.FieldMask update_mask = 3
+      [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The request message for [EntityTypes.DeleteEntityType][google.cloud.dialogflow.v2.EntityTypes.DeleteEntityType].
+// The request message for
+// [EntityTypes.DeleteEntityType][google.cloud.dialogflow.v2.EntityTypes.DeleteEntityType].
 message DeleteEntityTypeRequest {
   // Required. The name of the entity type to delete.
   // Format: `projects/<Project ID>/agent/entityTypes/<EntityType ID>`.
@@ -474,7 +493,8 @@ message DeleteEntityTypeRequest {
   ];
 }
 
-// The request message for [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes].
+// The request message for
+// [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes].
 message BatchUpdateEntityTypesRequest {
   // Required. The name of the agent to update or create entity types in.
   // Format: `projects/<Project ID>/agent`.
@@ -510,16 +530,19 @@ message BatchUpdateEntityTypesRequest {
   string language_code = 4 [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. The mask to control which fields get updated.
-  google.protobuf.FieldMask update_mask = 5 [(google.api.field_behavior) = OPTIONAL];
+  google.protobuf.FieldMask update_mask = 5
+      [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The response message for [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes].
+// The response message for
+// [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes].
 message BatchUpdateEntityTypesResponse {
   // The collection of updated or created entity types.
   repeated EntityType entity_types = 1;
 }
 
-// The request message for [EntityTypes.BatchDeleteEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchDeleteEntityTypes].
+// The request message for
+// [EntityTypes.BatchDeleteEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchDeleteEntityTypes].
 message BatchDeleteEntityTypesRequest {
   // Required. The name of the agent to delete all entities types for. Format:
   // `projects/<Project ID>/agent`.
@@ -532,10 +555,12 @@ message BatchDeleteEntityTypesRequest {
 
   // Required. The names entity types to delete. All names must point to the
   // same agent as `parent`.
-  repeated string entity_type_names = 2 [(google.api.field_behavior) = REQUIRED];
+  repeated string entity_type_names = 2
+      [(google.api.field_behavior) = REQUIRED];
 }
 
-// The request message for [EntityTypes.BatchCreateEntities][google.cloud.dialogflow.v2.EntityTypes.BatchCreateEntities].
+// The request message for
+// [EntityTypes.BatchCreateEntities][google.cloud.dialogflow.v2.EntityTypes.BatchCreateEntities].
 message BatchCreateEntitiesRequest {
   // Required. The name of the entity type to create entities in. Format:
   // `projects/<Project ID>/agent/entityTypes/<Entity Type ID>`.
@@ -547,7 +572,8 @@ message BatchCreateEntitiesRequest {
   ];
 
   // Required. The entities to create.
-  repeated EntityType.Entity entities = 2 [(google.api.field_behavior) = REQUIRED];
+  repeated EntityType.Entity entities = 2
+      [(google.api.field_behavior) = REQUIRED];
 
   // Optional. The language used to access language-specific data.
   // If not specified, the agent's default language is used.
@@ -557,7 +583,8 @@ message BatchCreateEntitiesRequest {
   string language_code = 3 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The request message for [EntityTypes.BatchUpdateEntities][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntities].
+// The request message for
+// [EntityTypes.BatchUpdateEntities][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntities].
 message BatchUpdateEntitiesRequest {
   // Required. The name of the entity type to update or create entities in.
   // Format: `projects/<Project ID>/agent/entityTypes/<Entity Type ID>`.
@@ -569,7 +596,8 @@ message BatchUpdateEntitiesRequest {
   ];
 
   // Required. The entities to update or create.
-  repeated EntityType.Entity entities = 2 [(google.api.field_behavior) = REQUIRED];
+  repeated EntityType.Entity entities = 2
+      [(google.api.field_behavior) = REQUIRED];
 
   // Optional. The language used to access language-specific data.
   // If not specified, the agent's default language is used.
@@ -579,10 +607,12 @@ message BatchUpdateEntitiesRequest {
   string language_code = 3 [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. The mask to control which fields get updated.
-  google.protobuf.FieldMask update_mask = 4 [(google.api.field_behavior) = OPTIONAL];
+  google.protobuf.FieldMask update_mask = 4
+      [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The request message for [EntityTypes.BatchDeleteEntities][google.cloud.dialogflow.v2.EntityTypes.BatchDeleteEntities].
+// The request message for
+// [EntityTypes.BatchDeleteEntities][google.cloud.dialogflow.v2.EntityTypes.BatchDeleteEntities].
 message BatchDeleteEntitiesRequest {
   // Required. The name of the entity type to delete entries for. Format:
   // `projects/<Project ID>/agent/entityTypes/<Entity Type ID>`.
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/environment.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/environment.proto
index f368db3ec846..c57673d8d5f4 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/environment.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/environment.proto
@@ -28,7 +28,7 @@ import "google/protobuf/timestamp.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "EnvironmentProto";
 option java_package = "com.google.cloud.dialogflow.v2";
@@ -42,7 +42,8 @@ service Environments {
       "https://www.googleapis.com/auth/dialogflow";
 
   // Returns the list of all non-default environments of the specified agent.
-  rpc ListEnvironments(ListEnvironmentsRequest) returns (ListEnvironmentsResponse) {
+  rpc ListEnvironments(ListEnvironmentsRequest)
+      returns (ListEnvironmentsResponse) {
     option (google.api.http) = {
       get: "/v2/{parent=projects/*/agent}/environments"
       additional_bindings {
@@ -98,7 +99,8 @@ service Environments {
   }
 
   // Deletes the specified agent environment.
-  rpc DeleteEnvironment(DeleteEnvironmentRequest) returns (google.protobuf.Empty) {
+  rpc DeleteEnvironment(DeleteEnvironmentRequest)
+      returns (google.protobuf.Empty) {
     option (google.api.http) = {
       delete: "/v2/{name=projects/*/agent/environments/*}"
       additional_bindings {
@@ -108,7 +110,8 @@ service Environments {
   }
 
   // Gets the history of the specified environment.
-  rpc GetEnvironmentHistory(GetEnvironmentHistoryRequest) returns (EnvironmentHistory) {
+  rpc GetEnvironmentHistory(GetEnvironmentHistoryRequest)
+      returns (EnvironmentHistory) {
     option (google.api.http) = {
       get: "/v2/{parent=projects/*/agent/environments/*}/history"
       additional_bindings {
@@ -189,16 +192,18 @@ message Environment {
     }
   ];
 
-  // Output only. The state of this environment. This field is read-only, i.e., it cannot be
-  // set by create and update methods.
+  // Output only. The state of this environment. This field is read-only, i.e.,
+  // it cannot be set by create and update methods.
   State state = 4 [(google.api.field_behavior) = OUTPUT_ONLY];
 
-  // Output only. The last update time of this environment. This field is read-only, i.e., it
-  // cannot be set by create and update methods.
-  google.protobuf.Timestamp update_time = 5 [(google.api.field_behavior) = OUTPUT_ONLY];
+  // Output only. The last update time of this environment. This field is
+  // read-only, i.e., it cannot be set by create and update methods.
+  google.protobuf.Timestamp update_time = 5
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Optional. Text to speech settings for this environment.
-  TextToSpeechSettings text_to_speech_settings = 7 [(google.api.field_behavior) = OPTIONAL];
+  TextToSpeechSettings text_to_speech_settings = 7
+      [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. The fulfillment settings to use for this environment.
   Fulfillment fulfillment = 8 [(google.api.field_behavior) = OPTIONAL];
@@ -206,27 +211,30 @@ message Environment {
 
 // Instructs the speech synthesizer on how to generate the output audio content.
 message TextToSpeechSettings {
-  // Optional. Indicates whether text to speech is enabled. Even when this field is false,
-  // other settings in this proto are still retained.
+  // Optional. Indicates whether text to speech is enabled. Even when this field
+  // is false, other settings in this proto are still retained.
   bool enable_text_to_speech = 1 [(google.api.field_behavior) = OPTIONAL];
 
   // Required. Audio encoding of the synthesized audio content.
-  OutputAudioEncoding output_audio_encoding = 2 [(google.api.field_behavior) = REQUIRED];
-
-  // Optional. The synthesis sample rate (in hertz) for this audio. If not provided, then
-  // the synthesizer will use the default sample rate based on the audio
-  // encoding. If this is different from the voice's natural sample rate, then
-  // the synthesizer will honor this request by converting to the desired sample
-  // rate (which might result in worse audio quality).
+  OutputAudioEncoding output_audio_encoding = 2
+      [(google.api.field_behavior) = REQUIRED];
+
+  // Optional. The synthesis sample rate (in hertz) for this audio. If not
+  // provided, then the synthesizer will use the default sample rate based on
+  // the audio encoding. If this is different from the voice's natural sample
+  // rate, then the synthesizer will honor this request by converting to the
+  // desired sample rate (which might result in worse audio quality).
   int32 sample_rate_hertz = 3 [(google.api.field_behavior) = OPTIONAL];
 
-  // Optional. Configuration of how speech should be synthesized, mapping from language
-  // (https://cloud.google.com/dialogflow/docs/reference/language) to
+  // Optional. Configuration of how speech should be synthesized, mapping from
+  // language (https://cloud.google.com/dialogflow/docs/reference/language) to
   // SynthesizeSpeechConfig.
-  map<string, SynthesizeSpeechConfig> synthesize_speech_configs = 4 [(google.api.field_behavior) = OPTIONAL];
+  map<string, SynthesizeSpeechConfig> synthesize_speech_configs = 4
+      [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The request message for [Environments.ListEnvironments][google.cloud.dialogflow.v2.Environments.ListEnvironments].
+// The request message for
+// [Environments.ListEnvironments][google.cloud.dialogflow.v2.Environments.ListEnvironments].
 message ListEnvironmentsRequest {
   // Required. The agent to list all environments from.
   // Format:
@@ -240,15 +248,16 @@ message ListEnvironmentsRequest {
     }
   ];
 
-  // Optional. The maximum number of items to return in a single page. By default 100 and
-  // at most 1000.
+  // Optional. The maximum number of items to return in a single page. By
+  // default 100 and at most 1000.
   int32 page_size = 2 [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. The next_page_token value returned from a previous list request.
   string page_token = 3 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The response message for [Environments.ListEnvironments][google.cloud.dialogflow.v2.Environments.ListEnvironments].
+// The response message for
+// [Environments.ListEnvironments][google.cloud.dialogflow.v2.Environments.ListEnvironments].
 message ListEnvironmentsResponse {
   // The list of agent environments. There will be a maximum number of items
   // returned based on the page_size field in the request.
@@ -259,7 +268,8 @@ message ListEnvironmentsResponse {
   string next_page_token = 2;
 }
 
-// The request message for [Environments.GetEnvironment][google.cloud.dialogflow.v2.Environments.GetEnvironment].
+// The request message for
+// [Environments.GetEnvironment][google.cloud.dialogflow.v2.Environments.GetEnvironment].
 message GetEnvironmentRequest {
   // Required. The name of the environment.
   // Supported formats:
@@ -277,7 +287,8 @@ message GetEnvironmentRequest {
   ];
 }
 
-// The request message for [Environments.CreateEnvironment][google.cloud.dialogflow.v2.Environments.CreateEnvironment].
+// The request message for
+// [Environments.CreateEnvironment][google.cloud.dialogflow.v2.Environments.CreateEnvironment].
 message CreateEnvironmentRequest {
   // Required. The agent to create an environment for.
   // Supported formats:
@@ -298,22 +309,26 @@ message CreateEnvironmentRequest {
   string environment_id = 3 [(google.api.field_behavior) = REQUIRED];
 }
 
-// The request message for [Environments.UpdateEnvironment][google.cloud.dialogflow.v2.Environments.UpdateEnvironment].
+// The request message for
+// [Environments.UpdateEnvironment][google.cloud.dialogflow.v2.Environments.UpdateEnvironment].
 message UpdateEnvironmentRequest {
   // Required. The environment to update.
   Environment environment = 1 [(google.api.field_behavior) = REQUIRED];
 
   // Required. The mask to control which fields get updated.
-  google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED];
+  google.protobuf.FieldMask update_mask = 2
+      [(google.api.field_behavior) = REQUIRED];
 
   // Optional. This field is used to prevent accidental overwrite of the default
   // environment, which is an operation that cannot be undone. To confirm that
   // the caller desires this overwrite, this field must be explicitly set to
   // true when updating the default environment (environment ID = `-`).
-  bool allow_load_to_draft_and_discard_changes = 3 [(google.api.field_behavior) = OPTIONAL];
+  bool allow_load_to_draft_and_discard_changes = 3
+      [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The request message for [Environments.DeleteEnvironment][google.cloud.dialogflow.v2.Environments.DeleteEnvironment].
+// The request message for
+// [Environments.DeleteEnvironment][google.cloud.dialogflow.v2.Environments.DeleteEnvironment].
 message DeleteEnvironmentRequest {
   // Required. The name of the environment to delete.
   // / Format:
@@ -331,7 +346,8 @@ message DeleteEnvironmentRequest {
   ];
 }
 
-// The request message for [Environments.GetEnvironmentHistory][google.cloud.dialogflow.v2.Environments.GetEnvironmentHistory].
+// The request message for
+// [Environments.GetEnvironmentHistory][google.cloud.dialogflow.v2.Environments.GetEnvironmentHistory].
 message GetEnvironmentHistoryRequest {
   // Required. The name of the environment to retrieve history for.
   // Supported formats:
@@ -348,15 +364,16 @@ message GetEnvironmentHistoryRequest {
     }
   ];
 
-  // Optional. The maximum number of items to return in a single page. By default 100 and
-  // at most 1000.
+  // Optional. The maximum number of items to return in a single page. By
+  // default 100 and at most 1000.
   int32 page_size = 2 [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. The next_page_token value returned from a previous list request.
   string page_token = 3 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The response message for [Environments.GetEnvironmentHistory][google.cloud.dialogflow.v2.Environments.GetEnvironmentHistory].
+// The response message for
+// [Environments.GetEnvironmentHistory][google.cloud.dialogflow.v2.Environments.GetEnvironmentHistory].
 message EnvironmentHistory {
   // Represents an environment history entry.
   message Entry {
@@ -380,11 +397,11 @@ message EnvironmentHistory {
   // The environment ID for the default environment is `-`.
   string parent = 1 [(google.api.field_behavior) = OUTPUT_ONLY];
 
-  // Output only. The list of agent environments. There will be a maximum number of items
-  // returned based on the page_size field in the request.
+  // Output only. The list of agent environments. There will be a maximum number
+  // of items returned based on the page_size field in the request.
   repeated Entry entries = 2 [(google.api.field_behavior) = OUTPUT_ONLY];
 
-  // Output only. Token to retrieve the next page of results, or empty if there are no
-  // more results in the list.
+  // Output only. Token to retrieve the next page of results, or empty if there
+  // are no more results in the list.
   string next_page_token = 3 [(google.api.field_behavior) = OUTPUT_ONLY];
 }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/fulfillment.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/fulfillment.proto
index b1103fe41c03..f704eb080c55 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/fulfillment.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/fulfillment.proto
@@ -24,7 +24,7 @@ import "google/protobuf/field_mask.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "FulfillmentProto";
 option java_package = "com.google.cloud.dialogflow.v2";
@@ -98,18 +98,18 @@ message Fulfillment {
     // Optional. The password for HTTP Basic authentication.
     string password = 3 [(google.api.field_behavior) = OPTIONAL];
 
-    // Optional. The HTTP request headers to send together with fulfillment requests.
-    map<string, string> request_headers = 4 [(google.api.field_behavior) = OPTIONAL];
+    // Optional. The HTTP request headers to send together with fulfillment
+    // requests.
+    map<string, string> request_headers = 4
+        [(google.api.field_behavior) = OPTIONAL];
 
-    // Optional. Indicates if generic web service is created through Cloud Functions
-    // integration. Defaults to false.
+    // Optional. Indicates if generic web service is created through Cloud
+    // Functions integration. Defaults to false.
     //
     // is_cloud_function is deprecated. Cloud functions can be configured by
     // its uri as a regular web service now.
-    bool is_cloud_function = 5 [
-      deprecated = true,
-      (google.api.field_behavior) = OPTIONAL
-    ];
+    bool is_cloud_function = 5
+        [deprecated = true, (google.api.field_behavior) = OPTIONAL];
   }
 
   // Whether fulfillment is enabled for the specific feature.
@@ -136,7 +136,8 @@ message Fulfillment {
   // This field is not used for Fulfillment in an Environment.
   string name = 1 [(google.api.field_behavior) = REQUIRED];
 
-  // Optional. The human-readable name of the fulfillment, unique within the agent.
+  // Optional. The human-readable name of the fulfillment, unique within the
+  // agent.
   //
   // This field is not used for Fulfillment in an Environment.
   string display_name = 2 [(google.api.field_behavior) = OPTIONAL];
@@ -150,11 +151,13 @@ message Fulfillment {
   // Optional. Whether fulfillment is enabled.
   bool enabled = 4 [(google.api.field_behavior) = OPTIONAL];
 
-  // Optional. The field defines whether the fulfillment is enabled for certain features.
+  // Optional. The field defines whether the fulfillment is enabled for certain
+  // features.
   repeated Feature features = 5 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The request message for [Fulfillments.GetFulfillment][google.cloud.dialogflow.v2.Fulfillments.GetFulfillment].
+// The request message for
+// [Fulfillments.GetFulfillment][google.cloud.dialogflow.v2.Fulfillments.GetFulfillment].
 message GetFulfillmentRequest {
   // Required. The name of the fulfillment.
   // Format: `projects/<Project ID>/agent/fulfillment`.
@@ -166,12 +169,14 @@ message GetFulfillmentRequest {
   ];
 }
 
-// The request message for [Fulfillments.UpdateFulfillment][google.cloud.dialogflow.v2.Fulfillments.UpdateFulfillment].
+// The request message for
+// [Fulfillments.UpdateFulfillment][google.cloud.dialogflow.v2.Fulfillments.UpdateFulfillment].
 message UpdateFulfillmentRequest {
   // Required. The fulfillment to update.
   Fulfillment fulfillment = 1 [(google.api.field_behavior) = REQUIRED];
 
   // Required. The mask to control which fields get updated. If the mask is not
   // present, all fields will be updated.
-  google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED];
+  google.protobuf.FieldMask update_mask = 2
+      [(google.api.field_behavior) = REQUIRED];
 }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/gcs.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/gcs.proto
index 6ac9886df900..e77c36fa383a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/gcs.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/gcs.proto
@@ -20,7 +20,7 @@ import "google/api/field_behavior.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "GcsProto";
 option java_package = "com.google.cloud.dialogflow.v2";
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/human_agent_assistant_event.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/human_agent_assistant_event.proto
index 0bae8f6834e0..648db664397f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/human_agent_assistant_event.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/human_agent_assistant_event.proto
@@ -20,7 +20,7 @@ import "google/cloud/dialogflow/v2/participant.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "HumanAgentAssistantEventProto";
 option java_package = "com.google.cloud.dialogflow.v2";
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/intent.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/intent.proto
index e28e0d312a3a..fee08d2dd549 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/intent.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/intent.proto
@@ -28,7 +28,7 @@ import "google/protobuf/struct.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "IntentProto";
 option java_package = "com.google.cloud.dialogflow.v2";
@@ -130,12 +130,14 @@ service Intents {
   //
   // - `metadata`: An empty [Struct
   //   message](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#struct)
-  // - `response`: [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2.BatchUpdateIntentsResponse]
+  // - `response`:
+  // [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2.BatchUpdateIntentsResponse]
   //
   // Note: You should always train an agent prior to sending it queries. See the
   // [training
   // documentation](https://cloud.google.com/dialogflow/es/docs/training).
-  rpc BatchUpdateIntents(BatchUpdateIntentsRequest) returns (google.longrunning.Operation) {
+  rpc BatchUpdateIntents(BatchUpdateIntentsRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{parent=projects/*/agent}/intents:batchUpdate"
       body: "*"
@@ -166,7 +168,8 @@ service Intents {
   // Note: You should always train an agent prior to sending it queries. See the
   // [training
   // documentation](https://cloud.google.com/dialogflow/es/docs/training).
-  rpc BatchDeleteIntents(BatchDeleteIntentsRequest) returns (google.longrunning.Operation) {
+  rpc BatchDeleteIntents(BatchDeleteIntentsRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{parent=projects/*/agent}/intents:batchDelete"
       body: "*"
@@ -269,7 +272,9 @@ message Intent {
     // so the training phrase is well formatted when the parts are concatenated.
     //
     // If the training phrase does not need to be annotated with parameters,
-    // you just need a single part with only the [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text] field set.
+    // you just need a single part with only the
+    // [Part.text][google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.text]
+    // field set.
     //
     // If you want to annotate the training phrase, you must create multiple
     // parts, where the fields of each part are populated in one of two ways:
@@ -312,7 +317,8 @@ message Intent {
     // Optional. The name of the entity type, prefixed with `@`, that
     // describes values of the parameter. If the parameter is
     // required, this must be provided.
-    string entity_type_display_name = 5 [(google.api.field_behavior) = OPTIONAL];
+    string entity_type_display_name = 5
+        [(google.api.field_behavior) = OPTIONAL];
 
     // Optional. Indicates whether the parameter is required. That is,
     // whether the intent cannot be completed without collecting the parameter
@@ -391,7 +397,8 @@ message Intent {
       string title = 1 [(google.api.field_behavior) = OPTIONAL];
 
       // Optional. The collection of quick replies.
-      repeated string quick_replies = 2 [(google.api.field_behavior) = OPTIONAL];
+      repeated string quick_replies = 2
+          [(google.api.field_behavior) = OPTIONAL];
     }
 
     // The card response message.
@@ -440,7 +447,8 @@ message Intent {
     // `SimpleResponse`.
     message SimpleResponses {
       // Required. The list of simple responses.
-      repeated SimpleResponse simple_responses = 1 [(google.api.field_behavior) = REQUIRED];
+      repeated SimpleResponse simple_responses = 1
+          [(google.api.field_behavior) = REQUIRED];
     }
 
     // The basic card message. Useful for displaying information.
@@ -457,7 +465,8 @@ message Intent {
         string title = 1;
 
         // Required. Action to take when a user taps on the button.
-        OpenUriAction open_uri_action = 2 [(google.api.field_behavior) = REQUIRED];
+        OpenUriAction open_uri_action = 2
+            [(google.api.field_behavior) = REQUIRED];
       }
 
       // Optional. The title of the card.
@@ -486,7 +495,8 @@ message Intent {
     // The collection of suggestions.
     message Suggestions {
       // Required. The list of suggested replies.
-      repeated Suggestion suggestions = 1 [(google.api.field_behavior) = REQUIRED];
+      repeated Suggestion suggestions = 1
+          [(google.api.field_behavior) = REQUIRED];
     }
 
     // The suggestion chip message that allows the user to jump out to the app
@@ -624,7 +634,8 @@ message Intent {
 
           // Optional. Specifies the type of viewer that is used when opening
           // the URL. Defaults to opening via web browser.
-          UrlTypeHint url_type_hint = 3 [(google.api.field_behavior) = OPTIONAL];
+          UrlTypeHint url_type_hint = 3
+              [(google.api.field_behavior) = OPTIONAL];
         }
 
         // Required. Action to present to the user.
@@ -680,7 +691,8 @@ message Intent {
 
       // Optional. Settings for displaying the image. Applies to every image in
       // [items][google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard.items].
-      ImageDisplayOptions image_display_options = 2 [(google.api.field_behavior) = OPTIONAL];
+      ImageDisplayOptions image_display_options = 2
+          [(google.api.field_behavior) = OPTIONAL];
     }
 
     // Table card for Actions on Google.
@@ -695,16 +707,19 @@ message Intent {
       Image image = 3 [(google.api.field_behavior) = OPTIONAL];
 
       // Optional. Display properties for the columns in this table.
-      repeated ColumnProperties column_properties = 4 [(google.api.field_behavior) = OPTIONAL];
+      repeated ColumnProperties column_properties = 4
+          [(google.api.field_behavior) = OPTIONAL];
 
       // Optional. Rows in this table of data.
       repeated TableCardRow rows = 5 [(google.api.field_behavior) = OPTIONAL];
 
       // Optional. List of buttons for the card.
-      repeated BasicCard.Button buttons = 6 [(google.api.field_behavior) = OPTIONAL];
+      repeated BasicCard.Button buttons = 6
+          [(google.api.field_behavior) = OPTIONAL];
     }
 
-    // Column properties for [TableCard][google.cloud.dialogflow.v2.Intent.Message.TableCard].
+    // Column properties for
+    // [TableCard][google.cloud.dialogflow.v2.Intent.Message.TableCard].
     message ColumnProperties {
       // Text alignments within a cell.
       enum HorizontalAlignment {
@@ -725,7 +740,8 @@ message Intent {
       string header = 1;
 
       // Optional. Defines text alignment for all cells in this column.
-      HorizontalAlignment horizontal_alignment = 2 [(google.api.field_behavior) = OPTIONAL];
+      HorizontalAlignment horizontal_alignment = 2
+          [(google.api.field_behavior) = OPTIONAL];
     }
 
     // Row of [TableCard][google.cloud.dialogflow.v2.Intent.Message.TableCard].
@@ -737,7 +753,8 @@ message Intent {
       bool divider_after = 2 [(google.api.field_behavior) = OPTIONAL];
     }
 
-    // Cell of [TableCardRow][google.cloud.dialogflow.v2.Intent.Message.TableCardRow].
+    // Cell of
+    // [TableCardRow][google.cloud.dialogflow.v2.Intent.Message.TableCardRow].
     message TableCardCell {
       // Required. Text in this cell.
       string text = 1;
@@ -804,7 +821,9 @@ message Intent {
   }
 
   // Optional. The unique identifier of this intent.
-  // Required for [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent] and [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents]
+  // Required for
+  // [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent] and
+  // [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents]
   // methods.
   // Format: `projects/<Project ID>/agent/intents/<Intent ID>`.
   string name = 1 [(google.api.field_behavior) = OPTIONAL];
@@ -848,7 +867,8 @@ message Intent {
   // Optional. The list of context names required for this intent to be
   // triggered.
   // Format: `projects/<Project ID>/agent/sessions/-/contexts/<Context ID>`.
-  repeated string input_context_names = 7 [(google.api.field_behavior) = OPTIONAL];
+  repeated string input_context_names = 7
+      [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. The collection of event names that trigger the intent.
   // If the collection of input contexts is not empty, all of the contexts must
@@ -858,7 +878,8 @@ message Intent {
 
   // Optional. The collection of examples that the agent is
   // trained on.
-  repeated TrainingPhrase training_phrases = 9 [(google.api.field_behavior) = OPTIONAL];
+  repeated TrainingPhrase training_phrases = 9
+      [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. The name of the action associated with the intent.
   // Note: The action name must not contain whitespaces.
@@ -869,7 +890,8 @@ message Intent {
   // parameters field. Setting the `lifespan_count` to 0 will reset the context
   // when the intent is matched.
   // Format: `projects/<Project ID>/agent/sessions/-/contexts/<Context ID>`.
-  repeated Context output_contexts = 11 [(google.api.field_behavior) = OPTIONAL];
+  repeated Context output_contexts = 11
+      [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. Indicates whether to delete all contexts in the current
   // session when this intent is matched.
@@ -884,7 +906,8 @@ message Intent {
 
   // Optional. The list of platforms for which the first responses will be
   // copied from the messages in PLATFORM_UNSPECIFIED (i.e. default platform).
-  repeated Message.Platform default_response_platforms = 15 [(google.api.field_behavior) = OPTIONAL];
+  repeated Message.Platform default_response_platforms = 15
+      [(google.api.field_behavior) = OPTIONAL];
 
   // Output only.
   // Read-only. The unique identifier of the root intent in the chain of
@@ -892,24 +915,29 @@ message Intent {
   // this intent. We populate this field only in the output.
   //
   // Format: `projects/<Project ID>/agent/intents/<Intent ID>`.
-  string root_followup_intent_name = 16 [(google.api.field_behavior) = OUTPUT_ONLY];
+  string root_followup_intent_name = 16
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Read-only after creation. The unique identifier of the parent intent in the
   // chain of followup intents. You can set this field when creating an intent,
-  // for example with [CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent] or
-  // [BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents], in order to make this
-  // intent a followup intent.
+  // for example with
+  // [CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent] or
+  // [BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents],
+  // in order to make this intent a followup intent.
   //
   // It identifies the parent followup intent.
   // Format: `projects/<Project ID>/agent/intents/<Intent ID>`.
   string parent_followup_intent_name = 17;
 
-  // Output only. Read-only. Information about all followup intents that have this intent as
-  // a direct or indirect parent. We populate this field only in the output.
-  repeated FollowupIntentInfo followup_intent_info = 18 [(google.api.field_behavior) = OUTPUT_ONLY];
+  // Output only. Read-only. Information about all followup intents that have
+  // this intent as a direct or indirect parent. We populate this field only in
+  // the output.
+  repeated FollowupIntentInfo followup_intent_info = 18
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 }
 
-// The request message for [Intents.ListIntents][google.cloud.dialogflow.v2.Intents.ListIntents].
+// The request message for
+// [Intents.ListIntents][google.cloud.dialogflow.v2.Intents.ListIntents].
 message ListIntentsRequest {
   // Required. The agent to list all intents from.
   // Format: `projects/<Project ID>/agent` or `projects/<Project
@@ -946,7 +974,8 @@ message ListIntentsRequest {
   string page_token = 5 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The response message for [Intents.ListIntents][google.cloud.dialogflow.v2.Intents.ListIntents].
+// The response message for
+// [Intents.ListIntents][google.cloud.dialogflow.v2.Intents.ListIntents].
 message ListIntentsResponse {
   // The list of agent intents. There will be a maximum number of items
   // returned based on the page_size field in the request.
@@ -957,7 +986,8 @@ message ListIntentsResponse {
   string next_page_token = 2;
 }
 
-// The request message for [Intents.GetIntent][google.cloud.dialogflow.v2.Intents.GetIntent].
+// The request message for
+// [Intents.GetIntent][google.cloud.dialogflow.v2.Intents.GetIntent].
 message GetIntentRequest {
   // Required. The name of the intent.
   // Format: `projects/<Project ID>/agent/intents/<Intent ID>`.
@@ -979,7 +1009,8 @@ message GetIntentRequest {
   IntentView intent_view = 3 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The request message for [Intents.CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent].
+// The request message for
+// [Intents.CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent].
 message CreateIntentRequest {
   // Required. The agent to create a intent for.
   // Format: `projects/<Project ID>/agent`.
@@ -1004,7 +1035,8 @@ message CreateIntentRequest {
   IntentView intent_view = 4 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The request message for [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent].
+// The request message for
+// [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent].
 message UpdateIntentRequest {
   // Required. The intent to update.
   Intent intent = 1 [(google.api.field_behavior) = REQUIRED];
@@ -1017,13 +1049,15 @@ message UpdateIntentRequest {
   string language_code = 2 [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. The mask to control which fields get updated.
-  google.protobuf.FieldMask update_mask = 3 [(google.api.field_behavior) = OPTIONAL];
+  google.protobuf.FieldMask update_mask = 3
+      [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. The resource view to apply to the returned intent.
   IntentView intent_view = 4 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The request message for [Intents.DeleteIntent][google.cloud.dialogflow.v2.Intents.DeleteIntent].
+// The request message for
+// [Intents.DeleteIntent][google.cloud.dialogflow.v2.Intents.DeleteIntent].
 message DeleteIntentRequest {
   // Required. The name of the intent to delete. If this intent has direct or
   // indirect followup intents, we also delete them.
@@ -1065,19 +1099,22 @@ message BatchUpdateIntentsRequest {
   string language_code = 4 [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. The mask to control which fields get updated.
-  google.protobuf.FieldMask update_mask = 5 [(google.api.field_behavior) = OPTIONAL];
+  google.protobuf.FieldMask update_mask = 5
+      [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. The resource view to apply to the returned intent.
   IntentView intent_view = 6 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The response message for [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents].
+// The response message for
+// [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents].
 message BatchUpdateIntentsResponse {
   // The collection of updated or created intents.
   repeated Intent intents = 1;
 }
 
-// The request message for [Intents.BatchDeleteIntents][google.cloud.dialogflow.v2.Intents.BatchDeleteIntents].
+// The request message for
+// [Intents.BatchDeleteIntents][google.cloud.dialogflow.v2.Intents.BatchDeleteIntents].
 message BatchDeleteIntentsRequest {
   // Required. The name of the agent to delete all entities types for. Format:
   // `projects/<Project ID>/agent`.
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/knowledge_base.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/knowledge_base.proto
index 4f047e2ecded..c119b829f631 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/knowledge_base.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/knowledge_base.proto
@@ -25,13 +25,14 @@ import "google/protobuf/field_mask.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "KnowledgeBaseProto";
 option java_package = "com.google.cloud.dialogflow.v2";
 option objc_class_prefix = "DF";
 
-// Service for managing [KnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBase].
+// Service for managing
+// [KnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBase].
 service KnowledgeBases {
   option (google.api.default_host) = "dialogflow.googleapis.com";
   option (google.api.oauth_scopes) =
@@ -39,7 +40,8 @@ service KnowledgeBases {
       "https://www.googleapis.com/auth/dialogflow";
 
   // Returns the list of all knowledge bases of the specified agent.
-  rpc ListKnowledgeBases(ListKnowledgeBasesRequest) returns (ListKnowledgeBasesResponse) {
+  rpc ListKnowledgeBases(ListKnowledgeBasesRequest)
+      returns (ListKnowledgeBasesResponse) {
     option (google.api.http) = {
       get: "/v2/{parent=projects/*}/knowledgeBases"
       additional_bindings {
@@ -84,7 +86,8 @@ service KnowledgeBases {
   }
 
   // Deletes the specified knowledge base.
-  rpc DeleteKnowledgeBase(DeleteKnowledgeBaseRequest) returns (google.protobuf.Empty) {
+  rpc DeleteKnowledgeBase(DeleteKnowledgeBaseRequest)
+      returns (google.protobuf.Empty) {
     option (google.api.http) = {
       delete: "/v2/{name=projects/*/knowledgeBases/*}"
       additional_bindings {
@@ -148,7 +151,8 @@ message KnowledgeBase {
   string language_code = 4;
 }
 
-// Request message for [KnowledgeBases.ListKnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBases.ListKnowledgeBases].
+// Request message for
+// [KnowledgeBases.ListKnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBases.ListKnowledgeBases].
 message ListKnowledgeBasesRequest {
   // Required. The project to list of knowledge bases for.
   // Format: `projects/<Project ID>/locations/<Location ID>`.
@@ -195,7 +199,8 @@ message ListKnowledgeBasesRequest {
   string filter = 4;
 }
 
-// Response message for [KnowledgeBases.ListKnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBases.ListKnowledgeBases].
+// Response message for
+// [KnowledgeBases.ListKnowledgeBases][google.cloud.dialogflow.v2.KnowledgeBases.ListKnowledgeBases].
 message ListKnowledgeBasesResponse {
   // The list of knowledge bases.
   repeated KnowledgeBase knowledge_bases = 1;
@@ -205,7 +210,8 @@ message ListKnowledgeBasesResponse {
   string next_page_token = 2;
 }
 
-// Request message for [KnowledgeBases.GetKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.GetKnowledgeBase].
+// Request message for
+// [KnowledgeBases.GetKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.GetKnowledgeBase].
 message GetKnowledgeBaseRequest {
   // Required. The name of the knowledge base to retrieve.
   // Format `projects/<Project ID>/locations/<Location
@@ -218,7 +224,8 @@ message GetKnowledgeBaseRequest {
   ];
 }
 
-// Request message for [KnowledgeBases.CreateKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.CreateKnowledgeBase].
+// Request message for
+// [KnowledgeBases.CreateKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.CreateKnowledgeBase].
 message CreateKnowledgeBaseRequest {
   // Required. The project to create a knowledge base for.
   // Format: `projects/<Project ID>/locations/<Location ID>`.
@@ -233,7 +240,8 @@ message CreateKnowledgeBaseRequest {
   KnowledgeBase knowledge_base = 2 [(google.api.field_behavior) = REQUIRED];
 }
 
-// Request message for [KnowledgeBases.DeleteKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.DeleteKnowledgeBase].
+// Request message for
+// [KnowledgeBases.DeleteKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.DeleteKnowledgeBase].
 message DeleteKnowledgeBaseRequest {
   // Required. The name of the knowledge base to delete.
   // Format: `projects/<Project ID>/locations/<Location
@@ -250,7 +258,8 @@ message DeleteKnowledgeBaseRequest {
   bool force = 2 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// Request message for [KnowledgeBases.UpdateKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.UpdateKnowledgeBase].
+// Request message for
+// [KnowledgeBases.UpdateKnowledgeBase][google.cloud.dialogflow.v2.KnowledgeBases.UpdateKnowledgeBase].
 message UpdateKnowledgeBaseRequest {
   // Required. The knowledge base to update.
   KnowledgeBase knowledge_base = 1 [(google.api.field_behavior) = REQUIRED];
@@ -258,5 +267,6 @@ message UpdateKnowledgeBaseRequest {
   // Optional. Not specified means `update all`.
   // Currently, only `display_name` can be updated, an InvalidArgument will be
   // returned for attempting to update other fields.
-  google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = OPTIONAL];
+  google.protobuf.FieldMask update_mask = 2
+      [(google.api.field_behavior) = OPTIONAL];
 }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/participant.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/participant.proto
index f6b385077de6..8a1b969b5456 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/participant.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/participant.proto
@@ -29,7 +29,7 @@ import "google/rpc/status.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "ParticipantProto";
 option java_package = "com.google.cloud.dialogflow.v2";
@@ -67,7 +67,8 @@ service Participants {
   }
 
   // Returns the list of all participants in the specified conversation.
-  rpc ListParticipants(ListParticipantsRequest) returns (ListParticipantsResponse) {
+  rpc ListParticipants(ListParticipantsRequest)
+      returns (ListParticipantsResponse) {
     option (google.api.http) = {
       get: "/v2/{parent=projects/*/conversations/*}/participants"
       additional_bindings {
@@ -124,12 +125,13 @@ service Participants {
   // Note: Always use agent versions for production traffic
   // sent to virtual agents. See [Versions and
   // environments](https://cloud.google.com/dialogflow/es/docs/agents-versions).
-  rpc StreamingAnalyzeContent(stream StreamingAnalyzeContentRequest) returns (stream StreamingAnalyzeContentResponse) {
-  }
+  rpc StreamingAnalyzeContent(stream StreamingAnalyzeContentRequest)
+      returns (stream StreamingAnalyzeContentResponse) {}
 
   // Gets suggested articles for a participant based on specific historical
   // messages.
-  rpc SuggestArticles(SuggestArticlesRequest) returns (SuggestArticlesResponse) {
+  rpc SuggestArticles(SuggestArticlesRequest)
+      returns (SuggestArticlesResponse) {
     option (google.api.http) = {
       post: "/v2/{parent=projects/*/conversations/*/participants/*}/suggestions:suggestArticles"
       body: "*"
@@ -143,7 +145,8 @@ service Participants {
 
   // Gets suggested faq answers for a participant based on specific historical
   // messages.
-  rpc SuggestFaqAnswers(SuggestFaqAnswersRequest) returns (SuggestFaqAnswersResponse) {
+  rpc SuggestFaqAnswers(SuggestFaqAnswersRequest)
+      returns (SuggestFaqAnswersResponse) {
     option (google.api.http) = {
       post: "/v2/{parent=projects/*/conversations/*/participants/*}/suggestions:suggestFaqAnswers"
       body: "*"
@@ -157,7 +160,8 @@ service Participants {
 
   // Gets smart replies for a participant based on specific historical
   // messages.
-  rpc SuggestSmartReplies(SuggestSmartRepliesRequest) returns (SuggestSmartRepliesResponse) {
+  rpc SuggestSmartReplies(SuggestSmartRepliesRequest)
+      returns (SuggestSmartRepliesResponse) {
     option (google.api.http) = {
       post: "/v2/{parent=projects/*/conversations/*/participants/*}/suggestions:suggestSmartReplies"
       body: "*"
@@ -199,8 +203,8 @@ message Participant {
   // ID>/conversations/<Conversation ID>/participants/<Participant ID>`.
   string name = 1 [(google.api.field_behavior) = OPTIONAL];
 
-  // Immutable. The role this participant plays in the conversation. This field must be set
-  // during participant creation and is then immutable.
+  // Immutable. The role this participant plays in the conversation. This field
+  // must be set during participant creation and is then immutable.
   Role role = 2 [(google.api.field_behavior) = IMMUTABLE];
 
   // Optional. Label applied to streams representing this participant in SIPREC
@@ -208,22 +212,27 @@ message Participant {
   // media stream to this participant. This field can be updated.
   string sip_recording_media_label = 6 [(google.api.field_behavior) = OPTIONAL];
 
-  // Optional. Obfuscated user id that should be associated with the created participant.
+  // Optional. Obfuscated user id that should be associated with the created
+  // participant.
   //
   // You can specify a user id as follows:
   //
   // 1. If you set this field in
-  //    [CreateParticipantRequest][google.cloud.dialogflow.v2.CreateParticipantRequest.participant] or
+  //    [CreateParticipantRequest][google.cloud.dialogflow.v2.CreateParticipantRequest.participant]
+  //    or
   //    [UpdateParticipantRequest][google.cloud.dialogflow.v2.UpdateParticipantRequest.participant],
   //    Dialogflow adds the obfuscated user id with the participant.
   //
   // 2. If you set this field in
-  //    [AnalyzeContent][google.cloud.dialogflow.v2.AnalyzeContentRequest.obfuscated_external_user_id] or
+  //    [AnalyzeContent][google.cloud.dialogflow.v2.AnalyzeContentRequest.obfuscated_external_user_id]
+  //    or
   //    [StreamingAnalyzeContent][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.obfuscated_external_user_id],
-  //    Dialogflow will update [Participant.obfuscated_external_user_id][google.cloud.dialogflow.v2.Participant.obfuscated_external_user_id].
+  //    Dialogflow will update
+  //    [Participant.obfuscated_external_user_id][google.cloud.dialogflow.v2.Participant.obfuscated_external_user_id].
   //
   // Dialogflow returns an error if you try to add a user id for a
-  // non-[END_USER][google.cloud.dialogflow.v2.Participant.Role.END_USER] participant.
+  // non-[END_USER][google.cloud.dialogflow.v2.Participant.Role.END_USER]
+  // participant.
   //
   // Dialogflow uses this user id for billing and measurement purposes. For
   // example, Dialogflow determines whether a user in one conversation returned
@@ -236,11 +245,13 @@ message Participant {
   // * Dialogflow only accepts a UTF-8 encoded string, e.g., a hex digest of a
   //   hash function like SHA-512.
   // * The length of the user id must be <= 256 characters.
-  string obfuscated_external_user_id = 7 [(google.api.field_behavior) = OPTIONAL];
+  string obfuscated_external_user_id = 7
+      [(google.api.field_behavior) = OPTIONAL];
 
-  // Optional. Key-value filters on the metadata of documents returned by article
-  // suggestion. If specified, article suggestion only returns suggested
-  // documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+  // Optional. Key-value filters on the metadata of documents returned by
+  // article suggestion. If specified, article suggestion only returns suggested
+  // documents that match all filters in their
+  // [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
   // values for a metadata key should be concatenated by comma. For example,
   // filters to match all documents that have 'US' or 'CA' in their market
   // metadata values and 'agent' in their user metadata values will be
@@ -254,7 +265,8 @@ message Participant {
   //   value: "agent"
   // }
   // ```
-  map<string, string> documents_metadata_filters = 8 [(google.api.field_behavior) = OPTIONAL];
+  map<string, string> documents_metadata_filters = 8
+      [(google.api.field_behavior) = OPTIONAL];
 }
 
 // Represents a message posted into a conversation.
@@ -282,22 +294,28 @@ message Message {
   string participant = 4 [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. The role of the participant.
-  Participant.Role participant_role = 5 [(google.api.field_behavior) = OUTPUT_ONLY];
+  Participant.Role participant_role = 5
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. The time when the message was created in Contact Center AI.
-  google.protobuf.Timestamp create_time = 6 [(google.api.field_behavior) = OUTPUT_ONLY];
+  google.protobuf.Timestamp create_time = 6
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Optional. The time when the message was sent.
-  google.protobuf.Timestamp send_time = 9 [(google.api.field_behavior) = OPTIONAL];
+  google.protobuf.Timestamp send_time = 9
+      [(google.api.field_behavior) = OPTIONAL];
 
   // Output only. The annotation for the message.
-  MessageAnnotation message_annotation = 7 [(google.api.field_behavior) = OUTPUT_ONLY];
+  MessageAnnotation message_annotation = 7
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. The sentiment analysis result for the message.
-  SentimentAnalysisResult sentiment_analysis = 8 [(google.api.field_behavior) = OUTPUT_ONLY];
+  SentimentAnalysisResult sentiment_analysis = 8
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 }
 
-// The request message for [Participants.CreateParticipant][google.cloud.dialogflow.v2.Participants.CreateParticipant].
+// The request message for
+// [Participants.CreateParticipant][google.cloud.dialogflow.v2.Participants.CreateParticipant].
 message CreateParticipantRequest {
   // Required. Resource identifier of the conversation adding the participant.
   // Format: `projects/<Project ID>/locations/<Location
@@ -313,7 +331,8 @@ message CreateParticipantRequest {
   Participant participant = 2 [(google.api.field_behavior) = REQUIRED];
 }
 
-// The request message for [Participants.GetParticipant][google.cloud.dialogflow.v2.Participants.GetParticipant].
+// The request message for
+// [Participants.GetParticipant][google.cloud.dialogflow.v2.Participants.GetParticipant].
 message GetParticipantRequest {
   // Required. The name of the participant. Format:
   // `projects/<Project ID>/locations/<Location ID>/conversations/<Conversation
@@ -326,7 +345,8 @@ message GetParticipantRequest {
   ];
 }
 
-// The request message for [Participants.ListParticipants][google.cloud.dialogflow.v2.Participants.ListParticipants].
+// The request message for
+// [Participants.ListParticipants][google.cloud.dialogflow.v2.Participants.ListParticipants].
 message ListParticipantsRequest {
   // Required. The conversation to list all participants from.
   // Format: `projects/<Project ID>/locations/<Location
@@ -346,7 +366,8 @@ message ListParticipantsRequest {
   string page_token = 3 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The response message for [Participants.ListParticipants][google.cloud.dialogflow.v2.Participants.ListParticipants].
+// The response message for
+// [Participants.ListParticipants][google.cloud.dialogflow.v2.Participants.ListParticipants].
 message ListParticipantsResponse {
   // The list of participants. There is a maximum number of items
   // returned based on the page_size field in the request.
@@ -357,16 +378,19 @@ message ListParticipantsResponse {
   string next_page_token = 2;
 }
 
-// The request message for [Participants.UpdateParticipant][google.cloud.dialogflow.v2.Participants.UpdateParticipant].
+// The request message for
+// [Participants.UpdateParticipant][google.cloud.dialogflow.v2.Participants.UpdateParticipant].
 message UpdateParticipantRequest {
   // Required. The participant to update.
   Participant participant = 1 [(google.api.field_behavior) = REQUIRED];
 
   // Required. The mask to specify which fields to update.
-  google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED];
+  google.protobuf.FieldMask update_mask = 2
+      [(google.api.field_behavior) = REQUIRED];
 }
 
-// The request message for [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent].
+// The request message for
+// [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent].
 message AnalyzeContentRequest {
   // Required. The name of the participant this text comes from.
   // Format: `projects/<Project ID>/locations/<Location
@@ -420,7 +444,8 @@ message DtmfParameters {
   bool accepts_dtmf_input = 1;
 }
 
-// The response message for [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent].
+// The response message for
+// [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent].
 message AnalyzeContentResponse {
   // The output text content.
   // This field is set if the automated agent responded with text to show to
@@ -443,14 +468,17 @@ message AnalyzeContentResponse {
   // Only set if a Dialogflow automated agent has responded.
   // Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
   // and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-  // are always empty, use [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio] instead.
+  // are always empty, use
+  // [reply_audio][google.cloud.dialogflow.v2.AnalyzeContentResponse.reply_audio]
+  // instead.
   AutomatedAgentReply automated_agent_reply = 3;
 
   // Message analyzed by CCAI.
   Message message = 5;
 
   // The suggestions for most recent human agent. The order is the same as
-  // [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+  // [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+  // of
   // [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
   //
   // Note that any failure of Agent Assist features will not lead to the overall
@@ -460,7 +488,8 @@ message AnalyzeContentResponse {
   repeated SuggestionResult human_agent_suggestion_results = 6;
 
   // The suggestions for end user. The order is the same as
-  // [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+  // [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+  // of
   // [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
   //
   // Same as human_agent_suggestion_results, any failure of Agent Assist
@@ -474,33 +503,41 @@ message AnalyzeContentResponse {
 }
 
 // The top-level message sent by the client to the
-// [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent] method.
+// [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent]
+// method.
 //
 // Multiple request messages should be sent in order:
 //
 // 1.  The first message must contain
 //     [participant][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.participant],
-//     [config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.config] and optionally
-//     [query_params][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.query_params]. If you want
-//     to receive an audio response, it should also contain
+//     [config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.config]
+//     and optionally
+//     [query_params][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.query_params].
+//     If you want to receive an audio response, it should also contain
 //     [reply_audio_config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.reply_audio_config].
 //     The message must not contain
 //     [input][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.input].
 //
-// 2.  If [config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.config] in the first message
-//     was set to [audio_config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.audio_config],
+// 2.  If
+// [config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.config] in
+// the first message
+//     was set to
+//     [audio_config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.audio_config],
 //     all subsequent messages must contain
-//     [input_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.input_audio] to continue
-//     with Speech recognition.
-//     However, note that:
+//     [input_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.input_audio]
+//     to continue with Speech recognition. However, note that:
 //
 //     * Dialogflow will bill you for the audio so far.
 //     * Dialogflow discards all Speech recognition results in favor of the
 //       text input.
 //
-//  3. If [StreamingAnalyzeContentRequest.config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.config] in the first message was set
-//    to [StreamingAnalyzeContentRequest.text_config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.text_config], then the second message
-//    must contain only [input_text][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.input_text].
+//  3. If
+//  [StreamingAnalyzeContentRequest.config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.config]
+//  in the first message was set
+//    to
+//    [StreamingAnalyzeContentRequest.text_config][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.text_config],
+//    then the second message must contain only
+//    [input_text][google.cloud.dialogflow.v2.StreamingAnalyzeContentRequest.input_text].
 //    Moreover, you must not send more than two messages.
 //
 //  After you sent all input, you must half-close or abort the request stream.
@@ -618,19 +655,23 @@ message StreamingAnalyzeContentResponse {
   // Only set if a Dialogflow automated agent has responded.
   // Note that: [AutomatedAgentReply.detect_intent_response.output_audio][]
   // and [AutomatedAgentReply.detect_intent_response.output_audio_config][]
-  // are always empty, use [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio] instead.
+  // are always empty, use
+  // [reply_audio][google.cloud.dialogflow.v2.StreamingAnalyzeContentResponse.reply_audio]
+  // instead.
   AutomatedAgentReply automated_agent_reply = 4;
 
   // Message analyzed by CCAI.
   Message message = 6;
 
   // The suggestions for most recent human agent. The order is the same as
-  // [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+  // [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+  // of
   // [HumanAgentAssistantConfig.human_agent_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.human_agent_suggestion_config].
   repeated SuggestionResult human_agent_suggestion_results = 7;
 
   // The suggestions for end user. The order is the same as
-  // [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs] of
+  // [HumanAgentAssistantConfig.SuggestionConfig.feature_configs][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionConfig.feature_configs]
+  // of
   // [HumanAgentAssistantConfig.end_user_suggestion_config][google.cloud.dialogflow.v2.HumanAgentAssistantConfig.end_user_suggestion_config].
   repeated SuggestionResult end_user_suggestion_results = 8;
 
@@ -638,7 +679,8 @@ message StreamingAnalyzeContentResponse {
   DtmfParameters dtmf_parameters = 10;
 }
 
-// The request message for [Participants.SuggestArticles][google.cloud.dialogflow.v2.Participants.SuggestArticles].
+// The request message for
+// [Participants.SuggestArticles][google.cloud.dialogflow.v2.Participants.SuggestArticles].
 message SuggestArticlesRequest {
   // Required. The name of the participant to fetch suggestion for.
   // Format: `projects/<Project ID>/locations/<Location
@@ -663,15 +705,17 @@ message SuggestArticlesRequest {
   ];
 
   // Optional. Max number of messages prior to and including
-  // [latest_message][google.cloud.dialogflow.v2.SuggestArticlesRequest.latest_message] to use as context
-  // when compiling the suggestion. By default 20 and at most 50.
+  // [latest_message][google.cloud.dialogflow.v2.SuggestArticlesRequest.latest_message]
+  // to use as context when compiling the suggestion. By default 20 and at
+  // most 50.
   int32 context_size = 3 [(google.api.field_behavior) = OPTIONAL];
 
   // Parameters for a human assist query.
   AssistQueryParameters assist_query_params = 4;
 }
 
-// The response message for [Participants.SuggestArticles][google.cloud.dialogflow.v2.Participants.SuggestArticles].
+// The response message for
+// [Participants.SuggestArticles][google.cloud.dialogflow.v2.Participants.SuggestArticles].
 message SuggestArticlesResponse {
   // Articles ordered by score in descending order.
   repeated ArticleAnswer article_answers = 1;
@@ -684,14 +728,16 @@ message SuggestArticlesResponse {
   string latest_message = 2;
 
   // Number of messages prior to and including
-  // [latest_message][google.cloud.dialogflow.v2.SuggestArticlesResponse.latest_message] to compile the
-  // suggestion. It may be smaller than the
-  // [SuggestArticlesRequest.context_size][google.cloud.dialogflow.v2.SuggestArticlesRequest.context_size] field in the request if there
-  // aren't that many messages in the conversation.
+  // [latest_message][google.cloud.dialogflow.v2.SuggestArticlesResponse.latest_message]
+  // to compile the suggestion. It may be smaller than the
+  // [SuggestArticlesRequest.context_size][google.cloud.dialogflow.v2.SuggestArticlesRequest.context_size]
+  // field in the request if there aren't that many messages in the
+  // conversation.
   int32 context_size = 3;
 }
 
-// The request message for [Participants.SuggestFaqAnswers][google.cloud.dialogflow.v2.Participants.SuggestFaqAnswers].
+// The request message for
+// [Participants.SuggestFaqAnswers][google.cloud.dialogflow.v2.Participants.SuggestFaqAnswers].
 message SuggestFaqAnswersRequest {
   // Required. The name of the participant to fetch suggestion for.
   // Format: `projects/<Project ID>/locations/<Location
@@ -724,7 +770,8 @@ message SuggestFaqAnswersRequest {
   AssistQueryParameters assist_query_params = 4;
 }
 
-// The request message for [Participants.SuggestFaqAnswers][google.cloud.dialogflow.v2.Participants.SuggestFaqAnswers].
+// The request message for
+// [Participants.SuggestFaqAnswers][google.cloud.dialogflow.v2.Participants.SuggestFaqAnswers].
 message SuggestFaqAnswersResponse {
   // Answers extracted from FAQ documents.
   repeated FaqAnswer faq_answers = 1;
@@ -737,14 +784,16 @@ message SuggestFaqAnswersResponse {
   string latest_message = 2;
 
   // Number of messages prior to and including
-  // [latest_message][google.cloud.dialogflow.v2.SuggestFaqAnswersResponse.latest_message] to compile the
-  // suggestion. It may be smaller than the
-  // [SuggestFaqAnswersRequest.context_size][google.cloud.dialogflow.v2.SuggestFaqAnswersRequest.context_size] field in the request if there
-  // aren't that many messages in the conversation.
+  // [latest_message][google.cloud.dialogflow.v2.SuggestFaqAnswersResponse.latest_message]
+  // to compile the suggestion. It may be smaller than the
+  // [SuggestFaqAnswersRequest.context_size][google.cloud.dialogflow.v2.SuggestFaqAnswersRequest.context_size]
+  // field in the request if there aren't that many messages in the
+  // conversation.
   int32 context_size = 3;
 }
 
-// The request message for [Participants.SuggestSmartReplies][google.cloud.dialogflow.v2.Participants.SuggestSmartReplies].
+// The request message for
+// [Participants.SuggestSmartReplies][google.cloud.dialogflow.v2.Participants.SuggestSmartReplies].
 message SuggestSmartRepliesRequest {
   // Required. The name of the participant to fetch suggestion for.
   // Format: `projects/<Project ID>/locations/<Location
@@ -767,8 +816,8 @@ message SuggestSmartRepliesRequest {
   // Format: `projects/<Project ID>/locations/<Location
   // ID>/conversations/<Conversation ID>/messages/<Message ID>`.
   string latest_message = 2 [(google.api.resource_reference) = {
-                               type: "dialogflow.googleapis.com/Message"
-                             }];
+    type: "dialogflow.googleapis.com/Message"
+  }];
 
   // Max number of messages prior to and including
   // [latest_message] to use as context when compiling the
@@ -776,12 +825,14 @@ message SuggestSmartRepliesRequest {
   int32 context_size = 3;
 }
 
-// The response message for [Participants.SuggestSmartReplies][google.cloud.dialogflow.v2.Participants.SuggestSmartReplies].
+// The response message for
+// [Participants.SuggestSmartReplies][google.cloud.dialogflow.v2.Participants.SuggestSmartReplies].
 message SuggestSmartRepliesResponse {
   // Output only. Multiple reply options provided by smart reply service. The
   // order is based on the rank of the model prediction.
   // The maximum number of the returned replies is set in SmartReplyConfig.
-  repeated SmartReplyAnswer smart_reply_answers = 1 [(google.api.field_behavior) = OUTPUT_ONLY];
+  repeated SmartReplyAnswer smart_reply_answers = 1
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // The name of the latest conversation message used to compile
   // suggestion for.
@@ -789,14 +840,15 @@ message SuggestSmartRepliesResponse {
   // Format: `projects/<Project ID>/locations/<Location
   // ID>/conversations/<Conversation ID>/messages/<Message ID>`.
   string latest_message = 2 [(google.api.resource_reference) = {
-                               type: "dialogflow.googleapis.com/Message"
-                             }];
+    type: "dialogflow.googleapis.com/Message"
+  }];
 
   // Number of messages prior to and including
-  // [latest_message][google.cloud.dialogflow.v2.SuggestSmartRepliesResponse.latest_message] to compile the
-  // suggestion. It may be smaller than the
-  // [SuggestSmartRepliesRequest.context_size][google.cloud.dialogflow.v2.SuggestSmartRepliesRequest.context_size] field in the request if there
-  // aren't that many messages in the conversation.
+  // [latest_message][google.cloud.dialogflow.v2.SuggestSmartRepliesResponse.latest_message]
+  // to compile the suggestion. It may be smaller than the
+  // [SuggestSmartRepliesRequest.context_size][google.cloud.dialogflow.v2.SuggestSmartRepliesRequest.context_size]
+  // field in the request if there aren't that many messages in the
+  // conversation.
   int32 context_size = 3;
 }
 
@@ -826,7 +878,9 @@ message AutomatedAgentReply {
     FINAL = 2;
   }
 
-  // Response of the Dialogflow [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] call.
+  // Response of the Dialogflow
+  // [Sessions.DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent]
+  // call.
   DetectIntentResponse detect_intent_response = 1;
 
   // AutomatedAgentReply type.
@@ -914,13 +968,17 @@ message SmartReplyAnswer {
   // "projects/<Project ID>/locations/<Location ID>/answerRecords/<Answer Record
   // ID>"
   string answer_record = 3 [(google.api.resource_reference) = {
-                              type: "dialogflow.googleapis.com/AnswerRecord"
-                            }];
+    type: "dialogflow.googleapis.com/AnswerRecord"
+  }];
 }
 
 // One response of different type of suggestion response which is used in
-// the response of [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent] and
-// [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent], as well as [HumanAgentAssistantEvent][google.cloud.dialogflow.v2.HumanAgentAssistantEvent].
+// the response of
+// [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent]
+// and
+// [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent],
+// as well as
+// [HumanAgentAssistantEvent][google.cloud.dialogflow.v2.HumanAgentAssistantEvent].
 message SuggestionResult {
   // Different type of suggestion response.
   oneof suggestion_response {
@@ -987,7 +1045,8 @@ message MessageAnnotation {
 message AssistQueryParameters {
   // Key-value filters on the metadata of documents returned by article
   // suggestion. If specified, article suggestion only returns suggested
-  // documents that match all filters in their [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
+  // documents that match all filters in their
+  // [Document.metadata][google.cloud.dialogflow.v2.Document.metadata]. Multiple
   // values for a metadata key should be concatenated by comma. For example,
   // filters to match all documents that have 'US' or 'CA' in their market
   // metadata values and 'agent' in their user metadata values will be
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session.proto
index 85119ecc5318..2099778174ea 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session.proto
@@ -32,7 +32,7 @@ import "google/type/latlng.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "SessionProto";
 option java_package = "com.google.cloud.dialogflow.v2";
@@ -104,8 +104,8 @@ service Sessions {
   // Note: Always use agent versions for production traffic.
   // See [Versions and
   // environments](https://cloud.google.com/dialogflow/es/docs/agents-versions).
-  rpc StreamingDetectIntent(stream StreamingDetectIntentRequest) returns (stream StreamingDetectIntentResponse) {
-  }
+  rpc StreamingDetectIntent(stream StreamingDetectIntentRequest)
+      returns (stream StreamingDetectIntentResponse) {}
 }
 
 // The request to detect user's intent.
@@ -152,12 +152,14 @@ message DetectIntentRequest {
   // configured, no output audio is generated.
   OutputAudioConfig output_audio_config = 4;
 
-  // Mask for [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] indicating which settings in this
-  // request-level config should override speech synthesizer settings defined at
-  // agent-level.
+  // Mask for
+  // [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+  // indicating which settings in this request-level config should override
+  // speech synthesizer settings defined at agent-level.
   //
-  // If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] replaces the agent-level
-  // config in its entirety.
+  // If unspecified or empty,
+  // [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config]
+  // replaces the agent-level config in its entirety.
   google.protobuf.FieldMask output_audio_config_mask = 7;
 
   // The natural language speech audio to be processed. This field
@@ -380,25 +382,29 @@ message QueryResult {
 }
 
 // The top-level message sent by the client to the
-// [Sessions.StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent] method.
+// [Sessions.StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]
+// method.
 //
 // Multiple request messages should be sent in order:
 //
 // 1.  The first message must contain
 // [session][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.session],
-//     [query_input][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.query_input] plus optionally
-//     [query_params][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.query_params]. If the client
-//     wants to receive an audio response, it should also contain
+//     [query_input][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.query_input]
+//     plus optionally
+//     [query_params][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.query_params].
+//     If the client wants to receive an audio response, it should also contain
 //     [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config].
 //     The message must not contain
 //     [input_audio][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.input_audio].
-// 2.  If [query_input][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.query_input] was set to
-//     [query_input.audio_config][google.cloud.dialogflow.v2.InputAudioConfig], all subsequent
-//     messages must contain
-//     [input_audio][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.input_audio] to continue with
-//     Speech recognition.
-//     If you decide to rather detect an intent from text input after you
-//     already started Speech recognition, please send a message with
+// 2.  If
+// [query_input][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.query_input]
+// was set to
+//     [query_input.audio_config][google.cloud.dialogflow.v2.InputAudioConfig],
+//     all subsequent messages must contain
+//     [input_audio][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.input_audio]
+//     to continue with Speech recognition. If you decide to rather detect an
+//     intent from text input after you already started Speech recognition,
+//     please send a message with
 //     [query_input.text][google.cloud.dialogflow.v2.QueryInput.text].
 //
 //     However, note that:
@@ -447,14 +453,15 @@ message StreamingDetectIntentRequest {
   // 3.  an event that specifies which intent to trigger.
   QueryInput query_input = 3 [(google.api.field_behavior) = REQUIRED];
 
-  // Please use [InputAudioConfig.single_utterance][google.cloud.dialogflow.v2.InputAudioConfig.single_utterance] instead.
-  // If `false` (default), recognition does not cease until
-  // the client closes the stream. If `true`, the recognizer will detect a
-  // single spoken utterance in input audio. Recognition ceases when it detects
-  // the audio's voice has stopped or paused. In this case, once a detected
-  // intent is received, the client should close the stream and start a new
-  // request with a new stream as needed.
-  // This setting is ignored when `query_input` is a piece of text or an event.
+  // Please use
+  // [InputAudioConfig.single_utterance][google.cloud.dialogflow.v2.InputAudioConfig.single_utterance]
+  // instead. If `false` (default), recognition does not cease until the client
+  // closes the stream. If `true`, the recognizer will detect a single spoken
+  // utterance in input audio. Recognition ceases when it detects the audio's
+  // voice has stopped or paused. In this case, once a detected intent is
+  // received, the client should close the stream and start a new request with a
+  // new stream as needed. This setting is ignored when `query_input` is a piece
+  // of text or an event.
   bool single_utterance = 4 [deprecated = true];
 
   // Instructs the speech synthesizer how to generate the output
@@ -462,12 +469,14 @@ message StreamingDetectIntentRequest {
   // configured, no output audio is generated.
   OutputAudioConfig output_audio_config = 5;
 
-  // Mask for [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] indicating which settings in this
-  // request-level config should override speech synthesizer settings defined at
-  // agent-level.
+  // Mask for
+  // [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+  // indicating which settings in this request-level config should override
+  // speech synthesizer settings defined at agent-level.
   //
-  // If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] replaces the agent-level
-  // config in its entirety.
+  // If unspecified or empty,
+  // [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config]
+  // replaces the agent-level config in its entirety.
   google.protobuf.FieldMask output_audio_config_mask = 7;
 
   // The input audio content to be recognized. Must be sent if
@@ -484,8 +493,9 @@ message StreamingDetectIntentRequest {
 // 1.  If the `StreamingDetectIntentRequest.input_audio` field was
 //     set, the `recognition_result` field is populated for one
 //     or more messages.
-//     See the [StreamingRecognitionResult][google.cloud.dialogflow.v2.StreamingRecognitionResult] message for details
-//     about the result message sequence.
+//     See the
+//     [StreamingRecognitionResult][google.cloud.dialogflow.v2.StreamingRecognitionResult]
+//     message for details about the result message sequence.
 //
 // 2.  The next message contains `response_id`, `query_result`
 //     and optionally `webhook_status` if a WebHook was called.
@@ -567,11 +577,12 @@ message StreamingRecognitionResult {
 
     // Event indicates that the server has detected the end of the user's speech
     // utterance and expects no additional inputs.
-    // Therefore, the server will not process additional audio (although it may subsequently return additional results). The
-    // client should stop sending additional audio data, half-close the gRPC
-    // connection, and wait for any additional results until the server closes
-    // the gRPC connection. This message is only sent if `single_utterance` was
-    // set to `true`, and is not used otherwise.
+    // Therefore, the server will not process additional audio (although it may
+    // subsequently return additional results). The client should stop sending
+    // additional audio data, half-close the gRPC connection, and wait for any
+    // additional results until the server closes the gRPC connection. This
+    // message is only sent if `single_utterance` was set to `true`, and is not
+    // used otherwise.
     END_OF_SINGLE_UTTERANCE = 2;
   }
 
@@ -598,7 +609,8 @@ message StreamingRecognitionResult {
   float confidence = 4;
 
   // Word-specific information for the words recognized by Speech in
-  // [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript]. Populated if and only if `message_type` = `TRANSCRIPT` and
+  // [transcript][google.cloud.dialogflow.v2.StreamingRecognitionResult.transcript].
+  // Populated if and only if `message_type` = `TRANSCRIPT` and
   // [InputAudioConfig.enable_word_info] is set.
   repeated SpeechWordInfo speech_word_info = 7;
 
@@ -659,8 +671,8 @@ message EventInput {
   // the same session do not necessarily need to specify the same language.
   //
   // This field is ignored when used in the context of a
-  // [WebhookResponse.followup_event_input][google.cloud.dialogflow.v2.WebhookResponse.followup_event_input] field,
-  // because the language was already defined in the originating detect
+  // [WebhookResponse.followup_event_input][google.cloud.dialogflow.v2.WebhookResponse.followup_event_input]
+  // field, because the language was already defined in the originating detect
   // intent request.
   string language_code = 3 [(google.api.field_behavior) = REQUIRED];
 }
@@ -677,11 +689,14 @@ message SentimentAnalysisRequestConfig {
 // and identifies the prevailing subjective opinion, especially to determine a
 // user's attitude as positive, negative, or neutral.
 // For [Participants.DetectIntent][], it needs to be configured in
-// [DetectIntentRequest.query_params][google.cloud.dialogflow.v2.DetectIntentRequest.query_params]. For
-// [Participants.StreamingDetectIntent][], it needs to be configured in
+// [DetectIntentRequest.query_params][google.cloud.dialogflow.v2.DetectIntentRequest.query_params].
+// For [Participants.StreamingDetectIntent][], it needs to be configured in
 // [StreamingDetectIntentRequest.query_params][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.query_params].
-// And for [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent] and
-// [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent], it needs to be configured in
+// And for
+// [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent]
+// and
+// [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent],
+// it needs to be configured in
 // [ConversationProfile.human_agent_assistant_config][google.cloud.dialogflow.v2.ConversationProfile.human_agent_assistant_config]
 message SentimentAnalysisResult {
   // The sentiment analysis result for `query_text`.
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session_entity_type.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session_entity_type.proto
index 00cceba1cc54..876c26ab14e3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session_entity_type.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session_entity_type.proto
@@ -26,13 +26,14 @@ import "google/protobuf/field_mask.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "SessionEntityTypeProto";
 option java_package = "com.google.cloud.dialogflow.v2";
 option objc_class_prefix = "DF";
 
-// Service for managing [SessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityType].
+// Service for managing
+// [SessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityType].
 service SessionEntityTypes {
   option (google.api.default_host) = "dialogflow.googleapis.com";
   option (google.api.oauth_scopes) =
@@ -44,7 +45,8 @@ service SessionEntityTypes {
   // This method doesn't work with Google Assistant integration.
   // Contact Dialogflow support if you need to use session entities
   // with Google Assistant integration.
-  rpc ListSessionEntityTypes(ListSessionEntityTypesRequest) returns (ListSessionEntityTypesResponse) {
+  rpc ListSessionEntityTypes(ListSessionEntityTypesRequest)
+      returns (ListSessionEntityTypesResponse) {
     option (google.api.http) = {
       get: "/v2/{parent=projects/*/agent/sessions/*}/entityTypes"
       additional_bindings {
@@ -65,7 +67,8 @@ service SessionEntityTypes {
   // This method doesn't work with Google Assistant integration.
   // Contact Dialogflow support if you need to use session entities
   // with Google Assistant integration.
-  rpc GetSessionEntityType(GetSessionEntityTypeRequest) returns (SessionEntityType) {
+  rpc GetSessionEntityType(GetSessionEntityTypeRequest)
+      returns (SessionEntityType) {
     option (google.api.http) = {
       get: "/v2/{name=projects/*/agent/sessions/*/entityTypes/*}"
       additional_bindings {
@@ -89,7 +92,8 @@ service SessionEntityTypes {
   // This method doesn't work with Google Assistant integration.
   // Contact Dialogflow support if you need to use session entities
   // with Google Assistant integration.
-  rpc CreateSessionEntityType(CreateSessionEntityTypeRequest) returns (SessionEntityType) {
+  rpc CreateSessionEntityType(CreateSessionEntityTypeRequest)
+      returns (SessionEntityType) {
     option (google.api.http) = {
       post: "/v2/{parent=projects/*/agent/sessions/*}/entityTypes"
       body: "session_entity_type"
@@ -114,7 +118,8 @@ service SessionEntityTypes {
   // This method doesn't work with Google Assistant integration.
   // Contact Dialogflow support if you need to use session entities
   // with Google Assistant integration.
-  rpc UpdateSessionEntityType(UpdateSessionEntityTypeRequest) returns (SessionEntityType) {
+  rpc UpdateSessionEntityType(UpdateSessionEntityTypeRequest)
+      returns (SessionEntityType) {
     option (google.api.http) = {
       patch: "/v2/{session_entity_type.name=projects/*/agent/sessions/*/entityTypes/*}"
       body: "session_entity_type"
@@ -140,7 +145,8 @@ service SessionEntityTypes {
   // This method doesn't work with Google Assistant integration.
   // Contact Dialogflow support if you need to use session entities
   // with Google Assistant integration.
-  rpc DeleteSessionEntityType(DeleteSessionEntityTypeRequest) returns (google.protobuf.Empty) {
+  rpc DeleteSessionEntityType(DeleteSessionEntityTypeRequest)
+      returns (google.protobuf.Empty) {
     option (google.api.http) = {
       delete: "/v2/{name=projects/*/agent/sessions/*/entityTypes/*}"
       additional_bindings {
@@ -190,8 +196,9 @@ message SessionEntityType {
     // `GetSessionEntityType`, `CreateSessionEntityType` and
     // `UpdateSessionEntityType` only return the additional entities added in
     // this session entity type. If you want to get the supplemented list,
-    // please call [EntityTypes.GetEntityType][google.cloud.dialogflow.v2.EntityTypes.GetEntityType] on the custom entity type
-    // and merge.
+    // please call
+    // [EntityTypes.GetEntityType][google.cloud.dialogflow.v2.EntityTypes.GetEntityType]
+    // on the custom entity type and merge.
     ENTITY_OVERRIDE_MODE_SUPPLEMENT = 2;
   }
 
@@ -209,14 +216,17 @@ message SessionEntityType {
 
   // Required. Indicates whether the additional data should override or
   // supplement the custom entity type definition.
-  EntityOverrideMode entity_override_mode = 2 [(google.api.field_behavior) = REQUIRED];
+  EntityOverrideMode entity_override_mode = 2
+      [(google.api.field_behavior) = REQUIRED];
 
   // Required. The collection of entities associated with this session entity
   // type.
-  repeated EntityType.Entity entities = 3 [(google.api.field_behavior) = REQUIRED];
+  repeated EntityType.Entity entities = 3
+      [(google.api.field_behavior) = REQUIRED];
 }
 
-// The request message for [SessionEntityTypes.ListSessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityTypes.ListSessionEntityTypes].
+// The request message for
+// [SessionEntityTypes.ListSessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityTypes.ListSessionEntityTypes].
 message ListSessionEntityTypesRequest {
   // Required. The session to list all session entity types from.
   // Format: `projects/<Project ID>/agent/sessions/<Session ID>` or
@@ -239,7 +249,8 @@ message ListSessionEntityTypesRequest {
   string page_token = 3 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The response message for [SessionEntityTypes.ListSessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityTypes.ListSessionEntityTypes].
+// The response message for
+// [SessionEntityTypes.ListSessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityTypes.ListSessionEntityTypes].
 message ListSessionEntityTypesResponse {
   // The list of session entity types. There will be a maximum number of items
   // returned based on the page_size field in the request.
@@ -250,7 +261,8 @@ message ListSessionEntityTypesResponse {
   string next_page_token = 2;
 }
 
-// The request message for [SessionEntityTypes.GetSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.GetSessionEntityType].
+// The request message for
+// [SessionEntityTypes.GetSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.GetSessionEntityType].
 message GetSessionEntityTypeRequest {
   // Required. The name of the session entity type. Format:
   // `projects/<Project ID>/agent/sessions/<Session ID>/entityTypes/<Entity Type
@@ -267,7 +279,8 @@ message GetSessionEntityTypeRequest {
   ];
 }
 
-// The request message for [SessionEntityTypes.CreateSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.CreateSessionEntityType].
+// The request message for
+// [SessionEntityTypes.CreateSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.CreateSessionEntityType].
 message CreateSessionEntityTypeRequest {
   // Required. The session to create a session entity type for.
   // Format: `projects/<Project ID>/agent/sessions/<Session ID>` or
@@ -283,19 +296,24 @@ message CreateSessionEntityTypeRequest {
   ];
 
   // Required. The session entity type to create.
-  SessionEntityType session_entity_type = 2 [(google.api.field_behavior) = REQUIRED];
+  SessionEntityType session_entity_type = 2
+      [(google.api.field_behavior) = REQUIRED];
 }
 
-// The request message for [SessionEntityTypes.UpdateSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.UpdateSessionEntityType].
+// The request message for
+// [SessionEntityTypes.UpdateSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.UpdateSessionEntityType].
 message UpdateSessionEntityTypeRequest {
   // Required. The session entity type to update.
-  SessionEntityType session_entity_type = 1 [(google.api.field_behavior) = REQUIRED];
+  SessionEntityType session_entity_type = 1
+      [(google.api.field_behavior) = REQUIRED];
 
   // Optional. The mask to control which fields get updated.
-  google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = OPTIONAL];
+  google.protobuf.FieldMask update_mask = 2
+      [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The request message for [SessionEntityTypes.DeleteSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.DeleteSessionEntityType].
+// The request message for
+// [SessionEntityTypes.DeleteSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.DeleteSessionEntityType].
 message DeleteSessionEntityTypeRequest {
   // Required. The name of the entity type to delete. Format:
   // `projects/<Project ID>/agent/sessions/<Session ID>/entityTypes/<Entity Type
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/validation_result.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/validation_result.proto
index a4c77a9993ff..aadfea415c54 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/validation_result.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/validation_result.proto
@@ -18,7 +18,7 @@ package google.cloud.dialogflow.v2;
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "ValidationResultProto";
 option java_package = "com.google.cloud.dialogflow.v2";
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/version.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/version.proto
index 8244c547bd7e..26c8f2c54014 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/version.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/version.proto
@@ -26,7 +26,7 @@ import "google/protobuf/timestamp.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "VersionProto";
 option java_package = "com.google.cloud.dialogflow.v2";
@@ -156,20 +156,22 @@ message Version {
   // Optional. The developer-provided description of this version.
   string description = 2 [(google.api.field_behavior) = OPTIONAL];
 
-  // Output only. The sequential number of this version. This field is read-only which means
-  // it cannot be set by create and update methods.
+  // Output only. The sequential number of this version. This field is read-only
+  // which means it cannot be set by create and update methods.
   int32 version_number = 3 [(google.api.field_behavior) = OUTPUT_ONLY];
 
-  // Output only. The creation time of this version. This field is read-only, i.e., it cannot
-  // be set by create and update methods.
-  google.protobuf.Timestamp create_time = 4 [(google.api.field_behavior) = OUTPUT_ONLY];
+  // Output only. The creation time of this version. This field is read-only,
+  // i.e., it cannot be set by create and update methods.
+  google.protobuf.Timestamp create_time = 4
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
-  // Output only. The status of this version. This field is read-only and cannot be set by
-  // create and update methods.
+  // Output only. The status of this version. This field is read-only and cannot
+  // be set by create and update methods.
   VersionStatus status = 6 [(google.api.field_behavior) = OUTPUT_ONLY];
 }
 
-// The request message for [Versions.ListVersions][google.cloud.dialogflow.v2.Versions.ListVersions].
+// The request message for
+// [Versions.ListVersions][google.cloud.dialogflow.v2.Versions.ListVersions].
 message ListVersionsRequest {
   // Required. The agent to list all versions from.
   // Supported formats:
@@ -183,15 +185,16 @@ message ListVersionsRequest {
     }
   ];
 
-  // Optional. The maximum number of items to return in a single page. By default 100 and
-  // at most 1000.
+  // Optional. The maximum number of items to return in a single page. By
+  // default 100 and at most 1000.
   int32 page_size = 2 [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. The next_page_token value returned from a previous list request.
   string page_token = 3 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The response message for [Versions.ListVersions][google.cloud.dialogflow.v2.Versions.ListVersions].
+// The response message for
+// [Versions.ListVersions][google.cloud.dialogflow.v2.Versions.ListVersions].
 message ListVersionsResponse {
   // The list of agent versions. There will be a maximum number of items
   // returned based on the page_size field in the request.
@@ -202,7 +205,8 @@ message ListVersionsResponse {
   string next_page_token = 2;
 }
 
-// The request message for [Versions.GetVersion][google.cloud.dialogflow.v2.Versions.GetVersion].
+// The request message for
+// [Versions.GetVersion][google.cloud.dialogflow.v2.Versions.GetVersion].
 message GetVersionRequest {
   // Required. The name of the version.
   // Supported formats:
@@ -218,7 +222,8 @@ message GetVersionRequest {
   ];
 }
 
-// The request message for [Versions.CreateVersion][google.cloud.dialogflow.v2.Versions.CreateVersion].
+// The request message for
+// [Versions.CreateVersion][google.cloud.dialogflow.v2.Versions.CreateVersion].
 message CreateVersionRequest {
   // Required. The agent to create a version for.
   // Supported formats:
@@ -236,7 +241,8 @@ message CreateVersionRequest {
   Version version = 2 [(google.api.field_behavior) = REQUIRED];
 }
 
-// The request message for [Versions.UpdateVersion][google.cloud.dialogflow.v2.Versions.UpdateVersion].
+// The request message for
+// [Versions.UpdateVersion][google.cloud.dialogflow.v2.Versions.UpdateVersion].
 message UpdateVersionRequest {
   // Required. The version to update.
   // Supported formats:
@@ -247,10 +253,12 @@ message UpdateVersionRequest {
   Version version = 1 [(google.api.field_behavior) = REQUIRED];
 
   // Required. The mask to control which fields get updated.
-  google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED];
+  google.protobuf.FieldMask update_mask = 2
+      [(google.api.field_behavior) = REQUIRED];
 }
 
-// The request message for [Versions.DeleteVersion][google.cloud.dialogflow.v2.Versions.DeleteVersion].
+// The request message for
+// [Versions.DeleteVersion][google.cloud.dialogflow.v2.Versions.DeleteVersion].
 message DeleteVersionRequest {
   // Required. The name of the version to delete.
   // Supported formats:
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/webhook.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/webhook.proto
index a672ff7150c9..cbd99701eea1 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/webhook.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/webhook.proto
@@ -24,7 +24,7 @@ import "google/protobuf/struct.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2";
-option go_package = "google.golang.org/genproto/googleapis/cloud/dialogflow/v2;dialogflow";
+option go_package = "cloud.google.com/go/dialogflow/apiv2/dialogflowpb;dialogflowpb";
 option java_multiple_files = true;
 option java_outer_classname = "WebhookProto";
 option java_package = "com.google.cloud.dialogflow.v2";
@@ -55,9 +55,10 @@ message WebhookRequest {
 // The response message for a webhook call.
 //
 // This response is validated by the Dialogflow server. If validation fails,
-// an error will be returned in the [QueryResult.diagnostic_info][google.cloud.dialogflow.v2.QueryResult.diagnostic_info] field.
-// Setting JSON fields to an empty value with the wrong type is a common error.
-// To avoid this error:
+// an error will be returned in the
+// [QueryResult.diagnostic_info][google.cloud.dialogflow.v2.QueryResult.diagnostic_info]
+// field. Setting JSON fields to an empty value with the wrong type is a common
+// error. To avoid this error:
 //
 // - Use `""` for empty strings
 // - Use `{}` or `null` for empty objects
@@ -70,25 +71,28 @@ message WebhookResponse {
   // Optional. The text response message intended for the end-user.
   // It is recommended to use `fulfillment_messages.text.text[0]` instead.
   // When provided, Dialogflow uses this field to populate
-  // [QueryResult.fulfillment_text][google.cloud.dialogflow.v2.QueryResult.fulfillment_text] sent to the integration or API caller.
+  // [QueryResult.fulfillment_text][google.cloud.dialogflow.v2.QueryResult.fulfillment_text]
+  // sent to the integration or API caller.
   string fulfillment_text = 1;
 
   // Optional. The rich response messages intended for the end-user.
   // When provided, Dialogflow uses this field to populate
-  // [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages] sent to the integration or API caller.
+  // [QueryResult.fulfillment_messages][google.cloud.dialogflow.v2.QueryResult.fulfillment_messages]
+  // sent to the integration or API caller.
   repeated Intent.Message fulfillment_messages = 2;
 
   // Optional. A custom field used to identify the webhook source.
   // Arbitrary strings are supported.
   // When provided, Dialogflow uses this field to populate
-  // [QueryResult.webhook_source][google.cloud.dialogflow.v2.QueryResult.webhook_source] sent to the integration or API caller.
+  // [QueryResult.webhook_source][google.cloud.dialogflow.v2.QueryResult.webhook_source]
+  // sent to the integration or API caller.
   string source = 3;
 
-  // Optional. This field can be used to pass custom data from your webhook to the
-  // integration or API caller. Arbitrary JSON objects are supported.
-  // When provided, Dialogflow uses this field to populate
-  // [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload] sent to the integration or API caller.
-  // This field is also used by the
+  // Optional. This field can be used to pass custom data from your webhook to
+  // the integration or API caller. Arbitrary JSON objects are supported. When
+  // provided, Dialogflow uses this field to populate
+  // [QueryResult.webhook_payload][google.cloud.dialogflow.v2.QueryResult.webhook_payload]
+  // sent to the integration or API caller. This field is also used by the
   // [Google Assistant
   // integration](https://cloud.google.com/dialogflow/docs/integrations/aog)
   // for rich response messages.
@@ -99,7 +103,8 @@ message WebhookResponse {
   // Optional. The collection of output contexts that will overwrite currently
   // active contexts for the session and reset their lifespans.
   // When provided, Dialogflow uses this field to populate
-  // [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts] sent to the integration or API caller.
+  // [QueryResult.output_contexts][google.cloud.dialogflow.v2.QueryResult.output_contexts]
+  // sent to the integration or API caller.
   repeated Context output_contexts = 5;
 
   // Optional. Invokes the supplied events.
@@ -111,7 +116,9 @@ message WebhookResponse {
   // entity types with. The entity synonyms apply to all languages and persist
   // for the session. Setting this data from a webhook overwrites
   // the session entity types that have been set using `detectIntent`,
-  // `streamingDetectIntent` or [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] management methods.
+  // `streamingDetectIntent` or
+  // [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType]
+  // management methods.
   repeated SessionEntityType session_entity_types = 10;
 }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Agent.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Agent.java
index b16eb4f924d4..312a06af0eab 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Agent.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Agent.java
@@ -606,7 +606,9 @@ private Tier(int value) {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -663,7 +665,9 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
@@ -712,7 +716,9 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
   }
 
   public static final int DEFAULT_LANGUAGE_CODE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object defaultLanguageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object defaultLanguageCode_ = "";
   /**
    *
    *
@@ -769,6 +775,8 @@ public com.google.protobuf.ByteString getDefaultLanguageCodeBytes() {
   }
 
   public static final int SUPPORTED_LANGUAGE_CODES_FIELD_NUMBER = 4;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList supportedLanguageCodes_;
   /**
    *
@@ -834,7 +842,9 @@ public com.google.protobuf.ByteString getSupportedLanguageCodesBytes(int index)
   }
 
   public static final int TIME_ZONE_FIELD_NUMBER = 5;
-  private volatile java.lang.Object timeZone_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object timeZone_ = "";
   /**
    *
    *
@@ -887,7 +897,9 @@ public com.google.protobuf.ByteString getTimeZoneBytes() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 6;
-  private volatile java.lang.Object description_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object description_ = "";
   /**
    *
    *
@@ -938,7 +950,9 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
   }
 
   public static final int AVATAR_URI_FIELD_NUMBER = 7;
-  private volatile java.lang.Object avatarUri_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object avatarUri_ = "";
   /**
    *
    *
@@ -995,7 +1009,7 @@ public com.google.protobuf.ByteString getAvatarUriBytes() {
   }
 
   public static final int ENABLE_LOGGING_FIELD_NUMBER = 8;
-  private boolean enableLogging_;
+  private boolean enableLogging_ = false;
   /**
    *
    *
@@ -1013,7 +1027,7 @@ public boolean getEnableLogging() {
   }
 
   public static final int MATCH_MODE_FIELD_NUMBER = 9;
-  private int matchMode_;
+  private int matchMode_ = 0;
   /**
    *
    *
@@ -1050,16 +1064,15 @@ public int getMatchModeValue() {
   @java.lang.Override
   @java.lang.Deprecated
   public com.google.cloud.dialogflow.v2beta1.Agent.MatchMode getMatchMode() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.Agent.MatchMode result =
-        com.google.cloud.dialogflow.v2beta1.Agent.MatchMode.valueOf(matchMode_);
+        com.google.cloud.dialogflow.v2beta1.Agent.MatchMode.forNumber(matchMode_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.Agent.MatchMode.UNRECOGNIZED
         : result;
   }
 
   public static final int CLASSIFICATION_THRESHOLD_FIELD_NUMBER = 10;
-  private float classificationThreshold_;
+  private float classificationThreshold_ = 0F;
   /**
    *
    *
@@ -1083,7 +1096,7 @@ public float getClassificationThreshold() {
   }
 
   public static final int API_VERSION_FIELD_NUMBER = 14;
-  private int apiVersion_;
+  private int apiVersion_ = 0;
   /**
    *
    *
@@ -1118,16 +1131,15 @@ public int getApiVersionValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.Agent.ApiVersion getApiVersion() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.Agent.ApiVersion result =
-        com.google.cloud.dialogflow.v2beta1.Agent.ApiVersion.valueOf(apiVersion_);
+        com.google.cloud.dialogflow.v2beta1.Agent.ApiVersion.forNumber(apiVersion_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.Agent.ApiVersion.UNRECOGNIZED
         : result;
   }
 
   public static final int TIER_FIELD_NUMBER = 15;
-  private int tier_;
+  private int tier_ = 0;
   /**
    *
    *
@@ -1156,9 +1168,8 @@ public int getTierValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.Agent.Tier getTier() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.Agent.Tier result =
-        com.google.cloud.dialogflow.v2beta1.Agent.Tier.valueOf(tier_);
+        com.google.cloud.dialogflow.v2beta1.Agent.Tier.forNumber(tier_);
     return result == null ? com.google.cloud.dialogflow.v2beta1.Agent.Tier.UNRECOGNIZED : result;
   }
 
@@ -1481,30 +1492,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       displayName_ = "";
-
       defaultLanguageCode_ = "";
-
       supportedLanguageCodes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000008);
       timeZone_ = "";
-
       description_ = "";
-
       avatarUri_ = "";
-
       enableLogging_ = false;
-
       matchMode_ = 0;
-
       classificationThreshold_ = 0F;
-
       apiVersion_ = 0;
-
       tier_ = 0;
-
       return this;
     }
 
@@ -1532,27 +1533,59 @@ public com.google.cloud.dialogflow.v2beta1.Agent build() {
     public com.google.cloud.dialogflow.v2beta1.Agent buildPartial() {
       com.google.cloud.dialogflow.v2beta1.Agent result =
           new com.google.cloud.dialogflow.v2beta1.Agent(this);
-      int from_bitField0_ = bitField0_;
-      result.parent_ = parent_;
-      result.displayName_ = displayName_;
-      result.defaultLanguageCode_ = defaultLanguageCode_;
-      if (((bitField0_ & 0x00000001) != 0)) {
-        supportedLanguageCodes_ = supportedLanguageCodes_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000001);
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.supportedLanguageCodes_ = supportedLanguageCodes_;
-      result.timeZone_ = timeZone_;
-      result.description_ = description_;
-      result.avatarUri_ = avatarUri_;
-      result.enableLogging_ = enableLogging_;
-      result.matchMode_ = matchMode_;
-      result.classificationThreshold_ = classificationThreshold_;
-      result.apiVersion_ = apiVersion_;
-      result.tier_ = tier_;
       onBuilt();
       return result;
     }
 
+    private void buildPartialRepeatedFields(com.google.cloud.dialogflow.v2beta1.Agent result) {
+      if (((bitField0_ & 0x00000008) != 0)) {
+        supportedLanguageCodes_ = supportedLanguageCodes_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000008);
+      }
+      result.supportedLanguageCodes_ = supportedLanguageCodes_;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.Agent result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.displayName_ = displayName_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.defaultLanguageCode_ = defaultLanguageCode_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.timeZone_ = timeZone_;
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.description_ = description_;
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.avatarUri_ = avatarUri_;
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.enableLogging_ = enableLogging_;
+      }
+      if (((from_bitField0_ & 0x00000100) != 0)) {
+        result.matchMode_ = matchMode_;
+      }
+      if (((from_bitField0_ & 0x00000200) != 0)) {
+        result.classificationThreshold_ = classificationThreshold_;
+      }
+      if (((from_bitField0_ & 0x00000400) != 0)) {
+        result.apiVersion_ = apiVersion_;
+      }
+      if (((from_bitField0_ & 0x00000800) != 0)) {
+        result.tier_ = tier_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -1600,20 +1633,23 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Agent other) {
       if (other == com.google.cloud.dialogflow.v2beta1.Agent.getDefaultInstance()) return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getDefaultLanguageCode().isEmpty()) {
         defaultLanguageCode_ = other.defaultLanguageCode_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.supportedLanguageCodes_.isEmpty()) {
         if (supportedLanguageCodes_.isEmpty()) {
           supportedLanguageCodes_ = other.supportedLanguageCodes_;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000008);
         } else {
           ensureSupportedLanguageCodesIsMutable();
           supportedLanguageCodes_.addAll(other.supportedLanguageCodes_);
@@ -1622,14 +1658,17 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Agent other) {
       }
       if (!other.getTimeZone().isEmpty()) {
         timeZone_ = other.timeZone_;
+        bitField0_ |= 0x00000010;
         onChanged();
       }
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
+        bitField0_ |= 0x00000020;
         onChanged();
       }
       if (!other.getAvatarUri().isEmpty()) {
         avatarUri_ = other.avatarUri_;
+        bitField0_ |= 0x00000040;
         onChanged();
       }
       if (other.getEnableLogging() != false) {
@@ -1676,19 +1715,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 displayName_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 defaultLanguageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
@@ -1701,49 +1740,49 @@ public Builder mergeFrom(
             case 42:
               {
                 timeZone_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             case 50:
               {
                 description_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 50
             case 58:
               {
                 avatarUri_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 58
             case 64:
               {
                 enableLogging_ = input.readBool();
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 64
             case 72:
               {
                 matchMode_ = input.readEnum();
-
+                bitField0_ |= 0x00000100;
                 break;
               } // case 72
             case 85:
               {
                 classificationThreshold_ = input.readFloat();
-
+                bitField0_ |= 0x00000200;
                 break;
               } // case 85
             case 112:
               {
                 apiVersion_ = input.readEnum();
-
+                bitField0_ |= 0x00000400;
                 break;
               } // case 112
             case 120:
               {
                 tier_ = input.readEnum();
-
+                bitField0_ |= 0x00000800;
                 break;
               } // case 120
             default:
@@ -1838,8 +1877,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1859,8 +1898,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1885,8 +1924,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1952,8 +1991,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1969,8 +2008,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
-
       displayName_ = getDefaultInstance().getDisplayName();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1991,8 +2030,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -2070,8 +2109,8 @@ public Builder setDefaultLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       defaultLanguageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2091,8 +2130,8 @@ public Builder setDefaultLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDefaultLanguageCode() {
-
       defaultLanguageCode_ = getDefaultInstance().getDefaultLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -2117,8 +2156,8 @@ public Builder setDefaultLanguageCodeBytes(com.google.protobuf.ByteString value)
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       defaultLanguageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2127,10 +2166,10 @@ public Builder setDefaultLanguageCodeBytes(com.google.protobuf.ByteString value)
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureSupportedLanguageCodesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         supportedLanguageCodes_ =
             new com.google.protobuf.LazyStringArrayList(supportedLanguageCodes_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000008;
       }
     }
     /**
@@ -2273,7 +2312,7 @@ public Builder addAllSupportedLanguageCodes(java.lang.Iterable<java.lang.String>
      */
     public Builder clearSupportedLanguageCodes() {
       supportedLanguageCodes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -2368,8 +2407,8 @@ public Builder setTimeZone(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       timeZone_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2387,8 +2426,8 @@ public Builder setTimeZone(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTimeZone() {
-
       timeZone_ = getDefaultInstance().getTimeZone();
+      bitField0_ = (bitField0_ & ~0x00000010);
       onChanged();
       return this;
     }
@@ -2411,8 +2450,8 @@ public Builder setTimeZoneBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       timeZone_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2481,8 +2520,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       description_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2499,8 +2538,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
-
       description_ = getDefaultInstance().getDescription();
+      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -2522,8 +2561,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       description_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2601,8 +2640,8 @@ public Builder setAvatarUri(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       avatarUri_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2622,8 +2661,8 @@ public Builder setAvatarUri(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAvatarUri() {
-
       avatarUri_ = getDefaultInstance().getAvatarUri();
+      bitField0_ = (bitField0_ & ~0x00000040);
       onChanged();
       return this;
     }
@@ -2648,8 +2687,8 @@ public Builder setAvatarUriBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       avatarUri_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2685,6 +2724,7 @@ public boolean getEnableLogging() {
     public Builder setEnableLogging(boolean value) {
 
       enableLogging_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2700,7 +2740,7 @@ public Builder setEnableLogging(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearEnableLogging() {
-
+      bitField0_ = (bitField0_ & ~0x00000080);
       enableLogging_ = false;
       onChanged();
       return this;
@@ -2743,8 +2783,8 @@ public int getMatchModeValue() {
      */
     @java.lang.Deprecated
     public Builder setMatchModeValue(int value) {
-
       matchMode_ = value;
+      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -2765,9 +2805,8 @@ public Builder setMatchModeValue(int value) {
     @java.lang.Override
     @java.lang.Deprecated
     public com.google.cloud.dialogflow.v2beta1.Agent.MatchMode getMatchMode() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.Agent.MatchMode result =
-          com.google.cloud.dialogflow.v2beta1.Agent.MatchMode.valueOf(matchMode_);
+          com.google.cloud.dialogflow.v2beta1.Agent.MatchMode.forNumber(matchMode_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.Agent.MatchMode.UNRECOGNIZED
           : result;
@@ -2792,7 +2831,7 @@ public Builder setMatchMode(com.google.cloud.dialogflow.v2beta1.Agent.MatchMode
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000100;
       matchMode_ = value.getNumber();
       onChanged();
       return this;
@@ -2813,7 +2852,7 @@ public Builder setMatchMode(com.google.cloud.dialogflow.v2beta1.Agent.MatchMode
      */
     @java.lang.Deprecated
     public Builder clearMatchMode() {
-
+      bitField0_ = (bitField0_ & ~0x00000100);
       matchMode_ = 0;
       onChanged();
       return this;
@@ -2862,6 +2901,7 @@ public float getClassificationThreshold() {
     public Builder setClassificationThreshold(float value) {
 
       classificationThreshold_ = value;
+      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -2883,7 +2923,7 @@ public Builder setClassificationThreshold(float value) {
      * @return This builder for chaining.
      */
     public Builder clearClassificationThreshold() {
-
+      bitField0_ = (bitField0_ & ~0x00000200);
       classificationThreshold_ = 0F;
       onChanged();
       return this;
@@ -2924,8 +2964,8 @@ public int getApiVersionValue() {
      * @return This builder for chaining.
      */
     public Builder setApiVersionValue(int value) {
-
       apiVersion_ = value;
+      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -2945,9 +2985,8 @@ public Builder setApiVersionValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.Agent.ApiVersion getApiVersion() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.Agent.ApiVersion result =
-          com.google.cloud.dialogflow.v2beta1.Agent.ApiVersion.valueOf(apiVersion_);
+          com.google.cloud.dialogflow.v2beta1.Agent.ApiVersion.forNumber(apiVersion_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.Agent.ApiVersion.UNRECOGNIZED
           : result;
@@ -2971,7 +3010,7 @@ public Builder setApiVersion(com.google.cloud.dialogflow.v2beta1.Agent.ApiVersio
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000400;
       apiVersion_ = value.getNumber();
       onChanged();
       return this;
@@ -2991,7 +3030,7 @@ public Builder setApiVersion(com.google.cloud.dialogflow.v2beta1.Agent.ApiVersio
      * @return This builder for chaining.
      */
     public Builder clearApiVersion() {
-
+      bitField0_ = (bitField0_ & ~0x00000400);
       apiVersion_ = 0;
       onChanged();
       return this;
@@ -3026,8 +3065,8 @@ public int getTierValue() {
      * @return This builder for chaining.
      */
     public Builder setTierValue(int value) {
-
       tier_ = value;
+      bitField0_ |= 0x00000800;
       onChanged();
       return this;
     }
@@ -3044,9 +3083,8 @@ public Builder setTierValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.Agent.Tier getTier() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.Agent.Tier result =
-          com.google.cloud.dialogflow.v2beta1.Agent.Tier.valueOf(tier_);
+          com.google.cloud.dialogflow.v2beta1.Agent.Tier.forNumber(tier_);
       return result == null ? com.google.cloud.dialogflow.v2beta1.Agent.Tier.UNRECOGNIZED : result;
     }
     /**
@@ -3065,7 +3103,7 @@ public Builder setTier(com.google.cloud.dialogflow.v2beta1.Agent.Tier value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000800;
       tier_ = value.getNumber();
       onChanged();
       return this;
@@ -3082,7 +3120,7 @@ public Builder setTier(com.google.cloud.dialogflow.v2beta1.Agent.Tier value) {
      * @return This builder for chaining.
      */
     public Builder clearTier() {
-
+      bitField0_ = (bitField0_ & ~0x00000800);
       tier_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentAssistantFeedback.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentAssistantFeedback.java
index 5f2e3d6739de..f4a9cd030688 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentAssistantFeedback.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentAssistantFeedback.java
@@ -752,7 +752,9 @@ public com.google.protobuf.Timestamp getStartTimestamp() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getStartTimestampOrBuilder() {
-      return getStartTimestamp();
+      return startTimestamp_ == null
+          ? com.google.protobuf.Timestamp.getDefaultInstance()
+          : startTimestamp_;
     }
 
     public static final int SUBMIT_TIMESTAMP_FIELD_NUMBER = 2;
@@ -800,11 +802,15 @@ public com.google.protobuf.Timestamp getSubmitTimestamp() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getSubmitTimestampOrBuilder() {
-      return getSubmitTimestamp();
+      return submitTimestamp_ == null
+          ? com.google.protobuf.Timestamp.getDefaultInstance()
+          : submitTimestamp_;
     }
 
     public static final int SUMMARY_TEXT_FIELD_NUMBER = 3;
-    private volatile java.lang.Object summaryText_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object summaryText_ = "";
     /**
      *
      *
@@ -1093,20 +1099,18 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (startTimestampBuilder_ == null) {
-          startTimestamp_ = null;
-        } else {
-          startTimestamp_ = null;
+        bitField0_ = 0;
+        startTimestamp_ = null;
+        if (startTimestampBuilder_ != null) {
+          startTimestampBuilder_.dispose();
           startTimestampBuilder_ = null;
         }
-        if (submitTimestampBuilder_ == null) {
-          submitTimestamp_ = null;
-        } else {
-          submitTimestamp_ = null;
+        submitTimestamp_ = null;
+        if (submitTimestampBuilder_ != null) {
+          submitTimestampBuilder_.dispose();
           submitTimestampBuilder_ = null;
         }
         summaryText_ = "";
-
         return this;
       }
 
@@ -1140,21 +1144,29 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
         com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.SummarizationFeedback result =
             new com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.SummarizationFeedback(
                 this);
-        if (startTimestampBuilder_ == null) {
-          result.startTimestamp_ = startTimestamp_;
-        } else {
-          result.startTimestamp_ = startTimestampBuilder_.build();
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
-        if (submitTimestampBuilder_ == null) {
-          result.submitTimestamp_ = submitTimestamp_;
-        } else {
-          result.submitTimestamp_ = submitTimestampBuilder_.build();
-        }
-        result.summaryText_ = summaryText_;
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.SummarizationFeedback result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.startTimestamp_ =
+              startTimestampBuilder_ == null ? startTimestamp_ : startTimestampBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.submitTimestamp_ =
+              submitTimestampBuilder_ == null ? submitTimestamp_ : submitTimestampBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.summaryText_ = summaryText_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1217,6 +1229,7 @@ public Builder mergeFrom(
         }
         if (!other.getSummaryText().isEmpty()) {
           summaryText_ = other.summaryText_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -1249,20 +1262,20 @@ public Builder mergeFrom(
                 {
                   input.readMessage(
                       getStartTimestampFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
                 {
                   input.readMessage(
                       getSubmitTimestampFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 18
               case 26:
                 {
                   summaryText_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000004;
                   break;
                 } // case 26
               default:
@@ -1282,6 +1295,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private com.google.protobuf.Timestamp startTimestamp_;
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.protobuf.Timestamp,
@@ -1300,7 +1315,7 @@ public Builder mergeFrom(
        * @return Whether the startTimestamp field is set.
        */
       public boolean hasStartTimestamp() {
-        return startTimestampBuilder_ != null || startTimestamp_ != null;
+        return ((bitField0_ & 0x00000001) != 0);
       }
       /**
        *
@@ -1337,11 +1352,11 @@ public Builder setStartTimestamp(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           startTimestamp_ = value;
-          onChanged();
         } else {
           startTimestampBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1356,11 +1371,11 @@ public Builder setStartTimestamp(com.google.protobuf.Timestamp value) {
       public Builder setStartTimestamp(com.google.protobuf.Timestamp.Builder builderForValue) {
         if (startTimestampBuilder_ == null) {
           startTimestamp_ = builderForValue.build();
-          onChanged();
         } else {
           startTimestampBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1374,19 +1389,18 @@ public Builder setStartTimestamp(com.google.protobuf.Timestamp.Builder builderFo
        */
       public Builder mergeStartTimestamp(com.google.protobuf.Timestamp value) {
         if (startTimestampBuilder_ == null) {
-          if (startTimestamp_ != null) {
-            startTimestamp_ =
-                com.google.protobuf.Timestamp.newBuilder(startTimestamp_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000001) != 0)
+              && startTimestamp_ != null
+              && startTimestamp_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+            getStartTimestampBuilder().mergeFrom(value);
           } else {
             startTimestamp_ = value;
           }
-          onChanged();
         } else {
           startTimestampBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1399,14 +1413,13 @@ public Builder mergeStartTimestamp(com.google.protobuf.Timestamp value) {
        * <code>.google.protobuf.Timestamp start_timestamp = 1;</code>
        */
       public Builder clearStartTimestamp() {
-        if (startTimestampBuilder_ == null) {
-          startTimestamp_ = null;
-          onChanged();
-        } else {
-          startTimestamp_ = null;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        startTimestamp_ = null;
+        if (startTimestampBuilder_ != null) {
+          startTimestampBuilder_.dispose();
           startTimestampBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -1419,7 +1432,7 @@ public Builder clearStartTimestamp() {
        * <code>.google.protobuf.Timestamp start_timestamp = 1;</code>
        */
       public com.google.protobuf.Timestamp.Builder getStartTimestampBuilder() {
-
+        bitField0_ |= 0x00000001;
         onChanged();
         return getStartTimestampFieldBuilder().getBuilder();
       }
@@ -1485,7 +1498,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimestampOrBuilder() {
        * @return Whether the submitTimestamp field is set.
        */
       public boolean hasSubmitTimestamp() {
-        return submitTimestampBuilder_ != null || submitTimestamp_ != null;
+        return ((bitField0_ & 0x00000002) != 0);
       }
       /**
        *
@@ -1522,11 +1535,11 @@ public Builder setSubmitTimestamp(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           submitTimestamp_ = value;
-          onChanged();
         } else {
           submitTimestampBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -1541,11 +1554,11 @@ public Builder setSubmitTimestamp(com.google.protobuf.Timestamp value) {
       public Builder setSubmitTimestamp(com.google.protobuf.Timestamp.Builder builderForValue) {
         if (submitTimestampBuilder_ == null) {
           submitTimestamp_ = builderForValue.build();
-          onChanged();
         } else {
           submitTimestampBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -1559,19 +1572,18 @@ public Builder setSubmitTimestamp(com.google.protobuf.Timestamp.Builder builderF
        */
       public Builder mergeSubmitTimestamp(com.google.protobuf.Timestamp value) {
         if (submitTimestampBuilder_ == null) {
-          if (submitTimestamp_ != null) {
-            submitTimestamp_ =
-                com.google.protobuf.Timestamp.newBuilder(submitTimestamp_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000002) != 0)
+              && submitTimestamp_ != null
+              && submitTimestamp_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+            getSubmitTimestampBuilder().mergeFrom(value);
           } else {
             submitTimestamp_ = value;
           }
-          onChanged();
         } else {
           submitTimestampBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -1584,14 +1596,13 @@ public Builder mergeSubmitTimestamp(com.google.protobuf.Timestamp value) {
        * <code>.google.protobuf.Timestamp submit_timestamp = 2;</code>
        */
       public Builder clearSubmitTimestamp() {
-        if (submitTimestampBuilder_ == null) {
-          submitTimestamp_ = null;
-          onChanged();
-        } else {
-          submitTimestamp_ = null;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        submitTimestamp_ = null;
+        if (submitTimestampBuilder_ != null) {
+          submitTimestampBuilder_.dispose();
           submitTimestampBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -1604,7 +1615,7 @@ public Builder clearSubmitTimestamp() {
        * <code>.google.protobuf.Timestamp submit_timestamp = 2;</code>
        */
       public com.google.protobuf.Timestamp.Builder getSubmitTimestampBuilder() {
-
+        bitField0_ |= 0x00000002;
         onChanged();
         return getSubmitTimestampFieldBuilder().getBuilder();
       }
@@ -1713,8 +1724,8 @@ public Builder setSummaryText(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         summaryText_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1730,8 +1741,8 @@ public Builder setSummaryText(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearSummaryText() {
-
         summaryText_ = getDefaultInstance().getSummaryText();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -1752,8 +1763,8 @@ public Builder setSummaryTextBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         summaryText_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1828,7 +1839,7 @@ public com.google.protobuf.Parser<SummarizationFeedback> getParserForType() {
   }
 
   public static final int ANSWER_RELEVANCE_FIELD_NUMBER = 1;
-  private int answerRelevance_;
+  private int answerRelevance_ = 0;
   /**
    *
    *
@@ -1872,9 +1883,8 @@ public int getAnswerRelevanceValue() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.AnswerRelevance
       getAnswerRelevance() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.AnswerRelevance result =
-        com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.AnswerRelevance.valueOf(
+        com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.AnswerRelevance.forNumber(
             answerRelevance_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.AnswerRelevance.UNRECOGNIZED
@@ -1882,7 +1892,7 @@ public int getAnswerRelevanceValue() {
   }
 
   public static final int DOCUMENT_CORRECTNESS_FIELD_NUMBER = 2;
-  private int documentCorrectness_;
+  private int documentCorrectness_ = 0;
   /**
    *
    *
@@ -1928,9 +1938,8 @@ public int getDocumentCorrectnessValue() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentCorrectness
       getDocumentCorrectness() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentCorrectness result =
-        com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentCorrectness.valueOf(
+        com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentCorrectness.forNumber(
             documentCorrectness_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentCorrectness
@@ -1939,7 +1948,7 @@ public int getDocumentCorrectnessValue() {
   }
 
   public static final int DOCUMENT_EFFICIENCY_FIELD_NUMBER = 3;
-  private int documentEfficiency_;
+  private int documentEfficiency_ = 0;
   /**
    *
    *
@@ -1979,9 +1988,8 @@ public int getDocumentEfficiencyValue() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentEfficiency
       getDocumentEfficiency() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentEfficiency result =
-        com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentEfficiency.valueOf(
+        com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentEfficiency.forNumber(
             documentEfficiency_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentEfficiency.UNRECOGNIZED
@@ -2043,7 +2051,10 @@ public boolean hasSummarizationFeedback() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.SummarizationFeedbackOrBuilder
       getSummarizationFeedbackOrBuilder() {
-    return getSummarizationFeedback();
+    return summarizationFeedback_ == null
+        ? com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.SummarizationFeedback
+            .getDefaultInstance()
+        : summarizationFeedback_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -2295,16 +2306,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       answerRelevance_ = 0;
-
       documentCorrectness_ = 0;
-
       documentEfficiency_ = 0;
-
-      if (summarizationFeedbackBuilder_ == null) {
-        summarizationFeedback_ = null;
-      } else {
-        summarizationFeedback_ = null;
+      summarizationFeedback_ = null;
+      if (summarizationFeedbackBuilder_ != null) {
+        summarizationFeedbackBuilder_.dispose();
         summarizationFeedbackBuilder_ = null;
       }
       return this;
@@ -2334,18 +2342,32 @@ public com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback build() {
     public com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback buildPartial() {
       com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback result =
           new com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback(this);
-      result.answerRelevance_ = answerRelevance_;
-      result.documentCorrectness_ = documentCorrectness_;
-      result.documentEfficiency_ = documentEfficiency_;
-      if (summarizationFeedbackBuilder_ == null) {
-        result.summarizationFeedback_ = summarizationFeedback_;
-      } else {
-        result.summarizationFeedback_ = summarizationFeedbackBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.answerRelevance_ = answerRelevance_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.documentCorrectness_ = documentCorrectness_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.documentEfficiency_ = documentEfficiency_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.summarizationFeedback_ =
+            summarizationFeedbackBuilder_ == null
+                ? summarizationFeedback_
+                : summarizationFeedbackBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -2433,26 +2455,26 @@ public Builder mergeFrom(
             case 8:
               {
                 answerRelevance_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 16:
               {
                 documentCorrectness_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 24:
               {
                 documentEfficiency_ = input.readEnum();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 34:
               {
                 input.readMessage(
                     getSummarizationFeedbackFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -2472,6 +2494,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private int answerRelevance_ = 0;
     /**
      *
@@ -2515,8 +2539,8 @@ public int getAnswerRelevanceValue() {
      * @return This builder for chaining.
      */
     public Builder setAnswerRelevanceValue(int value) {
-
       answerRelevance_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2541,9 +2565,8 @@ public Builder setAnswerRelevanceValue(int value) {
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.AnswerRelevance
         getAnswerRelevance() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.AnswerRelevance result =
-          com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.AnswerRelevance.valueOf(
+          com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.AnswerRelevance.forNumber(
               answerRelevance_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.AnswerRelevance.UNRECOGNIZED
@@ -2573,7 +2596,7 @@ public Builder setAnswerRelevance(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       answerRelevance_ = value.getNumber();
       onChanged();
       return this;
@@ -2597,7 +2620,7 @@ public Builder setAnswerRelevance(
      * @return This builder for chaining.
      */
     public Builder clearAnswerRelevance() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       answerRelevance_ = 0;
       onChanged();
       return this;
@@ -2648,8 +2671,8 @@ public int getDocumentCorrectnessValue() {
      * @return This builder for chaining.
      */
     public Builder setDocumentCorrectnessValue(int value) {
-
       documentCorrectness_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -2675,9 +2698,8 @@ public Builder setDocumentCorrectnessValue(int value) {
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentCorrectness
         getDocumentCorrectness() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentCorrectness result =
-          com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentCorrectness.valueOf(
+          com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentCorrectness.forNumber(
               documentCorrectness_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentCorrectness
@@ -2709,7 +2731,7 @@ public Builder setDocumentCorrectness(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       documentCorrectness_ = value.getNumber();
       onChanged();
       return this;
@@ -2734,7 +2756,7 @@ public Builder setDocumentCorrectness(
      * @return This builder for chaining.
      */
     public Builder clearDocumentCorrectness() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       documentCorrectness_ = 0;
       onChanged();
       return this;
@@ -2779,8 +2801,8 @@ public int getDocumentEfficiencyValue() {
      * @return This builder for chaining.
      */
     public Builder setDocumentEfficiencyValue(int value) {
-
       documentEfficiency_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2803,9 +2825,8 @@ public Builder setDocumentEfficiencyValue(int value) {
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentEfficiency
         getDocumentEfficiency() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentEfficiency result =
-          com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentEfficiency.valueOf(
+          com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentEfficiency.forNumber(
               documentEfficiency_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.DocumentEfficiency
@@ -2834,7 +2855,7 @@ public Builder setDocumentEfficiency(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000004;
       documentEfficiency_ = value.getNumber();
       onChanged();
       return this;
@@ -2856,7 +2877,7 @@ public Builder setDocumentEfficiency(
      * @return This builder for chaining.
      */
     public Builder clearDocumentEfficiency() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       documentEfficiency_ = 0;
       onChanged();
       return this;
@@ -2885,7 +2906,7 @@ public Builder clearDocumentEfficiency() {
      * @return Whether the summarizationFeedback field is set.
      */
     public boolean hasSummarizationFeedback() {
-      return summarizationFeedbackBuilder_ != null || summarizationFeedback_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -2929,11 +2950,11 @@ public Builder setSummarizationFeedback(
           throw new NullPointerException();
         }
         summarizationFeedback_ = value;
-        onChanged();
       } else {
         summarizationFeedbackBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -2952,11 +2973,11 @@ public Builder setSummarizationFeedback(
             builderForValue) {
       if (summarizationFeedbackBuilder_ == null) {
         summarizationFeedback_ = builderForValue.build();
-        onChanged();
       } else {
         summarizationFeedbackBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -2973,20 +2994,20 @@ public Builder setSummarizationFeedback(
     public Builder mergeSummarizationFeedback(
         com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.SummarizationFeedback value) {
       if (summarizationFeedbackBuilder_ == null) {
-        if (summarizationFeedback_ != null) {
-          summarizationFeedback_ =
-              com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.SummarizationFeedback
-                  .newBuilder(summarizationFeedback_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && summarizationFeedback_ != null
+            && summarizationFeedback_
+                != com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.SummarizationFeedback
+                    .getDefaultInstance()) {
+          getSummarizationFeedbackBuilder().mergeFrom(value);
         } else {
           summarizationFeedback_ = value;
         }
-        onChanged();
       } else {
         summarizationFeedbackBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -3001,14 +3022,13 @@ public Builder mergeSummarizationFeedback(
      * </code>
      */
     public Builder clearSummarizationFeedback() {
-      if (summarizationFeedbackBuilder_ == null) {
-        summarizationFeedback_ = null;
-        onChanged();
-      } else {
-        summarizationFeedback_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      summarizationFeedback_ = null;
+      if (summarizationFeedbackBuilder_ != null) {
+        summarizationFeedbackBuilder_.dispose();
         summarizationFeedbackBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3024,7 +3044,7 @@ public Builder clearSummarizationFeedback() {
      */
     public com.google.cloud.dialogflow.v2beta1.AgentAssistantFeedback.SummarizationFeedback.Builder
         getSummarizationFeedbackBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getSummarizationFeedbackFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentAssistantRecord.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentAssistantRecord.java
index febcc86fa41f..2da6542bcd52 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentAssistantRecord.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentAssistantRecord.java
@@ -455,6 +455,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (articleSuggestionAnswerBuilder_ != null) {
         articleSuggestionAnswerBuilder_.clear();
       }
@@ -490,25 +491,30 @@ public com.google.cloud.dialogflow.v2beta1.AgentAssistantRecord build() {
     public com.google.cloud.dialogflow.v2beta1.AgentAssistantRecord buildPartial() {
       com.google.cloud.dialogflow.v2beta1.AgentAssistantRecord result =
           new com.google.cloud.dialogflow.v2beta1.AgentAssistantRecord(this);
-      if (answerCase_ == 5) {
-        if (articleSuggestionAnswerBuilder_ == null) {
-          result.answer_ = answer_;
-        } else {
-          result.answer_ = articleSuggestionAnswerBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (answerCase_ == 6) {
-        if (faqAnswerBuilder_ == null) {
-          result.answer_ = answer_;
-        } else {
-          result.answer_ = faqAnswerBuilder_.build();
-        }
-      }
-      result.answerCase_ = answerCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.AgentAssistantRecord result) {
+      int from_bitField0_ = bitField0_;
+    }
+
+    private void buildPartialOneofs(
+        com.google.cloud.dialogflow.v2beta1.AgentAssistantRecord result) {
+      result.answerCase_ = answerCase_;
+      result.answer_ = this.answer_;
+      if (answerCase_ == 5 && articleSuggestionAnswerBuilder_ != null) {
+        result.answer_ = articleSuggestionAnswerBuilder_.build();
+      }
+      if (answerCase_ == 6 && faqAnswerBuilder_ != null) {
+        result.answer_ = faqAnswerBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -641,6 +647,8 @@ public Builder clearAnswer() {
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.ArticleAnswer,
             com.google.cloud.dialogflow.v2beta1.ArticleAnswer.Builder,
@@ -869,7 +877,6 @@ public Builder clearArticleSuggestionAnswer() {
       }
       answerCase_ = 5;
       onChanged();
-      ;
       return articleSuggestionAnswerBuilder_;
     }
 
@@ -1097,7 +1104,6 @@ public com.google.cloud.dialogflow.v2beta1.FaqAnswerOrBuilder getFaqAnswerOrBuil
       }
       answerCase_ = 6;
       onChanged();
-      ;
       return faqAnswerBuilder_;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AnalyzeContentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AnalyzeContentRequest.java
index 178cf8974438..a27bd7e7dd32 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AnalyzeContentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AnalyzeContentRequest.java
@@ -120,7 +120,9 @@ public InputCase getInputCase() {
   }
 
   public static final int PARTICIPANT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object participant_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object participant_ = "";
   /**
    *
    *
@@ -387,7 +389,9 @@ public com.google.cloud.dialogflow.v2beta1.OutputAudioConfig getReplyAudioConfig
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.OutputAudioConfigOrBuilder
       getReplyAudioConfigOrBuilder() {
-    return getReplyAudioConfig();
+    return replyAudioConfig_ == null
+        ? com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.getDefaultInstance()
+        : replyAudioConfig_;
   }
 
   public static final int QUERY_PARAMS_FIELD_NUMBER = 9;
@@ -435,7 +439,9 @@ public com.google.cloud.dialogflow.v2beta1.QueryParameters getQueryParams() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.QueryParametersOrBuilder getQueryParamsOrBuilder() {
-    return getQueryParams();
+    return queryParams_ == null
+        ? com.google.cloud.dialogflow.v2beta1.QueryParameters.getDefaultInstance()
+        : queryParams_;
   }
 
   public static final int ASSIST_QUERY_PARAMS_FIELD_NUMBER = 14;
@@ -484,7 +490,9 @@ public com.google.cloud.dialogflow.v2beta1.AssistQueryParameters getAssistQueryP
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.AssistQueryParametersOrBuilder
       getAssistQueryParamsOrBuilder() {
-    return getAssistQueryParams();
+    return assistQueryParams_ == null
+        ? com.google.cloud.dialogflow.v2beta1.AssistQueryParameters.getDefaultInstance()
+        : assistQueryParams_;
   }
 
   public static final int CX_PARAMETERS_FIELD_NUMBER = 18;
@@ -542,11 +550,13 @@ public com.google.protobuf.Struct getCxParameters() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getCxParametersOrBuilder() {
-    return getCxParameters();
+    return cxParameters_ == null ? com.google.protobuf.Struct.getDefaultInstance() : cxParameters_;
   }
 
   public static final int CX_CURRENT_PAGE_FIELD_NUMBER = 20;
-  private volatile java.lang.Object cxCurrentPage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object cxCurrentPage_ = "";
   /**
    *
    *
@@ -694,11 +704,15 @@ public com.google.protobuf.Timestamp getMessageSendTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getMessageSendTimeOrBuilder() {
-    return getMessageSendTime();
+    return messageSendTime_ == null
+        ? com.google.protobuf.Timestamp.getDefaultInstance()
+        : messageSendTime_;
   }
 
   public static final int REQUEST_ID_FIELD_NUMBER = 11;
-  private volatile java.lang.Object requestId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object requestId_ = "";
   /**
    *
    *
@@ -1090,8 +1104,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       participant_ = "";
-
       if (textInputBuilder_ != null) {
         textInputBuilder_.clear();
       }
@@ -1101,40 +1115,33 @@ public Builder clear() {
       if (eventInputBuilder_ != null) {
         eventInputBuilder_.clear();
       }
-      if (replyAudioConfigBuilder_ == null) {
-        replyAudioConfig_ = null;
-      } else {
-        replyAudioConfig_ = null;
+      replyAudioConfig_ = null;
+      if (replyAudioConfigBuilder_ != null) {
+        replyAudioConfigBuilder_.dispose();
         replyAudioConfigBuilder_ = null;
       }
-      if (queryParamsBuilder_ == null) {
-        queryParams_ = null;
-      } else {
-        queryParams_ = null;
+      queryParams_ = null;
+      if (queryParamsBuilder_ != null) {
+        queryParamsBuilder_.dispose();
         queryParamsBuilder_ = null;
       }
-      if (assistQueryParamsBuilder_ == null) {
-        assistQueryParams_ = null;
-      } else {
-        assistQueryParams_ = null;
+      assistQueryParams_ = null;
+      if (assistQueryParamsBuilder_ != null) {
+        assistQueryParamsBuilder_.dispose();
         assistQueryParamsBuilder_ = null;
       }
-      if (cxParametersBuilder_ == null) {
-        cxParameters_ = null;
-      } else {
-        cxParameters_ = null;
+      cxParameters_ = null;
+      if (cxParametersBuilder_ != null) {
+        cxParametersBuilder_.dispose();
         cxParametersBuilder_ = null;
       }
       cxCurrentPage_ = "";
-
-      if (messageSendTimeBuilder_ == null) {
-        messageSendTime_ = null;
-      } else {
-        messageSendTime_ = null;
+      messageSendTime_ = null;
+      if (messageSendTimeBuilder_ != null) {
+        messageSendTimeBuilder_.dispose();
         messageSendTimeBuilder_ = null;
       }
       requestId_ = "";
-
       inputCase_ = 0;
       input_ = null;
       return this;
@@ -1164,58 +1171,62 @@ public com.google.cloud.dialogflow.v2beta1.AnalyzeContentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.AnalyzeContentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.AnalyzeContentRequest result =
           new com.google.cloud.dialogflow.v2beta1.AnalyzeContentRequest(this);
-      result.participant_ = participant_;
-      if (inputCase_ == 6) {
-        if (textInputBuilder_ == null) {
-          result.input_ = input_;
-        } else {
-          result.input_ = textInputBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (inputCase_ == 7) {
-        if (audioInputBuilder_ == null) {
-          result.input_ = input_;
-        } else {
-          result.input_ = audioInputBuilder_.build();
-        }
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.AnalyzeContentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.participant_ = participant_;
       }
-      if (inputCase_ == 8) {
-        if (eventInputBuilder_ == null) {
-          result.input_ = input_;
-        } else {
-          result.input_ = eventInputBuilder_.build();
-        }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.replyAudioConfig_ =
+            replyAudioConfigBuilder_ == null ? replyAudioConfig_ : replyAudioConfigBuilder_.build();
       }
-      if (replyAudioConfigBuilder_ == null) {
-        result.replyAudioConfig_ = replyAudioConfig_;
-      } else {
-        result.replyAudioConfig_ = replyAudioConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.queryParams_ =
+            queryParamsBuilder_ == null ? queryParams_ : queryParamsBuilder_.build();
       }
-      if (queryParamsBuilder_ == null) {
-        result.queryParams_ = queryParams_;
-      } else {
-        result.queryParams_ = queryParamsBuilder_.build();
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.assistQueryParams_ =
+            assistQueryParamsBuilder_ == null
+                ? assistQueryParams_
+                : assistQueryParamsBuilder_.build();
       }
-      if (assistQueryParamsBuilder_ == null) {
-        result.assistQueryParams_ = assistQueryParams_;
-      } else {
-        result.assistQueryParams_ = assistQueryParamsBuilder_.build();
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.cxParameters_ =
+            cxParametersBuilder_ == null ? cxParameters_ : cxParametersBuilder_.build();
       }
-      if (cxParametersBuilder_ == null) {
-        result.cxParameters_ = cxParameters_;
-      } else {
-        result.cxParameters_ = cxParametersBuilder_.build();
+      if (((from_bitField0_ & 0x00000100) != 0)) {
+        result.cxCurrentPage_ = cxCurrentPage_;
       }
-      result.cxCurrentPage_ = cxCurrentPage_;
-      if (messageSendTimeBuilder_ == null) {
-        result.messageSendTime_ = messageSendTime_;
-      } else {
-        result.messageSendTime_ = messageSendTimeBuilder_.build();
+      if (((from_bitField0_ & 0x00000200) != 0)) {
+        result.messageSendTime_ =
+            messageSendTimeBuilder_ == null ? messageSendTime_ : messageSendTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000400) != 0)) {
+        result.requestId_ = requestId_;
       }
-      result.requestId_ = requestId_;
+    }
+
+    private void buildPartialOneofs(
+        com.google.cloud.dialogflow.v2beta1.AnalyzeContentRequest result) {
       result.inputCase_ = inputCase_;
-      onBuilt();
-      return result;
+      result.input_ = this.input_;
+      if (inputCase_ == 6 && textInputBuilder_ != null) {
+        result.input_ = textInputBuilder_.build();
+      }
+      if (inputCase_ == 7 && audioInputBuilder_ != null) {
+        result.input_ = audioInputBuilder_.build();
+      }
+      if (inputCase_ == 8 && eventInputBuilder_ != null) {
+        result.input_ = eventInputBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -1266,6 +1277,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.AnalyzeContentReque
         return this;
       if (!other.getParticipant().isEmpty()) {
         participant_ = other.participant_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasReplyAudioConfig()) {
@@ -1282,6 +1294,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.AnalyzeContentReque
       }
       if (!other.getCxCurrentPage().isEmpty()) {
         cxCurrentPage_ = other.cxCurrentPage_;
+        bitField0_ |= 0x00000100;
         onChanged();
       }
       if (other.hasMessageSendTime()) {
@@ -1289,6 +1302,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.AnalyzeContentReque
       }
       if (!other.getRequestId().isEmpty()) {
         requestId_ = other.requestId_;
+        bitField0_ |= 0x00000400;
         onChanged();
       }
       switch (other.getInputCase()) {
@@ -1341,14 +1355,14 @@ public Builder mergeFrom(
             case 10:
               {
                 participant_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 42:
               {
                 input.readMessage(
                     getReplyAudioConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             case 50:
@@ -1372,38 +1386,38 @@ public Builder mergeFrom(
             case 74:
               {
                 input.readMessage(getQueryParamsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 74
             case 82:
               {
                 input.readMessage(getMessageSendTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000200;
                 break;
               } // case 82
             case 90:
               {
                 requestId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000400;
                 break;
               } // case 90
             case 114:
               {
                 input.readMessage(
                     getAssistQueryParamsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 114
             case 146:
               {
                 input.readMessage(getCxParametersFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 146
             case 162:
               {
                 cxCurrentPage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000100;
                 break;
               } // case 162
             default:
@@ -1437,6 +1451,8 @@ public Builder clearInput() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object participant_ = "";
     /**
      *
@@ -1510,8 +1526,8 @@ public Builder setParticipant(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       participant_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1531,8 +1547,8 @@ public Builder setParticipant(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParticipant() {
-
       participant_ = getDefaultInstance().getParticipant();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1557,8 +1573,8 @@ public Builder setParticipantBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       participant_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1769,7 +1785,6 @@ public com.google.cloud.dialogflow.v2beta1.TextInputOrBuilder getTextInputOrBuil
       }
       inputCase_ = 6;
       onChanged();
-      ;
       return textInputBuilder_;
     }
 
@@ -1979,7 +1994,6 @@ public com.google.cloud.dialogflow.v2beta1.AudioInputOrBuilder getAudioInputOrBu
       }
       inputCase_ = 7;
       onChanged();
-      ;
       return audioInputBuilder_;
     }
 
@@ -2189,7 +2203,6 @@ public com.google.cloud.dialogflow.v2beta1.EventInputOrBuilder getEventInputOrBu
       }
       inputCase_ = 8;
       onChanged();
-      ;
       return eventInputBuilder_;
     }
 
@@ -2215,7 +2228,7 @@ public com.google.cloud.dialogflow.v2beta1.EventInputOrBuilder getEventInputOrBu
      * @return Whether the replyAudioConfig field is set.
      */
     public boolean hasReplyAudioConfig() {
-      return replyAudioConfigBuilder_ != null || replyAudioConfig_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -2261,11 +2274,11 @@ public Builder setReplyAudioConfig(
           throw new NullPointerException();
         }
         replyAudioConfig_ = value;
-        onChanged();
       } else {
         replyAudioConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2285,11 +2298,11 @@ public Builder setReplyAudioConfig(
         com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.Builder builderForValue) {
       if (replyAudioConfigBuilder_ == null) {
         replyAudioConfig_ = builderForValue.build();
-        onChanged();
       } else {
         replyAudioConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2308,19 +2321,19 @@ public Builder setReplyAudioConfig(
     public Builder mergeReplyAudioConfig(
         com.google.cloud.dialogflow.v2beta1.OutputAudioConfig value) {
       if (replyAudioConfigBuilder_ == null) {
-        if (replyAudioConfig_ != null) {
-          replyAudioConfig_ =
-              com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.newBuilder(replyAudioConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && replyAudioConfig_ != null
+            && replyAudioConfig_
+                != com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.getDefaultInstance()) {
+          getReplyAudioConfigBuilder().mergeFrom(value);
         } else {
           replyAudioConfig_ = value;
         }
-        onChanged();
       } else {
         replyAudioConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2337,14 +2350,13 @@ public Builder mergeReplyAudioConfig(
      * <code>.google.cloud.dialogflow.v2beta1.OutputAudioConfig reply_audio_config = 5;</code>
      */
     public Builder clearReplyAudioConfig() {
-      if (replyAudioConfigBuilder_ == null) {
-        replyAudioConfig_ = null;
-        onChanged();
-      } else {
-        replyAudioConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      replyAudioConfig_ = null;
+      if (replyAudioConfigBuilder_ != null) {
+        replyAudioConfigBuilder_.dispose();
         replyAudioConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2362,7 +2374,7 @@ public Builder clearReplyAudioConfig() {
      */
     public com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.Builder
         getReplyAudioConfigBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getReplyAudioConfigFieldBuilder().getBuilder();
     }
@@ -2437,7 +2449,7 @@ public Builder clearReplyAudioConfig() {
      * @return Whether the queryParams field is set.
      */
     public boolean hasQueryParams() {
-      return queryParamsBuilder_ != null || queryParams_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -2474,11 +2486,11 @@ public Builder setQueryParams(com.google.cloud.dialogflow.v2beta1.QueryParameter
           throw new NullPointerException();
         }
         queryParams_ = value;
-        onChanged();
       } else {
         queryParamsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2494,11 +2506,11 @@ public Builder setQueryParams(
         com.google.cloud.dialogflow.v2beta1.QueryParameters.Builder builderForValue) {
       if (queryParamsBuilder_ == null) {
         queryParams_ = builderForValue.build();
-        onChanged();
       } else {
         queryParamsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2512,19 +2524,19 @@ public Builder setQueryParams(
      */
     public Builder mergeQueryParams(com.google.cloud.dialogflow.v2beta1.QueryParameters value) {
       if (queryParamsBuilder_ == null) {
-        if (queryParams_ != null) {
-          queryParams_ =
-              com.google.cloud.dialogflow.v2beta1.QueryParameters.newBuilder(queryParams_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && queryParams_ != null
+            && queryParams_
+                != com.google.cloud.dialogflow.v2beta1.QueryParameters.getDefaultInstance()) {
+          getQueryParamsBuilder().mergeFrom(value);
         } else {
           queryParams_ = value;
         }
-        onChanged();
       } else {
         queryParamsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2537,14 +2549,13 @@ public Builder mergeQueryParams(com.google.cloud.dialogflow.v2beta1.QueryParamet
      * <code>.google.cloud.dialogflow.v2beta1.QueryParameters query_params = 9;</code>
      */
     public Builder clearQueryParams() {
-      if (queryParamsBuilder_ == null) {
-        queryParams_ = null;
-        onChanged();
-      } else {
-        queryParams_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      queryParams_ = null;
+      if (queryParamsBuilder_ != null) {
+        queryParamsBuilder_.dispose();
         queryParamsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2557,7 +2568,7 @@ public Builder clearQueryParams() {
      * <code>.google.cloud.dialogflow.v2beta1.QueryParameters query_params = 9;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.QueryParameters.Builder getQueryParamsBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getQueryParamsFieldBuilder().getBuilder();
     }
@@ -2623,7 +2634,7 @@ public com.google.cloud.dialogflow.v2beta1.QueryParametersOrBuilder getQueryPara
      * @return Whether the assistQueryParams field is set.
      */
     public boolean hasAssistQueryParams() {
-      return assistQueryParamsBuilder_ != null || assistQueryParams_ != null;
+      return ((bitField0_ & 0x00000040) != 0);
     }
     /**
      *
@@ -2661,11 +2672,11 @@ public Builder setAssistQueryParams(
           throw new NullPointerException();
         }
         assistQueryParams_ = value;
-        onChanged();
       } else {
         assistQueryParamsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2681,11 +2692,11 @@ public Builder setAssistQueryParams(
         com.google.cloud.dialogflow.v2beta1.AssistQueryParameters.Builder builderForValue) {
       if (assistQueryParamsBuilder_ == null) {
         assistQueryParams_ = builderForValue.build();
-        onChanged();
       } else {
         assistQueryParamsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2700,20 +2711,19 @@ public Builder setAssistQueryParams(
     public Builder mergeAssistQueryParams(
         com.google.cloud.dialogflow.v2beta1.AssistQueryParameters value) {
       if (assistQueryParamsBuilder_ == null) {
-        if (assistQueryParams_ != null) {
-          assistQueryParams_ =
-              com.google.cloud.dialogflow.v2beta1.AssistQueryParameters.newBuilder(
-                      assistQueryParams_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000040) != 0)
+            && assistQueryParams_ != null
+            && assistQueryParams_
+                != com.google.cloud.dialogflow.v2beta1.AssistQueryParameters.getDefaultInstance()) {
+          getAssistQueryParamsBuilder().mergeFrom(value);
         } else {
           assistQueryParams_ = value;
         }
-        onChanged();
       } else {
         assistQueryParamsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2726,14 +2736,13 @@ public Builder mergeAssistQueryParams(
      * <code>.google.cloud.dialogflow.v2beta1.AssistQueryParameters assist_query_params = 14;</code>
      */
     public Builder clearAssistQueryParams() {
-      if (assistQueryParamsBuilder_ == null) {
-        assistQueryParams_ = null;
-        onChanged();
-      } else {
-        assistQueryParams_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      assistQueryParams_ = null;
+      if (assistQueryParamsBuilder_ != null) {
+        assistQueryParamsBuilder_.dispose();
         assistQueryParamsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2747,7 +2756,7 @@ public Builder clearAssistQueryParams() {
      */
     public com.google.cloud.dialogflow.v2beta1.AssistQueryParameters.Builder
         getAssistQueryParamsBuilder() {
-
+      bitField0_ |= 0x00000040;
       onChanged();
       return getAssistQueryParamsFieldBuilder().getBuilder();
     }
@@ -2818,7 +2827,7 @@ public Builder clearAssistQueryParams() {
      * @return Whether the cxParameters field is set.
      */
     public boolean hasCxParameters() {
-      return cxParametersBuilder_ != null || cxParameters_ != null;
+      return ((bitField0_ & 0x00000080) != 0);
     }
     /**
      *
@@ -2863,11 +2872,11 @@ public Builder setCxParameters(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         cxParameters_ = value;
-        onChanged();
       } else {
         cxParametersBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2886,11 +2895,11 @@ public Builder setCxParameters(com.google.protobuf.Struct value) {
     public Builder setCxParameters(com.google.protobuf.Struct.Builder builderForValue) {
       if (cxParametersBuilder_ == null) {
         cxParameters_ = builderForValue.build();
-        onChanged();
       } else {
         cxParametersBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2908,17 +2917,18 @@ public Builder setCxParameters(com.google.protobuf.Struct.Builder builderForValu
      */
     public Builder mergeCxParameters(com.google.protobuf.Struct value) {
       if (cxParametersBuilder_ == null) {
-        if (cxParameters_ != null) {
-          cxParameters_ =
-              com.google.protobuf.Struct.newBuilder(cxParameters_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000080) != 0)
+            && cxParameters_ != null
+            && cxParameters_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getCxParametersBuilder().mergeFrom(value);
         } else {
           cxParameters_ = value;
         }
-        onChanged();
       } else {
         cxParametersBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2935,14 +2945,13 @@ public Builder mergeCxParameters(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct cx_parameters = 18;</code>
      */
     public Builder clearCxParameters() {
-      if (cxParametersBuilder_ == null) {
-        cxParameters_ = null;
-        onChanged();
-      } else {
-        cxParameters_ = null;
+      bitField0_ = (bitField0_ & ~0x00000080);
+      cxParameters_ = null;
+      if (cxParametersBuilder_ != null) {
+        cxParametersBuilder_.dispose();
         cxParametersBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2959,7 +2968,7 @@ public Builder clearCxParameters() {
      * <code>.google.protobuf.Struct cx_parameters = 18;</code>
      */
     public com.google.protobuf.Struct.Builder getCxParametersBuilder() {
-
+      bitField0_ |= 0x00000080;
       onChanged();
       return getCxParametersFieldBuilder().getBuilder();
     }
@@ -3109,8 +3118,8 @@ public Builder setCxCurrentPage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       cxCurrentPage_ = value;
+      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -3137,8 +3146,8 @@ public Builder setCxCurrentPage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearCxCurrentPage() {
-
       cxCurrentPage_ = getDefaultInstance().getCxCurrentPage();
+      bitField0_ = (bitField0_ & ~0x00000100);
       onChanged();
       return this;
     }
@@ -3170,8 +3179,8 @@ public Builder setCxCurrentPageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       cxCurrentPage_ = value;
+      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -3205,7 +3214,7 @@ public Builder setCxCurrentPageBytes(com.google.protobuf.ByteString value) {
      * @return Whether the messageSendTime field is set.
      */
     public boolean hasMessageSendTime() {
-      return messageSendTimeBuilder_ != null || messageSendTime_ != null;
+      return ((bitField0_ & 0x00000200) != 0);
     }
     /**
      *
@@ -3264,11 +3273,11 @@ public Builder setMessageSendTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         messageSendTime_ = value;
-        onChanged();
       } else {
         messageSendTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -3294,11 +3303,11 @@ public Builder setMessageSendTime(com.google.protobuf.Timestamp value) {
     public Builder setMessageSendTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (messageSendTimeBuilder_ == null) {
         messageSendTime_ = builderForValue.build();
-        onChanged();
       } else {
         messageSendTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -3323,19 +3332,18 @@ public Builder setMessageSendTime(com.google.protobuf.Timestamp.Builder builderF
      */
     public Builder mergeMessageSendTime(com.google.protobuf.Timestamp value) {
       if (messageSendTimeBuilder_ == null) {
-        if (messageSendTime_ != null) {
-          messageSendTime_ =
-              com.google.protobuf.Timestamp.newBuilder(messageSendTime_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000200) != 0)
+            && messageSendTime_ != null
+            && messageSendTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getMessageSendTimeBuilder().mergeFrom(value);
         } else {
           messageSendTime_ = value;
         }
-        onChanged();
       } else {
         messageSendTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -3359,14 +3367,13 @@ public Builder mergeMessageSendTime(com.google.protobuf.Timestamp value) {
      * <code>.google.protobuf.Timestamp message_send_time = 10;</code>
      */
     public Builder clearMessageSendTime() {
-      if (messageSendTimeBuilder_ == null) {
-        messageSendTime_ = null;
-        onChanged();
-      } else {
-        messageSendTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000200);
+      messageSendTime_ = null;
+      if (messageSendTimeBuilder_ != null) {
+        messageSendTimeBuilder_.dispose();
         messageSendTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3390,7 +3397,7 @@ public Builder clearMessageSendTime() {
      * <code>.google.protobuf.Timestamp message_send_time = 10;</code>
      */
     public com.google.protobuf.Timestamp.Builder getMessageSendTimeBuilder() {
-
+      bitField0_ |= 0x00000200;
       onChanged();
       return getMessageSendTimeFieldBuilder().getBuilder();
     }
@@ -3527,8 +3534,8 @@ public Builder setRequestId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       requestId_ = value;
+      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -3546,8 +3553,8 @@ public Builder setRequestId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearRequestId() {
-
       requestId_ = getDefaultInstance().getRequestId();
+      bitField0_ = (bitField0_ & ~0x00000400);
       onChanged();
       return this;
     }
@@ -3570,8 +3577,8 @@ public Builder setRequestIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       requestId_ = value;
+      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AnalyzeContentResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AnalyzeContentResponse.java
index 85a7b36da8c6..c07467dcf9c1 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AnalyzeContentResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AnalyzeContentResponse.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int REPLY_TEXT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object replyText_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object replyText_ = "";
   /**
    *
    *
@@ -191,7 +193,9 @@ public com.google.cloud.dialogflow.v2beta1.OutputAudio getReplyAudio() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.OutputAudioOrBuilder getReplyAudioOrBuilder() {
-    return getReplyAudio();
+    return replyAudio_ == null
+        ? com.google.cloud.dialogflow.v2beta1.OutputAudio.getDefaultInstance()
+        : replyAudio_;
   }
 
   public static final int AUTOMATED_AGENT_REPLY_FIELD_NUMBER = 3;
@@ -249,7 +253,9 @@ public com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply getAutomatedAgent
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.AutomatedAgentReplyOrBuilder
       getAutomatedAgentReplyOrBuilder() {
-    return getAutomatedAgentReply();
+    return automatedAgentReply_ == null
+        ? com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply.getDefaultInstance()
+        : automatedAgentReply_;
   }
 
   public static final int MESSAGE_FIELD_NUMBER = 5;
@@ -297,10 +303,14 @@ public com.google.cloud.dialogflow.v2beta1.Message getMessage() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.MessageOrBuilder getMessageOrBuilder() {
-    return getMessage();
+    return message_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Message.getDefaultInstance()
+        : message_;
   }
 
   public static final int HUMAN_AGENT_SUGGESTION_RESULTS_FIELD_NUMBER = 6;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.SuggestionResult>
       humanAgentSuggestionResults_;
   /**
@@ -414,6 +424,8 @@ public com.google.cloud.dialogflow.v2beta1.SuggestionResult getHumanAgentSuggest
   }
 
   public static final int END_USER_SUGGESTION_RESULTS_FIELD_NUMBER = 7;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.SuggestionResult>
       endUserSuggestionResults_;
   /**
@@ -571,7 +583,9 @@ public com.google.cloud.dialogflow.v2beta1.DtmfParameters getDtmfParameters() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.DtmfParametersOrBuilder getDtmfParametersOrBuilder() {
-    return getDtmfParameters();
+    return dtmfParameters_ == null
+        ? com.google.cloud.dialogflow.v2beta1.DtmfParameters.getDefaultInstance()
+        : dtmfParameters_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -856,24 +870,21 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       replyText_ = "";
-
-      if (replyAudioBuilder_ == null) {
-        replyAudio_ = null;
-      } else {
-        replyAudio_ = null;
+      replyAudio_ = null;
+      if (replyAudioBuilder_ != null) {
+        replyAudioBuilder_.dispose();
         replyAudioBuilder_ = null;
       }
-      if (automatedAgentReplyBuilder_ == null) {
-        automatedAgentReply_ = null;
-      } else {
-        automatedAgentReply_ = null;
+      automatedAgentReply_ = null;
+      if (automatedAgentReplyBuilder_ != null) {
+        automatedAgentReplyBuilder_.dispose();
         automatedAgentReplyBuilder_ = null;
       }
-      if (messageBuilder_ == null) {
-        message_ = null;
-      } else {
-        message_ = null;
+      message_ = null;
+      if (messageBuilder_ != null) {
+        messageBuilder_.dispose();
         messageBuilder_ = null;
       }
       if (humanAgentSuggestionResultsBuilder_ == null) {
@@ -882,18 +893,17 @@ public Builder clear() {
         humanAgentSuggestionResults_ = null;
         humanAgentSuggestionResultsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000010);
       if (endUserSuggestionResultsBuilder_ == null) {
         endUserSuggestionResults_ = java.util.Collections.emptyList();
       } else {
         endUserSuggestionResults_ = null;
         endUserSuggestionResultsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
-      if (dtmfParametersBuilder_ == null) {
-        dtmfParameters_ = null;
-      } else {
-        dtmfParameters_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      dtmfParameters_ = null;
+      if (dtmfParametersBuilder_ != null) {
+        dtmfParametersBuilder_.dispose();
         dtmfParametersBuilder_ = null;
       }
       return this;
@@ -923,50 +933,59 @@ public com.google.cloud.dialogflow.v2beta1.AnalyzeContentResponse build() {
     public com.google.cloud.dialogflow.v2beta1.AnalyzeContentResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.AnalyzeContentResponse result =
           new com.google.cloud.dialogflow.v2beta1.AnalyzeContentResponse(this);
-      int from_bitField0_ = bitField0_;
-      result.replyText_ = replyText_;
-      if (replyAudioBuilder_ == null) {
-        result.replyAudio_ = replyAudio_;
-      } else {
-        result.replyAudio_ = replyAudioBuilder_.build();
-      }
-      if (automatedAgentReplyBuilder_ == null) {
-        result.automatedAgentReply_ = automatedAgentReply_;
-      } else {
-        result.automatedAgentReply_ = automatedAgentReplyBuilder_.build();
-      }
-      if (messageBuilder_ == null) {
-        result.message_ = message_;
-      } else {
-        result.message_ = messageBuilder_.build();
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.AnalyzeContentResponse result) {
       if (humanAgentSuggestionResultsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000010) != 0)) {
           humanAgentSuggestionResults_ =
               java.util.Collections.unmodifiableList(humanAgentSuggestionResults_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000010);
         }
         result.humanAgentSuggestionResults_ = humanAgentSuggestionResults_;
       } else {
         result.humanAgentSuggestionResults_ = humanAgentSuggestionResultsBuilder_.build();
       }
       if (endUserSuggestionResultsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000020) != 0)) {
           endUserSuggestionResults_ =
               java.util.Collections.unmodifiableList(endUserSuggestionResults_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000020);
         }
         result.endUserSuggestionResults_ = endUserSuggestionResults_;
       } else {
         result.endUserSuggestionResults_ = endUserSuggestionResultsBuilder_.build();
       }
-      if (dtmfParametersBuilder_ == null) {
-        result.dtmfParameters_ = dtmfParameters_;
-      } else {
-        result.dtmfParameters_ = dtmfParametersBuilder_.build();
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.AnalyzeContentResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.replyText_ = replyText_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.replyAudio_ = replyAudioBuilder_ == null ? replyAudio_ : replyAudioBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.automatedAgentReply_ =
+            automatedAgentReplyBuilder_ == null
+                ? automatedAgentReply_
+                : automatedAgentReplyBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.message_ = messageBuilder_ == null ? message_ : messageBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.dtmfParameters_ =
+            dtmfParametersBuilder_ == null ? dtmfParameters_ : dtmfParametersBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -1017,6 +1036,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.AnalyzeContentRespo
         return this;
       if (!other.getReplyText().isEmpty()) {
         replyText_ = other.replyText_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasReplyAudio()) {
@@ -1032,7 +1052,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.AnalyzeContentRespo
         if (!other.humanAgentSuggestionResults_.isEmpty()) {
           if (humanAgentSuggestionResults_.isEmpty()) {
             humanAgentSuggestionResults_ = other.humanAgentSuggestionResults_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
             ensureHumanAgentSuggestionResultsIsMutable();
             humanAgentSuggestionResults_.addAll(other.humanAgentSuggestionResults_);
@@ -1045,7 +1065,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.AnalyzeContentRespo
             humanAgentSuggestionResultsBuilder_.dispose();
             humanAgentSuggestionResultsBuilder_ = null;
             humanAgentSuggestionResults_ = other.humanAgentSuggestionResults_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
             humanAgentSuggestionResultsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getHumanAgentSuggestionResultsFieldBuilder()
@@ -1059,7 +1079,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.AnalyzeContentRespo
         if (!other.endUserSuggestionResults_.isEmpty()) {
           if (endUserSuggestionResults_.isEmpty()) {
             endUserSuggestionResults_ = other.endUserSuggestionResults_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000020);
           } else {
             ensureEndUserSuggestionResultsIsMutable();
             endUserSuggestionResults_.addAll(other.endUserSuggestionResults_);
@@ -1072,7 +1092,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.AnalyzeContentRespo
             endUserSuggestionResultsBuilder_.dispose();
             endUserSuggestionResultsBuilder_ = null;
             endUserSuggestionResults_ = other.endUserSuggestionResults_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000020);
             endUserSuggestionResultsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getEndUserSuggestionResultsFieldBuilder()
@@ -1114,26 +1134,26 @@ public Builder mergeFrom(
             case 10:
               {
                 replyText_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getReplyAudioFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(
                     getAutomatedAgentReplyFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 42:
               {
                 input.readMessage(getMessageFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 42
             case 50:
@@ -1167,7 +1187,7 @@ public Builder mergeFrom(
             case 74:
               {
                 input.readMessage(getDtmfParametersFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 74
             default:
@@ -1256,8 +1276,8 @@ public Builder setReplyText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       replyText_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1275,8 +1295,8 @@ public Builder setReplyText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearReplyText() {
-
       replyText_ = getDefaultInstance().getReplyText();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1299,8 +1319,8 @@ public Builder setReplyTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       replyText_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1331,7 +1351,7 @@ public Builder setReplyTextBytes(com.google.protobuf.ByteString value) {
      * @return Whether the replyAudio field is set.
      */
     public boolean hasReplyAudio() {
-      return replyAudioBuilder_ != null || replyAudio_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -1384,11 +1404,11 @@ public Builder setReplyAudio(com.google.cloud.dialogflow.v2beta1.OutputAudio val
           throw new NullPointerException();
         }
         replyAudio_ = value;
-        onChanged();
       } else {
         replyAudioBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1412,11 +1432,11 @@ public Builder setReplyAudio(
         com.google.cloud.dialogflow.v2beta1.OutputAudio.Builder builderForValue) {
       if (replyAudioBuilder_ == null) {
         replyAudio_ = builderForValue.build();
-        onChanged();
       } else {
         replyAudioBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1438,19 +1458,19 @@ public Builder setReplyAudio(
      */
     public Builder mergeReplyAudio(com.google.cloud.dialogflow.v2beta1.OutputAudio value) {
       if (replyAudioBuilder_ == null) {
-        if (replyAudio_ != null) {
-          replyAudio_ =
-              com.google.cloud.dialogflow.v2beta1.OutputAudio.newBuilder(replyAudio_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && replyAudio_ != null
+            && replyAudio_
+                != com.google.cloud.dialogflow.v2beta1.OutputAudio.getDefaultInstance()) {
+          getReplyAudioBuilder().mergeFrom(value);
         } else {
           replyAudio_ = value;
         }
-        onChanged();
       } else {
         replyAudioBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1471,14 +1491,13 @@ public Builder mergeReplyAudio(com.google.cloud.dialogflow.v2beta1.OutputAudio v
      * <code>.google.cloud.dialogflow.v2beta1.OutputAudio reply_audio = 2;</code>
      */
     public Builder clearReplyAudio() {
-      if (replyAudioBuilder_ == null) {
-        replyAudio_ = null;
-        onChanged();
-      } else {
-        replyAudio_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      replyAudio_ = null;
+      if (replyAudioBuilder_ != null) {
+        replyAudioBuilder_.dispose();
         replyAudioBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1499,7 +1518,7 @@ public Builder clearReplyAudio() {
      * <code>.google.cloud.dialogflow.v2beta1.OutputAudio reply_audio = 2;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.OutputAudio.Builder getReplyAudioBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getReplyAudioFieldBuilder().getBuilder();
     }
@@ -1584,7 +1603,7 @@ public com.google.cloud.dialogflow.v2beta1.OutputAudioOrBuilder getReplyAudioOrB
      * @return Whether the automatedAgentReply field is set.
      */
     public boolean hasAutomatedAgentReply() {
-      return automatedAgentReplyBuilder_ != null || automatedAgentReply_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1628,11 +1647,11 @@ public Builder setAutomatedAgentReply(
           throw new NullPointerException();
         }
         automatedAgentReply_ = value;
-        onChanged();
       } else {
         automatedAgentReplyBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1651,11 +1670,11 @@ public Builder setAutomatedAgentReply(
         com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply.Builder builderForValue) {
       if (automatedAgentReplyBuilder_ == null) {
         automatedAgentReply_ = builderForValue.build();
-        onChanged();
       } else {
         automatedAgentReplyBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1673,20 +1692,19 @@ public Builder setAutomatedAgentReply(
     public Builder mergeAutomatedAgentReply(
         com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply value) {
       if (automatedAgentReplyBuilder_ == null) {
-        if (automatedAgentReply_ != null) {
-          automatedAgentReply_ =
-              com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply.newBuilder(
-                      automatedAgentReply_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && automatedAgentReply_ != null
+            && automatedAgentReply_
+                != com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply.getDefaultInstance()) {
+          getAutomatedAgentReplyBuilder().mergeFrom(value);
         } else {
           automatedAgentReply_ = value;
         }
-        onChanged();
       } else {
         automatedAgentReplyBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1702,14 +1720,13 @@ public Builder mergeAutomatedAgentReply(
      * <code>.google.cloud.dialogflow.v2beta1.AutomatedAgentReply automated_agent_reply = 3;</code>
      */
     public Builder clearAutomatedAgentReply() {
-      if (automatedAgentReplyBuilder_ == null) {
-        automatedAgentReply_ = null;
-        onChanged();
-      } else {
-        automatedAgentReply_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      automatedAgentReply_ = null;
+      if (automatedAgentReplyBuilder_ != null) {
+        automatedAgentReplyBuilder_.dispose();
         automatedAgentReplyBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1726,7 +1743,7 @@ public Builder clearAutomatedAgentReply() {
      */
     public com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply.Builder
         getAutomatedAgentReplyBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getAutomatedAgentReplyFieldBuilder().getBuilder();
     }
@@ -1799,7 +1816,7 @@ public Builder clearAutomatedAgentReply() {
      * @return Whether the message field is set.
      */
     public boolean hasMessage() {
-      return messageBuilder_ != null || message_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1836,11 +1853,11 @@ public Builder setMessage(com.google.cloud.dialogflow.v2beta1.Message value) {
           throw new NullPointerException();
         }
         message_ = value;
-        onChanged();
       } else {
         messageBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1855,11 +1872,11 @@ public Builder setMessage(com.google.cloud.dialogflow.v2beta1.Message value) {
     public Builder setMessage(com.google.cloud.dialogflow.v2beta1.Message.Builder builderForValue) {
       if (messageBuilder_ == null) {
         message_ = builderForValue.build();
-        onChanged();
       } else {
         messageBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1873,19 +1890,18 @@ public Builder setMessage(com.google.cloud.dialogflow.v2beta1.Message.Builder bu
      */
     public Builder mergeMessage(com.google.cloud.dialogflow.v2beta1.Message value) {
       if (messageBuilder_ == null) {
-        if (message_ != null) {
-          message_ =
-              com.google.cloud.dialogflow.v2beta1.Message.newBuilder(message_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && message_ != null
+            && message_ != com.google.cloud.dialogflow.v2beta1.Message.getDefaultInstance()) {
+          getMessageBuilder().mergeFrom(value);
         } else {
           message_ = value;
         }
-        onChanged();
       } else {
         messageBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1898,14 +1914,13 @@ public Builder mergeMessage(com.google.cloud.dialogflow.v2beta1.Message value) {
      * <code>.google.cloud.dialogflow.v2beta1.Message message = 5;</code>
      */
     public Builder clearMessage() {
-      if (messageBuilder_ == null) {
-        message_ = null;
-        onChanged();
-      } else {
-        message_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      message_ = null;
+      if (messageBuilder_ != null) {
+        messageBuilder_.dispose();
         messageBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1918,7 +1933,7 @@ public Builder clearMessage() {
      * <code>.google.cloud.dialogflow.v2beta1.Message message = 5;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.Message.Builder getMessageBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getMessageFieldBuilder().getBuilder();
     }
@@ -1970,11 +1985,11 @@ public com.google.cloud.dialogflow.v2beta1.MessageOrBuilder getMessageOrBuilder(
         humanAgentSuggestionResults_ = java.util.Collections.emptyList();
 
     private void ensureHumanAgentSuggestionResultsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         humanAgentSuggestionResults_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.SuggestionResult>(
                 humanAgentSuggestionResults_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000010;
       }
     }
 
@@ -2284,7 +2299,7 @@ public Builder addAllHumanAgentSuggestionResults(
     public Builder clearHumanAgentSuggestionResults() {
       if (humanAgentSuggestionResultsBuilder_ == null) {
         humanAgentSuggestionResults_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
       } else {
         humanAgentSuggestionResultsBuilder_.clear();
@@ -2468,7 +2483,7 @@ public Builder removeHumanAgentSuggestionResults(int index) {
                 com.google.cloud.dialogflow.v2beta1.SuggestionResult.Builder,
                 com.google.cloud.dialogflow.v2beta1.SuggestionResultOrBuilder>(
                 humanAgentSuggestionResults_,
-                ((bitField0_ & 0x00000001) != 0),
+                ((bitField0_ & 0x00000010) != 0),
                 getParentForChildren(),
                 isClean());
         humanAgentSuggestionResults_ = null;
@@ -2480,11 +2495,11 @@ public Builder removeHumanAgentSuggestionResults(int index) {
         endUserSuggestionResults_ = java.util.Collections.emptyList();
 
     private void ensureEndUserSuggestionResultsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000020) != 0)) {
         endUserSuggestionResults_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.SuggestionResult>(
                 endUserSuggestionResults_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000020;
       }
     }
 
@@ -2793,7 +2808,7 @@ public Builder addAllEndUserSuggestionResults(
     public Builder clearEndUserSuggestionResults() {
       if (endUserSuggestionResultsBuilder_ == null) {
         endUserSuggestionResults_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000020);
         onChanged();
       } else {
         endUserSuggestionResultsBuilder_.clear();
@@ -2977,7 +2992,7 @@ public Builder removeEndUserSuggestionResults(int index) {
                 com.google.cloud.dialogflow.v2beta1.SuggestionResult.Builder,
                 com.google.cloud.dialogflow.v2beta1.SuggestionResultOrBuilder>(
                 endUserSuggestionResults_,
-                ((bitField0_ & 0x00000002) != 0),
+                ((bitField0_ & 0x00000020) != 0),
                 getParentForChildren(),
                 isClean());
         endUserSuggestionResults_ = null;
@@ -3003,7 +3018,7 @@ public Builder removeEndUserSuggestionResults(int index) {
      * @return Whether the dtmfParameters field is set.
      */
     public boolean hasDtmfParameters() {
-      return dtmfParametersBuilder_ != null || dtmfParameters_ != null;
+      return ((bitField0_ & 0x00000040) != 0);
     }
     /**
      *
@@ -3040,11 +3055,11 @@ public Builder setDtmfParameters(com.google.cloud.dialogflow.v2beta1.DtmfParamet
           throw new NullPointerException();
         }
         dtmfParameters_ = value;
-        onChanged();
       } else {
         dtmfParametersBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -3060,11 +3075,11 @@ public Builder setDtmfParameters(
         com.google.cloud.dialogflow.v2beta1.DtmfParameters.Builder builderForValue) {
       if (dtmfParametersBuilder_ == null) {
         dtmfParameters_ = builderForValue.build();
-        onChanged();
       } else {
         dtmfParametersBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -3078,19 +3093,19 @@ public Builder setDtmfParameters(
      */
     public Builder mergeDtmfParameters(com.google.cloud.dialogflow.v2beta1.DtmfParameters value) {
       if (dtmfParametersBuilder_ == null) {
-        if (dtmfParameters_ != null) {
-          dtmfParameters_ =
-              com.google.cloud.dialogflow.v2beta1.DtmfParameters.newBuilder(dtmfParameters_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000040) != 0)
+            && dtmfParameters_ != null
+            && dtmfParameters_
+                != com.google.cloud.dialogflow.v2beta1.DtmfParameters.getDefaultInstance()) {
+          getDtmfParametersBuilder().mergeFrom(value);
         } else {
           dtmfParameters_ = value;
         }
-        onChanged();
       } else {
         dtmfParametersBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -3103,14 +3118,13 @@ public Builder mergeDtmfParameters(com.google.cloud.dialogflow.v2beta1.DtmfParam
      * <code>.google.cloud.dialogflow.v2beta1.DtmfParameters dtmf_parameters = 9;</code>
      */
     public Builder clearDtmfParameters() {
-      if (dtmfParametersBuilder_ == null) {
-        dtmfParameters_ = null;
-        onChanged();
-      } else {
-        dtmfParameters_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      dtmfParameters_ = null;
+      if (dtmfParametersBuilder_ != null) {
+        dtmfParametersBuilder_.dispose();
         dtmfParametersBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3123,7 +3137,7 @@ public Builder clearDtmfParameters() {
      * <code>.google.cloud.dialogflow.v2beta1.DtmfParameters dtmf_parameters = 9;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.DtmfParameters.Builder getDtmfParametersBuilder() {
-
+      bitField0_ |= 0x00000040;
       onChanged();
       return getDtmfParametersFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AnnotatedMessagePart.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AnnotatedMessagePart.java
index 36a976ffb2d9..baac07ba05d3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AnnotatedMessagePart.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AnnotatedMessagePart.java
@@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int TEXT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object text_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object text_ = "";
   /**
    *
    *
@@ -120,7 +122,9 @@ public com.google.protobuf.ByteString getTextBytes() {
   }
 
   public static final int ENTITY_TYPE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object entityType_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object entityType_ = "";
   /**
    *
    *
@@ -246,7 +250,9 @@ public com.google.protobuf.Value getFormattedValue() {
    */
   @java.lang.Override
   public com.google.protobuf.ValueOrBuilder getFormattedValueOrBuilder() {
-    return getFormattedValue();
+    return formattedValue_ == null
+        ? com.google.protobuf.Value.getDefaultInstance()
+        : formattedValue_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -472,14 +478,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       text_ = "";
-
       entityType_ = "";
-
-      if (formattedValueBuilder_ == null) {
-        formattedValue_ = null;
-      } else {
-        formattedValue_ = null;
+      formattedValue_ = null;
+      if (formattedValueBuilder_ != null) {
+        formattedValueBuilder_.dispose();
         formattedValueBuilder_ = null;
       }
       return this;
@@ -509,17 +513,27 @@ public com.google.cloud.dialogflow.v2beta1.AnnotatedMessagePart build() {
     public com.google.cloud.dialogflow.v2beta1.AnnotatedMessagePart buildPartial() {
       com.google.cloud.dialogflow.v2beta1.AnnotatedMessagePart result =
           new com.google.cloud.dialogflow.v2beta1.AnnotatedMessagePart(this);
-      result.text_ = text_;
-      result.entityType_ = entityType_;
-      if (formattedValueBuilder_ == null) {
-        result.formattedValue_ = formattedValue_;
-      } else {
-        result.formattedValue_ = formattedValueBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.AnnotatedMessagePart result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.text_ = text_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.entityType_ = entityType_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.formattedValue_ =
+            formattedValueBuilder_ == null ? formattedValue_ : formattedValueBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -568,10 +582,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.AnnotatedMessagePar
         return this;
       if (!other.getText().isEmpty()) {
         text_ = other.text_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getEntityType().isEmpty()) {
         entityType_ = other.entityType_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasFormattedValue()) {
@@ -606,19 +622,19 @@ public Builder mergeFrom(
             case 10:
               {
                 text_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 entityType_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getFormattedValueFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -638,6 +654,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object text_ = "";
     /**
      *
@@ -699,8 +717,8 @@ public Builder setText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       text_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -716,8 +734,8 @@ public Builder setText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearText() {
-
       text_ = getDefaultInstance().getText();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -738,8 +756,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       text_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -814,8 +832,8 @@ public Builder setEntityType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       entityType_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -834,8 +852,8 @@ public Builder setEntityType(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearEntityType() {
-
       entityType_ = getDefaultInstance().getEntityType();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -859,8 +877,8 @@ public Builder setEntityTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       entityType_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -892,7 +910,7 @@ public Builder setEntityTypeBytes(com.google.protobuf.ByteString value) {
      * @return Whether the formattedValue field is set.
      */
     public boolean hasFormattedValue() {
-      return formattedValueBuilder_ != null || formattedValue_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -947,11 +965,11 @@ public Builder setFormattedValue(com.google.protobuf.Value value) {
           throw new NullPointerException();
         }
         formattedValue_ = value;
-        onChanged();
       } else {
         formattedValueBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -975,11 +993,11 @@ public Builder setFormattedValue(com.google.protobuf.Value value) {
     public Builder setFormattedValue(com.google.protobuf.Value.Builder builderForValue) {
       if (formattedValueBuilder_ == null) {
         formattedValue_ = builderForValue.build();
-        onChanged();
       } else {
         formattedValueBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1002,17 +1020,18 @@ public Builder setFormattedValue(com.google.protobuf.Value.Builder builderForVal
      */
     public Builder mergeFormattedValue(com.google.protobuf.Value value) {
       if (formattedValueBuilder_ == null) {
-        if (formattedValue_ != null) {
-          formattedValue_ =
-              com.google.protobuf.Value.newBuilder(formattedValue_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && formattedValue_ != null
+            && formattedValue_ != com.google.protobuf.Value.getDefaultInstance()) {
+          getFormattedValueBuilder().mergeFrom(value);
         } else {
           formattedValue_ = value;
         }
-        onChanged();
       } else {
         formattedValueBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1034,14 +1053,13 @@ public Builder mergeFormattedValue(com.google.protobuf.Value value) {
      * <code>.google.protobuf.Value formatted_value = 3;</code>
      */
     public Builder clearFormattedValue() {
-      if (formattedValueBuilder_ == null) {
-        formattedValue_ = null;
-        onChanged();
-      } else {
-        formattedValue_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      formattedValue_ = null;
+      if (formattedValueBuilder_ != null) {
+        formattedValueBuilder_.dispose();
         formattedValueBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1063,7 +1081,7 @@ public Builder clearFormattedValue() {
      * <code>.google.protobuf.Value formatted_value = 3;</code>
      */
     public com.google.protobuf.Value.Builder getFormattedValueBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getFormattedValueFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AnswerFeedback.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AnswerFeedback.java
index a6e0fa204427..6942e66d61c3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AnswerFeedback.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AnswerFeedback.java
@@ -296,7 +296,7 @@ public DetailFeedbackCase getDetailFeedbackCase() {
   }
 
   public static final int CORRECTNESS_LEVEL_FIELD_NUMBER = 1;
-  private int correctnessLevel_;
+  private int correctnessLevel_ = 0;
   /**
    *
    *
@@ -327,9 +327,8 @@ public int getCorrectnessLevelValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.AnswerFeedback.CorrectnessLevel getCorrectnessLevel() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.AnswerFeedback.CorrectnessLevel result =
-        com.google.cloud.dialogflow.v2beta1.AnswerFeedback.CorrectnessLevel.valueOf(
+        com.google.cloud.dialogflow.v2beta1.AnswerFeedback.CorrectnessLevel.forNumber(
             correctnessLevel_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.AnswerFeedback.CorrectnessLevel.UNRECOGNIZED
@@ -396,7 +395,7 @@ public boolean hasAgentAssistantDetailFeedback() {
   }
 
   public static final int CLICKED_FIELD_NUMBER = 3;
-  private boolean clicked_;
+  private boolean clicked_ = false;
   /**
    *
    *
@@ -457,11 +456,11 @@ public com.google.protobuf.Timestamp getClickTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getClickTimeOrBuilder() {
-    return getClickTime();
+    return clickTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : clickTime_;
   }
 
   public static final int DISPLAYED_FIELD_NUMBER = 4;
-  private boolean displayed_;
+  private boolean displayed_ = false;
   /**
    *
    *
@@ -522,7 +521,7 @@ public com.google.protobuf.Timestamp getDisplayTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getDisplayTimeOrBuilder() {
-    return getDisplayTime();
+    return displayTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : displayTime_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -801,25 +800,21 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       correctnessLevel_ = 0;
-
       if (agentAssistantDetailFeedbackBuilder_ != null) {
         agentAssistantDetailFeedbackBuilder_.clear();
       }
       clicked_ = false;
-
-      if (clickTimeBuilder_ == null) {
-        clickTime_ = null;
-      } else {
-        clickTime_ = null;
+      clickTime_ = null;
+      if (clickTimeBuilder_ != null) {
+        clickTimeBuilder_.dispose();
         clickTimeBuilder_ = null;
       }
       displayed_ = false;
-
-      if (displayTimeBuilder_ == null) {
-        displayTime_ = null;
-      } else {
-        displayTime_ = null;
+      displayTime_ = null;
+      if (displayTimeBuilder_ != null) {
+        displayTimeBuilder_.dispose();
         displayTimeBuilder_ = null;
       }
       detailFeedbackCase_ = 0;
@@ -851,29 +846,40 @@ public com.google.cloud.dialogflow.v2beta1.AnswerFeedback build() {
     public com.google.cloud.dialogflow.v2beta1.AnswerFeedback buildPartial() {
       com.google.cloud.dialogflow.v2beta1.AnswerFeedback result =
           new com.google.cloud.dialogflow.v2beta1.AnswerFeedback(this);
-      result.correctnessLevel_ = correctnessLevel_;
-      if (detailFeedbackCase_ == 2) {
-        if (agentAssistantDetailFeedbackBuilder_ == null) {
-          result.detailFeedback_ = detailFeedback_;
-        } else {
-          result.detailFeedback_ = agentAssistantDetailFeedbackBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.clicked_ = clicked_;
-      if (clickTimeBuilder_ == null) {
-        result.clickTime_ = clickTime_;
-      } else {
-        result.clickTime_ = clickTimeBuilder_.build();
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.AnswerFeedback result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.correctnessLevel_ = correctnessLevel_;
       }
-      result.displayed_ = displayed_;
-      if (displayTimeBuilder_ == null) {
-        result.displayTime_ = displayTime_;
-      } else {
-        result.displayTime_ = displayTimeBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.clicked_ = clicked_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.clickTime_ = clickTimeBuilder_ == null ? clickTime_ : clickTimeBuilder_.build();
       }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.displayed_ = displayed_;
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.displayTime_ =
+            displayTimeBuilder_ == null ? displayTime_ : displayTimeBuilder_.build();
+      }
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2beta1.AnswerFeedback result) {
       result.detailFeedbackCase_ = detailFeedbackCase_;
-      onBuilt();
-      return result;
+      result.detailFeedback_ = this.detailFeedback_;
+      if (detailFeedbackCase_ == 2 && agentAssistantDetailFeedbackBuilder_ != null) {
+        result.detailFeedback_ = agentAssistantDetailFeedbackBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -977,7 +983,7 @@ public Builder mergeFrom(
             case 8:
               {
                 correctnessLevel_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 18:
@@ -990,25 +996,25 @@ public Builder mergeFrom(
             case 24:
               {
                 clicked_ = input.readBool();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 32:
               {
                 displayed_ = input.readBool();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 32
             case 42:
               {
                 input.readMessage(getClickTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 42
             case 50:
               {
                 input.readMessage(getDisplayTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 50
             default:
@@ -1042,6 +1048,8 @@ public Builder clearDetailFeedback() {
       return this;
     }
 
+    private int bitField0_;
+
     private int correctnessLevel_ = 0;
     /**
      *
@@ -1073,8 +1081,8 @@ public int getCorrectnessLevelValue() {
      * @return This builder for chaining.
      */
     public Builder setCorrectnessLevelValue(int value) {
-
       correctnessLevel_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1093,9 +1101,8 @@ public Builder setCorrectnessLevelValue(int value) {
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.AnswerFeedback.CorrectnessLevel
         getCorrectnessLevel() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.AnswerFeedback.CorrectnessLevel result =
-          com.google.cloud.dialogflow.v2beta1.AnswerFeedback.CorrectnessLevel.valueOf(
+          com.google.cloud.dialogflow.v2beta1.AnswerFeedback.CorrectnessLevel.forNumber(
               correctnessLevel_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.AnswerFeedback.CorrectnessLevel.UNRECOGNIZED
@@ -1119,7 +1126,7 @@ public Builder setCorrectnessLevel(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       correctnessLevel_ = value.getNumber();
       onChanged();
       return this;
@@ -1137,7 +1144,7 @@ public Builder setCorrectnessLevel(
      * @return This builder for chaining.
      */
     public Builder clearCorrectnessLevel() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       correctnessLevel_ = 0;
       onChanged();
       return this;
@@ -1375,7 +1382,6 @@ public Builder clearAgentAssistantDetailFeedback() {
       }
       detailFeedbackCase_ = 2;
       onChanged();
-      ;
       return agentAssistantDetailFeedbackBuilder_;
     }
 
@@ -1412,6 +1418,7 @@ public boolean getClicked() {
     public Builder setClicked(boolean value) {
 
       clicked_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1428,7 +1435,7 @@ public Builder setClicked(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearClicked() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       clicked_ = false;
       onChanged();
       return this;
@@ -1452,7 +1459,7 @@ public Builder clearClicked() {
      * @return Whether the clickTime field is set.
      */
     public boolean hasClickTime() {
-      return clickTimeBuilder_ != null || clickTime_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1487,11 +1494,11 @@ public Builder setClickTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         clickTime_ = value;
-        onChanged();
       } else {
         clickTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1506,11 +1513,11 @@ public Builder setClickTime(com.google.protobuf.Timestamp value) {
     public Builder setClickTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (clickTimeBuilder_ == null) {
         clickTime_ = builderForValue.build();
-        onChanged();
       } else {
         clickTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1524,17 +1531,18 @@ public Builder setClickTime(com.google.protobuf.Timestamp.Builder builderForValu
      */
     public Builder mergeClickTime(com.google.protobuf.Timestamp value) {
       if (clickTimeBuilder_ == null) {
-        if (clickTime_ != null) {
-          clickTime_ =
-              com.google.protobuf.Timestamp.newBuilder(clickTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && clickTime_ != null
+            && clickTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getClickTimeBuilder().mergeFrom(value);
         } else {
           clickTime_ = value;
         }
-        onChanged();
       } else {
         clickTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1547,14 +1555,13 @@ public Builder mergeClickTime(com.google.protobuf.Timestamp value) {
      * <code>.google.protobuf.Timestamp click_time = 5;</code>
      */
     public Builder clearClickTime() {
-      if (clickTimeBuilder_ == null) {
-        clickTime_ = null;
-        onChanged();
-      } else {
-        clickTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      clickTime_ = null;
+      if (clickTimeBuilder_ != null) {
+        clickTimeBuilder_.dispose();
         clickTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1567,7 +1574,7 @@ public Builder clearClickTime() {
      * <code>.google.protobuf.Timestamp click_time = 5;</code>
      */
     public com.google.protobuf.Timestamp.Builder getClickTimeBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getClickTimeFieldBuilder().getBuilder();
     }
@@ -1646,6 +1653,7 @@ public boolean getDisplayed() {
     public Builder setDisplayed(boolean value) {
 
       displayed_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1662,7 +1670,7 @@ public Builder setDisplayed(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayed() {
-
+      bitField0_ = (bitField0_ & ~0x00000010);
       displayed_ = false;
       onChanged();
       return this;
@@ -1686,7 +1694,7 @@ public Builder clearDisplayed() {
      * @return Whether the displayTime field is set.
      */
     public boolean hasDisplayTime() {
-      return displayTimeBuilder_ != null || displayTime_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -1723,11 +1731,11 @@ public Builder setDisplayTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         displayTime_ = value;
-        onChanged();
       } else {
         displayTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1742,11 +1750,11 @@ public Builder setDisplayTime(com.google.protobuf.Timestamp value) {
     public Builder setDisplayTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (displayTimeBuilder_ == null) {
         displayTime_ = builderForValue.build();
-        onChanged();
       } else {
         displayTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1760,19 +1768,18 @@ public Builder setDisplayTime(com.google.protobuf.Timestamp.Builder builderForVa
      */
     public Builder mergeDisplayTime(com.google.protobuf.Timestamp value) {
       if (displayTimeBuilder_ == null) {
-        if (displayTime_ != null) {
-          displayTime_ =
-              com.google.protobuf.Timestamp.newBuilder(displayTime_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && displayTime_ != null
+            && displayTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getDisplayTimeBuilder().mergeFrom(value);
         } else {
           displayTime_ = value;
         }
-        onChanged();
       } else {
         displayTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1785,14 +1792,13 @@ public Builder mergeDisplayTime(com.google.protobuf.Timestamp value) {
      * <code>.google.protobuf.Timestamp display_time = 6;</code>
      */
     public Builder clearDisplayTime() {
-      if (displayTimeBuilder_ == null) {
-        displayTime_ = null;
-        onChanged();
-      } else {
-        displayTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      displayTime_ = null;
+      if (displayTimeBuilder_ != null) {
+        displayTimeBuilder_.dispose();
         displayTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1805,7 +1811,7 @@ public Builder clearDisplayTime() {
      * <code>.google.protobuf.Timestamp display_time = 6;</code>
      */
     public com.google.protobuf.Timestamp.Builder getDisplayTimeBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getDisplayTimeFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AnswerRecord.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AnswerRecord.java
index 543e1c92515f..98f8fed9c484 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AnswerRecord.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AnswerRecord.java
@@ -130,7 +130,9 @@ public RecordCase getRecordCase() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -235,7 +237,9 @@ public com.google.cloud.dialogflow.v2beta1.AnswerFeedback getAnswerFeedback() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.AnswerFeedbackOrBuilder getAnswerFeedbackOrBuilder() {
-    return getAnswerFeedback();
+    return answerFeedback_ == null
+        ? com.google.cloud.dialogflow.v2beta1.AnswerFeedback.getDefaultInstance()
+        : answerFeedback_;
   }
 
   public static final int AGENT_ASSISTANT_RECORD_FIELD_NUMBER = 4;
@@ -543,12 +547,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
-      if (answerFeedbackBuilder_ == null) {
-        answerFeedback_ = null;
-      } else {
-        answerFeedback_ = null;
+      answerFeedback_ = null;
+      if (answerFeedbackBuilder_ != null) {
+        answerFeedbackBuilder_.dispose();
         answerFeedbackBuilder_ = null;
       }
       if (agentAssistantRecordBuilder_ != null) {
@@ -583,24 +586,33 @@ public com.google.cloud.dialogflow.v2beta1.AnswerRecord build() {
     public com.google.cloud.dialogflow.v2beta1.AnswerRecord buildPartial() {
       com.google.cloud.dialogflow.v2beta1.AnswerRecord result =
           new com.google.cloud.dialogflow.v2beta1.AnswerRecord(this);
-      result.name_ = name_;
-      if (answerFeedbackBuilder_ == null) {
-        result.answerFeedback_ = answerFeedback_;
-      } else {
-        result.answerFeedback_ = answerFeedbackBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (recordCase_ == 4) {
-        if (agentAssistantRecordBuilder_ == null) {
-          result.record_ = record_;
-        } else {
-          result.record_ = agentAssistantRecordBuilder_.build();
-        }
-      }
-      result.recordCase_ = recordCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.AnswerRecord result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.answerFeedback_ =
+            answerFeedbackBuilder_ == null ? answerFeedback_ : answerFeedbackBuilder_.build();
+      }
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2beta1.AnswerRecord result) {
+      result.recordCase_ = recordCase_;
+      result.record_ = this.record_;
+      if (recordCase_ == 4 && agentAssistantRecordBuilder_ != null) {
+        result.record_ = agentAssistantRecordBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -649,6 +661,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.AnswerRecord other)
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasAnswerFeedback()) {
@@ -694,13 +707,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 26:
               {
                 input.readMessage(getAnswerFeedbackFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 26
             case 34:
@@ -741,6 +754,8 @@ public Builder clearRecord() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -811,8 +826,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -831,8 +846,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -856,8 +871,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -882,7 +897,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      * @return Whether the answerFeedback field is set.
      */
     public boolean hasAnswerFeedback() {
-      return answerFeedbackBuilder_ != null || answerFeedback_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -923,11 +938,11 @@ public Builder setAnswerFeedback(com.google.cloud.dialogflow.v2beta1.AnswerFeedb
           throw new NullPointerException();
         }
         answerFeedback_ = value;
-        onChanged();
       } else {
         answerFeedbackBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -945,11 +960,11 @@ public Builder setAnswerFeedback(
         com.google.cloud.dialogflow.v2beta1.AnswerFeedback.Builder builderForValue) {
       if (answerFeedbackBuilder_ == null) {
         answerFeedback_ = builderForValue.build();
-        onChanged();
       } else {
         answerFeedbackBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -965,19 +980,19 @@ public Builder setAnswerFeedback(
      */
     public Builder mergeAnswerFeedback(com.google.cloud.dialogflow.v2beta1.AnswerFeedback value) {
       if (answerFeedbackBuilder_ == null) {
-        if (answerFeedback_ != null) {
-          answerFeedback_ =
-              com.google.cloud.dialogflow.v2beta1.AnswerFeedback.newBuilder(answerFeedback_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && answerFeedback_ != null
+            && answerFeedback_
+                != com.google.cloud.dialogflow.v2beta1.AnswerFeedback.getDefaultInstance()) {
+          getAnswerFeedbackBuilder().mergeFrom(value);
         } else {
           answerFeedback_ = value;
         }
-        onChanged();
       } else {
         answerFeedbackBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -992,14 +1007,13 @@ public Builder mergeAnswerFeedback(com.google.cloud.dialogflow.v2beta1.AnswerFee
      * <code>.google.cloud.dialogflow.v2beta1.AnswerFeedback answer_feedback = 3;</code>
      */
     public Builder clearAnswerFeedback() {
-      if (answerFeedbackBuilder_ == null) {
-        answerFeedback_ = null;
-        onChanged();
-      } else {
-        answerFeedback_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      answerFeedback_ = null;
+      if (answerFeedbackBuilder_ != null) {
+        answerFeedbackBuilder_.dispose();
         answerFeedbackBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1014,7 +1028,7 @@ public Builder clearAnswerFeedback() {
      * <code>.google.cloud.dialogflow.v2beta1.AnswerFeedback answer_feedback = 3;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.AnswerFeedback.Builder getAnswerFeedbackBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getAnswerFeedbackFieldBuilder().getBuilder();
     }
@@ -1287,7 +1301,6 @@ public Builder clearAgentAssistantRecord() {
       }
       recordCase_ = 4;
       onChanged();
-      ;
       return agentAssistantRecordBuilder_;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ArticleAnswer.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ArticleAnswer.java
index 93ef7aafd2b6..f71948c4103c 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ArticleAnswer.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ArticleAnswer.java
@@ -82,7 +82,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   }
 
   public static final int TITLE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object title_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object title_ = "";
   /**
    *
    *
@@ -131,7 +133,9 @@ public com.google.protobuf.ByteString getTitleBytes() {
   }
 
   public static final int URI_FIELD_NUMBER = 2;
-  private volatile java.lang.Object uri_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object uri_ = "";
   /**
    *
    *
@@ -180,6 +184,8 @@ public com.google.protobuf.ByteString getUriBytes() {
   }
 
   public static final int SNIPPETS_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList snippets_;
   /**
    *
@@ -253,6 +259,7 @@ private static final class MetadataDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> metadata_;
 
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> internalGetMetadata() {
@@ -313,8 +320,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
    * <code>map&lt;string, string&gt; metadata = 5;</code>
    */
   @java.lang.Override
-  public java.lang.String getMetadataOrDefault(
-      java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getMetadataOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -344,7 +353,9 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
   }
 
   public static final int ANSWER_RECORD_FIELD_NUMBER = 6;
-  private volatile java.lang.Object answerRecord_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object answerRecord_ = "";
   /**
    *
    *
@@ -664,15 +675,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       title_ = "";
-
       uri_ = "";
-
       snippets_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000004);
       internalGetMutableMetadata().clear();
       answerRecord_ = "";
-
       return this;
     }
 
@@ -700,21 +709,40 @@ public com.google.cloud.dialogflow.v2beta1.ArticleAnswer build() {
     public com.google.cloud.dialogflow.v2beta1.ArticleAnswer buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ArticleAnswer result =
           new com.google.cloud.dialogflow.v2beta1.ArticleAnswer(this);
-      int from_bitField0_ = bitField0_;
-      result.title_ = title_;
-      result.uri_ = uri_;
-      if (((bitField0_ & 0x00000001) != 0)) {
-        snippets_ = snippets_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000001);
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.snippets_ = snippets_;
-      result.metadata_ = internalGetMetadata();
-      result.metadata_.makeImmutable();
-      result.answerRecord_ = answerRecord_;
       onBuilt();
       return result;
     }
 
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.ArticleAnswer result) {
+      if (((bitField0_ & 0x00000004) != 0)) {
+        snippets_ = snippets_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000004);
+      }
+      result.snippets_ = snippets_;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ArticleAnswer result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.title_ = title_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.uri_ = uri_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.metadata_ = internalGetMetadata();
+        result.metadata_.makeImmutable();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.answerRecord_ = answerRecord_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -763,16 +791,18 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ArticleAnswer other
         return this;
       if (!other.getTitle().isEmpty()) {
         title_ = other.title_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getUri().isEmpty()) {
         uri_ = other.uri_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.snippets_.isEmpty()) {
         if (snippets_.isEmpty()) {
           snippets_ = other.snippets_;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000004);
         } else {
           ensureSnippetsIsMutable();
           snippets_.addAll(other.snippets_);
@@ -780,8 +810,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ArticleAnswer other
         onChanged();
       }
       internalGetMutableMetadata().mergeFrom(other.internalGetMetadata());
+      bitField0_ |= 0x00000008;
       if (!other.getAnswerRecord().isEmpty()) {
         answerRecord_ = other.answerRecord_;
+        bitField0_ |= 0x00000010;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -813,13 +845,13 @@ public Builder mergeFrom(
             case 10:
               {
                 title_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 uri_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
@@ -838,12 +870,13 @@ public Builder mergeFrom(
                 internalGetMutableMetadata()
                     .getMutableMap()
                     .put(metadata__.getKey(), metadata__.getValue());
+                bitField0_ |= 0x00000008;
                 break;
               } // case 42
             case 50:
               {
                 answerRecord_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 50
             default:
@@ -926,8 +959,8 @@ public Builder setTitle(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       title_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -943,8 +976,8 @@ public Builder setTitle(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTitle() {
-
       title_ = getDefaultInstance().getTitle();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -965,8 +998,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       title_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1032,8 +1065,8 @@ public Builder setUri(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       uri_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1049,8 +1082,8 @@ public Builder setUri(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearUri() {
-
       uri_ = getDefaultInstance().getUri();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1071,8 +1104,8 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       uri_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1081,9 +1114,9 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureSnippetsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         snippets_ = new com.google.protobuf.LazyStringArrayList(snippets_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000004;
       }
     }
     /**
@@ -1218,7 +1251,7 @@ public Builder addAllSnippets(java.lang.Iterable<java.lang.String> values) {
      */
     public Builder clearSnippets() {
       snippets_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1256,8 +1289,6 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
         internalGetMutableMetadata() {
-      onChanged();
-      ;
       if (metadata_ == null) {
         metadata_ =
             com.google.protobuf.MapField.newMapField(MetadataDefaultEntryHolder.defaultEntry);
@@ -1265,6 +1296,8 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
       if (!metadata_.isMutable()) {
         metadata_ = metadata_.copy();
       }
+      bitField0_ |= 0x00000008;
+      onChanged();
       return metadata_;
     }
 
@@ -1319,8 +1352,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
      * <code>map&lt;string, string&gt; metadata = 5;</code>
      */
     @java.lang.Override
-    public java.lang.String getMetadataOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getMetadataOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1350,6 +1385,7 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
     }
 
     public Builder clearMetadata() {
+      bitField0_ = (bitField0_ & ~0x00000008);
       internalGetMutableMetadata().getMutableMap().clear();
       return this;
     }
@@ -1373,6 +1409,7 @@ public Builder removeMetadata(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMutableMetadata() {
+      bitField0_ |= 0x00000008;
       return internalGetMutableMetadata().getMutableMap();
     }
     /**
@@ -1392,8 +1429,8 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableMetadata().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000008;
       return this;
     }
     /**
@@ -1408,6 +1445,7 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllMetadata(java.util.Map<java.lang.String, java.lang.String> values) {
       internalGetMutableMetadata().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000008;
       return this;
     }
 
@@ -1478,8 +1516,8 @@ public Builder setAnswerRecord(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       answerRecord_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1497,8 +1535,8 @@ public Builder setAnswerRecord(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAnswerRecord() {
-
       answerRecord_ = getDefaultInstance().getAnswerRecord();
+      bitField0_ = (bitField0_ & ~0x00000010);
       onChanged();
       return this;
     }
@@ -1521,8 +1559,8 @@ public Builder setAnswerRecordBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       answerRecord_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ArticleAnswerOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ArticleAnswerOrBuilder.java
index 7bf689f9dbd5..732fbc3c7e5f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ArticleAnswerOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ArticleAnswerOrBuilder.java
@@ -170,7 +170,6 @@ public interface ArticleAnswerOrBuilder
    *
    * <code>map&lt;string, string&gt; metadata = 5;</code>
    */
-
   /* nullable */
   java.lang.String getMetadataOrDefault(
       java.lang.String key,
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AssistQueryParameters.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AssistQueryParameters.java
index e35075e6ebd6..f21e72c19b25 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AssistQueryParameters.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AssistQueryParameters.java
@@ -89,6 +89,7 @@ private static final class DocumentsMetadataFiltersDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.String>
       documentsMetadataFilters_;
 
@@ -194,8 +195,10 @@ public java.util.Map<java.lang.String, java.lang.String> getDocumentsMetadataFil
    * <code>map&lt;string, string&gt; documents_metadata_filters = 1;</code>
    */
   @java.lang.Override
-  public java.lang.String getDocumentsMetadataFiltersOrDefault(
-      java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getDocumentsMetadataFiltersOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -471,6 +474,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       internalGetMutableDocumentsMetadataFilters().clear();
       return this;
     }
@@ -499,13 +503,21 @@ public com.google.cloud.dialogflow.v2beta1.AssistQueryParameters build() {
     public com.google.cloud.dialogflow.v2beta1.AssistQueryParameters buildPartial() {
       com.google.cloud.dialogflow.v2beta1.AssistQueryParameters result =
           new com.google.cloud.dialogflow.v2beta1.AssistQueryParameters(this);
-      int from_bitField0_ = bitField0_;
-      result.documentsMetadataFilters_ = internalGetDocumentsMetadataFilters();
-      result.documentsMetadataFilters_.makeImmutable();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.AssistQueryParameters result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.documentsMetadataFilters_ = internalGetDocumentsMetadataFilters();
+        result.documentsMetadataFilters_.makeImmutable();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -554,6 +566,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.AssistQueryParamete
         return this;
       internalGetMutableDocumentsMetadataFilters()
           .mergeFrom(other.internalGetDocumentsMetadataFilters());
+      bitField0_ |= 0x00000001;
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -592,6 +605,7 @@ public Builder mergeFrom(
                     .getMutableMap()
                     .put(
                         documentsMetadataFilters__.getKey(), documentsMetadataFilters__.getValue());
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -627,8 +641,6 @@ public Builder mergeFrom(
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
         internalGetMutableDocumentsMetadataFilters() {
-      onChanged();
-      ;
       if (documentsMetadataFilters_ == null) {
         documentsMetadataFilters_ =
             com.google.protobuf.MapField.newMapField(
@@ -637,6 +649,8 @@ public Builder mergeFrom(
       if (!documentsMetadataFilters_.isMutable()) {
         documentsMetadataFilters_ = documentsMetadataFilters_.copy();
       }
+      bitField0_ |= 0x00000001;
+      onChanged();
       return documentsMetadataFilters_;
     }
 
@@ -733,8 +747,10 @@ public java.util.Map<java.lang.String, java.lang.String> getDocumentsMetadataFil
      * <code>map&lt;string, string&gt; documents_metadata_filters = 1;</code>
      */
     @java.lang.Override
-    public java.lang.String getDocumentsMetadataFiltersOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getDocumentsMetadataFiltersOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -780,6 +796,7 @@ public java.lang.String getDocumentsMetadataFiltersOrThrow(java.lang.String key)
     }
 
     public Builder clearDocumentsMetadataFilters() {
+      bitField0_ = (bitField0_ & ~0x00000001);
       internalGetMutableDocumentsMetadataFilters().getMutableMap().clear();
       return this;
     }
@@ -817,6 +834,7 @@ public Builder removeDocumentsMetadataFilters(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMutableDocumentsMetadataFilters() {
+      bitField0_ |= 0x00000001;
       return internalGetMutableDocumentsMetadataFilters().getMutableMap();
     }
     /**
@@ -850,8 +868,8 @@ public Builder putDocumentsMetadataFilters(java.lang.String key, java.lang.Strin
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableDocumentsMetadataFilters().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000001;
       return this;
     }
     /**
@@ -881,6 +899,7 @@ public Builder putDocumentsMetadataFilters(java.lang.String key, java.lang.Strin
     public Builder putAllDocumentsMetadataFilters(
         java.util.Map<java.lang.String, java.lang.String> values) {
       internalGetMutableDocumentsMetadataFilters().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000001;
       return this;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AssistQueryParametersOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AssistQueryParametersOrBuilder.java
index 5ef2a4a182d5..5551381213fc 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AssistQueryParametersOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AssistQueryParametersOrBuilder.java
@@ -125,7 +125,6 @@ public interface AssistQueryParametersOrBuilder
    *
    * <code>map&lt;string, string&gt; documents_metadata_filters = 1;</code>
    */
-
   /* nullable */
   java.lang.String getDocumentsMetadataFiltersOrDefault(
       java.lang.String key,
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AudioInput.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AudioInput.java
index 26c2a6ae308d..26b4ab9c6e5f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AudioInput.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AudioInput.java
@@ -112,11 +112,13 @@ public com.google.cloud.dialogflow.v2beta1.InputAudioConfig getConfig() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.InputAudioConfigOrBuilder getConfigOrBuilder() {
-    return getConfig();
+    return config_ == null
+        ? com.google.cloud.dialogflow.v2beta1.InputAudioConfig.getDefaultInstance()
+        : config_;
   }
 
   public static final int AUDIO_FIELD_NUMBER = 2;
-  private com.google.protobuf.ByteString audio_;
+  private com.google.protobuf.ByteString audio_ = com.google.protobuf.ByteString.EMPTY;
   /**
    *
    *
@@ -347,14 +349,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (configBuilder_ == null) {
-        config_ = null;
-      } else {
-        config_ = null;
+      bitField0_ = 0;
+      config_ = null;
+      if (configBuilder_ != null) {
+        configBuilder_.dispose();
         configBuilder_ = null;
       }
       audio_ = com.google.protobuf.ByteString.EMPTY;
-
       return this;
     }
 
@@ -382,16 +383,23 @@ public com.google.cloud.dialogflow.v2beta1.AudioInput build() {
     public com.google.cloud.dialogflow.v2beta1.AudioInput buildPartial() {
       com.google.cloud.dialogflow.v2beta1.AudioInput result =
           new com.google.cloud.dialogflow.v2beta1.AudioInput(this);
-      if (configBuilder_ == null) {
-        result.config_ = config_;
-      } else {
-        result.config_ = configBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.audio_ = audio_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.AudioInput result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.config_ = configBuilder_ == null ? config_ : configBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.audio_ = audio_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -472,13 +480,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 audio_ = input.readBytes();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -498,6 +506,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2beta1.InputAudioConfig config_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.InputAudioConfig,
@@ -516,7 +526,7 @@ public Builder mergeFrom(
      * @return Whether the config field is set.
      */
     public boolean hasConfig() {
-      return configBuilder_ != null || config_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -553,11 +563,11 @@ public Builder setConfig(com.google.cloud.dialogflow.v2beta1.InputAudioConfig va
           throw new NullPointerException();
         }
         config_ = value;
-        onChanged();
       } else {
         configBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -573,11 +583,11 @@ public Builder setConfig(
         com.google.cloud.dialogflow.v2beta1.InputAudioConfig.Builder builderForValue) {
       if (configBuilder_ == null) {
         config_ = builderForValue.build();
-        onChanged();
       } else {
         configBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -591,19 +601,19 @@ public Builder setConfig(
      */
     public Builder mergeConfig(com.google.cloud.dialogflow.v2beta1.InputAudioConfig value) {
       if (configBuilder_ == null) {
-        if (config_ != null) {
-          config_ =
-              com.google.cloud.dialogflow.v2beta1.InputAudioConfig.newBuilder(config_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && config_ != null
+            && config_
+                != com.google.cloud.dialogflow.v2beta1.InputAudioConfig.getDefaultInstance()) {
+          getConfigBuilder().mergeFrom(value);
         } else {
           config_ = value;
         }
-        onChanged();
       } else {
         configBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -616,14 +626,13 @@ public Builder mergeConfig(com.google.cloud.dialogflow.v2beta1.InputAudioConfig
      * <code>.google.cloud.dialogflow.v2beta1.InputAudioConfig config = 1;</code>
      */
     public Builder clearConfig() {
-      if (configBuilder_ == null) {
-        config_ = null;
-        onChanged();
-      } else {
-        config_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      config_ = null;
+      if (configBuilder_ != null) {
+        configBuilder_.dispose();
         configBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -636,7 +645,7 @@ public Builder clearConfig() {
      * <code>.google.cloud.dialogflow.v2beta1.InputAudioConfig config = 1;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.InputAudioConfig.Builder getConfigBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getConfigFieldBuilder().getBuilder();
     }
@@ -722,8 +731,8 @@ public Builder setAudio(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       audio_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -742,7 +751,7 @@ public Builder setAudio(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearAudio() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       audio_ = getDefaultInstance().getAudio();
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutomatedAgentConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutomatedAgentConfig.java
index 65320d8de88c..7ada9abc5330 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutomatedAgentConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutomatedAgentConfig.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int AGENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object agent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object agent_ = "";
   /**
    *
    *
@@ -344,8 +346,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       agent_ = "";
-
       return this;
     }
 
@@ -373,11 +375,20 @@ public com.google.cloud.dialogflow.v2beta1.AutomatedAgentConfig build() {
     public com.google.cloud.dialogflow.v2beta1.AutomatedAgentConfig buildPartial() {
       com.google.cloud.dialogflow.v2beta1.AutomatedAgentConfig result =
           new com.google.cloud.dialogflow.v2beta1.AutomatedAgentConfig(this);
-      result.agent_ = agent_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.AutomatedAgentConfig result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.agent_ = agent_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -426,6 +437,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.AutomatedAgentConfi
         return this;
       if (!other.getAgent().isEmpty()) {
         agent_ = other.agent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -457,7 +469,7 @@ public Builder mergeFrom(
             case 10:
               {
                 agent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -477,6 +489,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object agent_ = "";
     /**
      *
@@ -583,8 +597,8 @@ public Builder setAgent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       agent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -615,8 +629,8 @@ public Builder setAgent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAgent() {
-
       agent_ = getDefaultInstance().getAgent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -652,8 +666,8 @@ public Builder setAgentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       agent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutomatedAgentReply.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutomatedAgentReply.java
index 2050eb61d787..e6a14b2d264a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutomatedAgentReply.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutomatedAgentReply.java
@@ -380,6 +380,8 @@ public com.google.cloud.dialogflow.v2beta1.DetectIntentResponse getDetectIntentR
   }
 
   public static final int RESPONSE_MESSAGES_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.ResponseMessage> responseMessages_;
   /**
    *
@@ -603,7 +605,7 @@ public com.google.protobuf.ByteString getEventBytes() {
   }
 
   public static final int MATCH_CONFIDENCE_FIELD_NUMBER = 9;
-  private float matchConfidence_;
+  private float matchConfidence_ = 0F;
   /**
    *
    *
@@ -668,7 +670,7 @@ public com.google.protobuf.Struct getParameters() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getParametersOrBuilder() {
-    return getParameters();
+    return parameters_ == null ? com.google.protobuf.Struct.getDefaultInstance() : parameters_;
   }
 
   public static final int CX_SESSION_PARAMETERS_FIELD_NUMBER = 6;
@@ -729,11 +731,13 @@ public com.google.protobuf.Struct getCxSessionParameters() {
   @java.lang.Override
   @java.lang.Deprecated
   public com.google.protobuf.StructOrBuilder getCxSessionParametersOrBuilder() {
-    return getCxSessionParameters();
+    return cxSessionParameters_ == null
+        ? com.google.protobuf.Struct.getDefaultInstance()
+        : cxSessionParameters_;
   }
 
   public static final int AUTOMATED_AGENT_REPLY_TYPE_FIELD_NUMBER = 7;
-  private int automatedAgentReplyType_;
+  private int automatedAgentReplyType_ = 0;
   /**
    *
    *
@@ -767,9 +771,8 @@ public int getAutomatedAgentReplyTypeValue() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply.AutomatedAgentReplyType
       getAutomatedAgentReplyType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply.AutomatedAgentReplyType result =
-        com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply.AutomatedAgentReplyType.valueOf(
+        com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply.AutomatedAgentReplyType.forNumber(
             automatedAgentReplyType_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply.AutomatedAgentReplyType
@@ -778,7 +781,7 @@ public int getAutomatedAgentReplyTypeValue() {
   }
 
   public static final int ALLOW_CANCELLATION_FIELD_NUMBER = 8;
-  private boolean allowCancellation_;
+  private boolean allowCancellation_ = false;
   /**
    *
    *
@@ -798,7 +801,9 @@ public boolean getAllowCancellation() {
   }
 
   public static final int CX_CURRENT_PAGE_FIELD_NUMBER = 11;
-  private volatile java.lang.Object cxCurrentPage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object cxCurrentPage_ = "";
   /**
    *
    *
@@ -1180,6 +1185,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (detectIntentResponseBuilder_ != null) {
         detectIntentResponseBuilder_.clear();
       }
@@ -1189,27 +1195,21 @@ public Builder clear() {
         responseMessages_ = null;
         responseMessagesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       matchConfidence_ = 0F;
-
-      if (parametersBuilder_ == null) {
-        parameters_ = null;
-      } else {
-        parameters_ = null;
+      parameters_ = null;
+      if (parametersBuilder_ != null) {
+        parametersBuilder_.dispose();
         parametersBuilder_ = null;
       }
-      if (cxSessionParametersBuilder_ == null) {
-        cxSessionParameters_ = null;
-      } else {
-        cxSessionParameters_ = null;
+      cxSessionParameters_ = null;
+      if (cxSessionParametersBuilder_ != null) {
+        cxSessionParametersBuilder_.dispose();
         cxSessionParametersBuilder_ = null;
       }
       automatedAgentReplyType_ = 0;
-
       allowCancellation_ = false;
-
       cxCurrentPage_ = "";
-
       responseCase_ = 0;
       response_ = null;
       matchCase_ = 0;
@@ -1241,47 +1241,62 @@ public com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply build() {
     public com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply buildPartial() {
       com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply result =
           new com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply(this);
-      int from_bitField0_ = bitField0_;
-      if (responseCase_ == 1) {
-        if (detectIntentResponseBuilder_ == null) {
-          result.response_ = response_;
-        } else {
-          result.response_ = detectIntentResponseBuilder_.build();
-        }
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply result) {
       if (responseMessagesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           responseMessages_ = java.util.Collections.unmodifiableList(responseMessages_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.responseMessages_ = responseMessages_;
       } else {
         result.responseMessages_ = responseMessagesBuilder_.build();
       }
-      if (matchCase_ == 4) {
-        result.match_ = match_;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.matchConfidence_ = matchConfidence_;
       }
-      if (matchCase_ == 5) {
-        result.match_ = match_;
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.parameters_ = parametersBuilder_ == null ? parameters_ : parametersBuilder_.build();
       }
-      result.matchConfidence_ = matchConfidence_;
-      if (parametersBuilder_ == null) {
-        result.parameters_ = parameters_;
-      } else {
-        result.parameters_ = parametersBuilder_.build();
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.cxSessionParameters_ =
+            cxSessionParametersBuilder_ == null
+                ? cxSessionParameters_
+                : cxSessionParametersBuilder_.build();
       }
-      if (cxSessionParametersBuilder_ == null) {
-        result.cxSessionParameters_ = cxSessionParameters_;
-      } else {
-        result.cxSessionParameters_ = cxSessionParametersBuilder_.build();
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.automatedAgentReplyType_ = automatedAgentReplyType_;
       }
-      result.automatedAgentReplyType_ = automatedAgentReplyType_;
-      result.allowCancellation_ = allowCancellation_;
-      result.cxCurrentPage_ = cxCurrentPage_;
+      if (((from_bitField0_ & 0x00000100) != 0)) {
+        result.allowCancellation_ = allowCancellation_;
+      }
+      if (((from_bitField0_ & 0x00000200) != 0)) {
+        result.cxCurrentPage_ = cxCurrentPage_;
+      }
+    }
+
+    private void buildPartialOneofs(
+        com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply result) {
       result.responseCase_ = responseCase_;
+      result.response_ = this.response_;
+      if (responseCase_ == 1 && detectIntentResponseBuilder_ != null) {
+        result.response_ = detectIntentResponseBuilder_.build();
+      }
       result.matchCase_ = matchCase_;
-      onBuilt();
-      return result;
+      result.match_ = this.match_;
     }
 
     @java.lang.Override
@@ -1334,7 +1349,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply
         if (!other.responseMessages_.isEmpty()) {
           if (responseMessages_.isEmpty()) {
             responseMessages_ = other.responseMessages_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureResponseMessagesIsMutable();
             responseMessages_.addAll(other.responseMessages_);
@@ -1347,7 +1362,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply
             responseMessagesBuilder_.dispose();
             responseMessagesBuilder_ = null;
             responseMessages_ = other.responseMessages_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             responseMessagesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getResponseMessagesFieldBuilder()
@@ -1374,6 +1389,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply
       }
       if (!other.getCxCurrentPage().isEmpty()) {
         cxCurrentPage_ = other.cxCurrentPage_;
+        bitField0_ |= 0x00000200;
         onChanged();
       }
       switch (other.getResponseCase()) {
@@ -1472,37 +1488,37 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getCxSessionParametersFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 50
             case 56:
               {
                 automatedAgentReplyType_ = input.readEnum();
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 56
             case 64:
               {
                 allowCancellation_ = input.readBool();
-
+                bitField0_ |= 0x00000100;
                 break;
               } // case 64
             case 77:
               {
                 matchConfidence_ = input.readFloat();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 77
             case 82:
               {
                 input.readMessage(getParametersFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 82
             case 90:
               {
                 cxCurrentPage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000200;
                 break;
               } // case 90
             default:
@@ -1772,7 +1788,6 @@ public Builder clearDetectIntentResponse() {
       }
       responseCase_ = 1;
       onChanged();
-      ;
       return detectIntentResponseBuilder_;
     }
 
@@ -1780,11 +1795,11 @@ public Builder clearDetectIntentResponse() {
         java.util.Collections.emptyList();
 
     private void ensureResponseMessagesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         responseMessages_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.ResponseMessage>(
                 responseMessages_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -2003,7 +2018,7 @@ public Builder addAllResponseMessages(
     public Builder clearResponseMessages() {
       if (responseMessagesBuilder_ == null) {
         responseMessages_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         responseMessagesBuilder_.clear();
@@ -2131,7 +2146,7 @@ public com.google.cloud.dialogflow.v2beta1.ResponseMessage.Builder addResponseMe
                 com.google.cloud.dialogflow.v2beta1.ResponseMessage.Builder,
                 com.google.cloud.dialogflow.v2beta1.ResponseMessageOrBuilder>(
                 responseMessages_,
-                ((bitField0_ & 0x00000001) != 0),
+                ((bitField0_ & 0x00000002) != 0),
                 getParentForChildren(),
                 isClean());
         responseMessages_ = null;
@@ -2472,6 +2487,7 @@ public float getMatchConfidence() {
     public Builder setMatchConfidence(float value) {
 
       matchConfidence_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2492,7 +2508,7 @@ public Builder setMatchConfidence(float value) {
      * @return This builder for chaining.
      */
     public Builder clearMatchConfidence() {
-
+      bitField0_ = (bitField0_ & ~0x00000010);
       matchConfidence_ = 0F;
       onChanged();
       return this;
@@ -2516,7 +2532,7 @@ public Builder clearMatchConfidence() {
      * @return Whether the parameters field is set.
      */
     public boolean hasParameters() {
-      return parametersBuilder_ != null || parameters_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -2551,11 +2567,11 @@ public Builder setParameters(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         parameters_ = value;
-        onChanged();
       } else {
         parametersBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2570,11 +2586,11 @@ public Builder setParameters(com.google.protobuf.Struct value) {
     public Builder setParameters(com.google.protobuf.Struct.Builder builderForValue) {
       if (parametersBuilder_ == null) {
         parameters_ = builderForValue.build();
-        onChanged();
       } else {
         parametersBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2588,17 +2604,18 @@ public Builder setParameters(com.google.protobuf.Struct.Builder builderForValue)
      */
     public Builder mergeParameters(com.google.protobuf.Struct value) {
       if (parametersBuilder_ == null) {
-        if (parameters_ != null) {
-          parameters_ =
-              com.google.protobuf.Struct.newBuilder(parameters_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && parameters_ != null
+            && parameters_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getParametersBuilder().mergeFrom(value);
         } else {
           parameters_ = value;
         }
-        onChanged();
       } else {
         parametersBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2611,14 +2628,13 @@ public Builder mergeParameters(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct parameters = 10;</code>
      */
     public Builder clearParameters() {
-      if (parametersBuilder_ == null) {
-        parameters_ = null;
-        onChanged();
-      } else {
-        parameters_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      parameters_ = null;
+      if (parametersBuilder_ != null) {
+        parametersBuilder_.dispose();
         parametersBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2631,7 +2647,7 @@ public Builder clearParameters() {
      * <code>.google.protobuf.Struct parameters = 10;</code>
      */
     public com.google.protobuf.Struct.Builder getParametersBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getParametersFieldBuilder().getBuilder();
     }
@@ -2700,7 +2716,7 @@ public com.google.protobuf.StructOrBuilder getParametersOrBuilder() {
      */
     @java.lang.Deprecated
     public boolean hasCxSessionParameters() {
-      return cxSessionParametersBuilder_ != null || cxSessionParameters_ != null;
+      return ((bitField0_ & 0x00000040) != 0);
     }
     /**
      *
@@ -2745,11 +2761,11 @@ public Builder setCxSessionParameters(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         cxSessionParameters_ = value;
-        onChanged();
       } else {
         cxSessionParametersBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2767,11 +2783,11 @@ public Builder setCxSessionParameters(com.google.protobuf.Struct value) {
     public Builder setCxSessionParameters(com.google.protobuf.Struct.Builder builderForValue) {
       if (cxSessionParametersBuilder_ == null) {
         cxSessionParameters_ = builderForValue.build();
-        onChanged();
       } else {
         cxSessionParametersBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2788,19 +2804,18 @@ public Builder setCxSessionParameters(com.google.protobuf.Struct.Builder builder
     @java.lang.Deprecated
     public Builder mergeCxSessionParameters(com.google.protobuf.Struct value) {
       if (cxSessionParametersBuilder_ == null) {
-        if (cxSessionParameters_ != null) {
-          cxSessionParameters_ =
-              com.google.protobuf.Struct.newBuilder(cxSessionParameters_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000040) != 0)
+            && cxSessionParameters_ != null
+            && cxSessionParameters_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getCxSessionParametersBuilder().mergeFrom(value);
         } else {
           cxSessionParameters_ = value;
         }
-        onChanged();
       } else {
         cxSessionParametersBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2816,14 +2831,13 @@ public Builder mergeCxSessionParameters(com.google.protobuf.Struct value) {
      */
     @java.lang.Deprecated
     public Builder clearCxSessionParameters() {
-      if (cxSessionParametersBuilder_ == null) {
-        cxSessionParameters_ = null;
-        onChanged();
-      } else {
-        cxSessionParameters_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      cxSessionParameters_ = null;
+      if (cxSessionParametersBuilder_ != null) {
+        cxSessionParametersBuilder_.dispose();
         cxSessionParametersBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2839,7 +2853,7 @@ public Builder clearCxSessionParameters() {
      */
     @java.lang.Deprecated
     public com.google.protobuf.Struct.Builder getCxSessionParametersBuilder() {
-
+      bitField0_ |= 0x00000040;
       onChanged();
       return getCxSessionParametersFieldBuilder().getBuilder();
     }
@@ -2925,8 +2939,8 @@ public int getAutomatedAgentReplyTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setAutomatedAgentReplyTypeValue(int value) {
-
       automatedAgentReplyType_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2946,9 +2960,8 @@ public Builder setAutomatedAgentReplyTypeValue(int value) {
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply.AutomatedAgentReplyType
         getAutomatedAgentReplyType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply.AutomatedAgentReplyType result =
-          com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply.AutomatedAgentReplyType.valueOf(
+          com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply.AutomatedAgentReplyType.forNumber(
               automatedAgentReplyType_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply.AutomatedAgentReplyType
@@ -2974,7 +2987,7 @@ public Builder setAutomatedAgentReplyType(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000080;
       automatedAgentReplyType_ = value.getNumber();
       onChanged();
       return this;
@@ -2993,7 +3006,7 @@ public Builder setAutomatedAgentReplyType(
      * @return This builder for chaining.
      */
     public Builder clearAutomatedAgentReplyType() {
-
+      bitField0_ = (bitField0_ & ~0x00000080);
       automatedAgentReplyType_ = 0;
       onChanged();
       return this;
@@ -3034,6 +3047,7 @@ public boolean getAllowCancellation() {
     public Builder setAllowCancellation(boolean value) {
 
       allowCancellation_ = value;
+      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -3051,7 +3065,7 @@ public Builder setAllowCancellation(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearAllowCancellation() {
-
+      bitField0_ = (bitField0_ & ~0x00000100);
       allowCancellation_ = false;
       onChanged();
       return this;
@@ -3124,8 +3138,8 @@ public Builder setCxCurrentPage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       cxCurrentPage_ = value;
+      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -3143,8 +3157,8 @@ public Builder setCxCurrentPage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearCxCurrentPage() {
-
       cxCurrentPage_ = getDefaultInstance().getCxCurrentPage();
+      bitField0_ = (bitField0_ & ~0x00000200);
       onChanged();
       return this;
     }
@@ -3167,8 +3181,8 @@ public Builder setCxCurrentPageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       cxCurrentPage_ = value;
+      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateEntitiesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateEntitiesRequest.java
index 37c8dfd60a75..f3c84ada9614 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateEntitiesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateEntitiesRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -131,6 +133,8 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int ENTITIES_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.EntityType.Entity> entities_;
   /**
    *
@@ -211,7 +215,9 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder getEntitie
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -485,17 +491,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       if (entitiesBuilder_ == null) {
         entities_ = java.util.Collections.emptyList();
       } else {
         entities_ = null;
         entitiesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       languageCode_ = "";
-
       return this;
     }
 
@@ -524,20 +529,36 @@ public com.google.cloud.dialogflow.v2beta1.BatchCreateEntitiesRequest build() {
     public com.google.cloud.dialogflow.v2beta1.BatchCreateEntitiesRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.BatchCreateEntitiesRequest result =
           new com.google.cloud.dialogflow.v2beta1.BatchCreateEntitiesRequest(this);
-      int from_bitField0_ = bitField0_;
-      result.parent_ = parent_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.BatchCreateEntitiesRequest result) {
       if (entitiesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           entities_ = java.util.Collections.unmodifiableList(entities_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.entities_ = entities_;
       } else {
         result.entities_ = entitiesBuilder_.build();
       }
-      result.languageCode_ = languageCode_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.BatchCreateEntitiesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
     }
 
     @java.lang.Override
@@ -589,13 +610,14 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.BatchCreateEntities
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (entitiesBuilder_ == null) {
         if (!other.entities_.isEmpty()) {
           if (entities_.isEmpty()) {
             entities_ = other.entities_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureEntitiesIsMutable();
             entities_.addAll(other.entities_);
@@ -608,7 +630,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.BatchCreateEntities
             entitiesBuilder_.dispose();
             entitiesBuilder_ = null;
             entities_ = other.entities_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             entitiesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getEntitiesFieldBuilder()
@@ -620,6 +642,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.BatchCreateEntities
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -651,7 +674,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -671,7 +694,7 @@ public Builder mergeFrom(
             case 26:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -772,8 +795,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -795,8 +818,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -823,8 +846,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -833,11 +856,11 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureEntitiesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         entities_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.EntityType.Entity>(
                 entities_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -1078,7 +1101,7 @@ public Builder addAllEntities(
     public Builder clearEntities() {
       if (entitiesBuilder_ == null) {
         entities_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         entitiesBuilder_.clear();
@@ -1218,7 +1241,7 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder addEntities
                 com.google.cloud.dialogflow.v2beta1.EntityType.Entity,
                 com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder,
                 com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder>(
-                entities_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                entities_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         entities_ = null;
       }
       return entitiesBuilder_;
@@ -1297,8 +1320,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1318,8 +1341,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1344,8 +1367,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateMessagesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateMessagesRequest.java
index 0d71947002bb..a5212d4e6746 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateMessagesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateMessagesRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -126,6 +128,8 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int REQUESTS_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.CreateMessageRequest> requests_;
   /**
    *
@@ -425,15 +429,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       if (requestsBuilder_ == null) {
         requests_ = java.util.Collections.emptyList();
       } else {
         requests_ = null;
         requestsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -462,19 +466,33 @@ public com.google.cloud.dialogflow.v2beta1.BatchCreateMessagesRequest build() {
     public com.google.cloud.dialogflow.v2beta1.BatchCreateMessagesRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.BatchCreateMessagesRequest result =
           new com.google.cloud.dialogflow.v2beta1.BatchCreateMessagesRequest(this);
-      int from_bitField0_ = bitField0_;
-      result.parent_ = parent_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.BatchCreateMessagesRequest result) {
       if (requestsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           requests_ = java.util.Collections.unmodifiableList(requests_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.requests_ = requests_;
       } else {
         result.requests_ = requestsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.BatchCreateMessagesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
     }
 
     @java.lang.Override
@@ -526,13 +544,14 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.BatchCreateMessages
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (requestsBuilder_ == null) {
         if (!other.requests_.isEmpty()) {
           if (requests_.isEmpty()) {
             requests_ = other.requests_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureRequestsIsMutable();
             requests_.addAll(other.requests_);
@@ -545,7 +564,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.BatchCreateMessages
             requestsBuilder_.dispose();
             requestsBuilder_ = null;
             requests_ = other.requests_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             requestsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getRequestsFieldBuilder()
@@ -584,7 +603,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -693,8 +712,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -714,8 +733,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -740,8 +759,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -750,11 +769,11 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureRequestsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         requests_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.CreateMessageRequest>(
                 requests_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -1020,7 +1039,7 @@ public Builder addAllRequests(
     public Builder clearRequests() {
       if (requestsBuilder_ == null) {
         requests_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         requestsBuilder_.clear();
@@ -1176,7 +1195,7 @@ public com.google.cloud.dialogflow.v2beta1.CreateMessageRequest.Builder addReque
                 com.google.cloud.dialogflow.v2beta1.CreateMessageRequest,
                 com.google.cloud.dialogflow.v2beta1.CreateMessageRequest.Builder,
                 com.google.cloud.dialogflow.v2beta1.CreateMessageRequestOrBuilder>(
-                requests_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                requests_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         requests_ = null;
       }
       return requestsBuilder_;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateMessagesResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateMessagesResponse.java
index 9170826b874f..8bfb920ba618 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateMessagesResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateMessagesResponse.java
@@ -68,6 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int MESSAGES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Message> messages_;
   /**
    *
@@ -336,6 +338,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (messagesBuilder_ == null) {
         messages_ = java.util.Collections.emptyList();
       } else {
@@ -371,7 +374,16 @@ public com.google.cloud.dialogflow.v2beta1.BatchCreateMessagesResponse build() {
     public com.google.cloud.dialogflow.v2beta1.BatchCreateMessagesResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.BatchCreateMessagesResponse result =
           new com.google.cloud.dialogflow.v2beta1.BatchCreateMessagesResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.BatchCreateMessagesResponse result) {
       if (messagesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           messages_ = java.util.Collections.unmodifiableList(messages_);
@@ -381,8 +393,11 @@ public com.google.cloud.dialogflow.v2beta1.BatchCreateMessagesResponse buildPart
       } else {
         result.messages_ = messagesBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.BatchCreateMessagesResponse result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntitiesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntitiesRequest.java
index eccb646cc857..22bb3dc0b6b3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntitiesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntitiesRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -131,6 +133,8 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int ENTITY_VALUES_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList entityValues_;
   /**
    *
@@ -200,7 +204,9 @@ public com.google.protobuf.ByteString getEntityValuesBytes(int index) {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -479,12 +485,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       entityValues_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       languageCode_ = "";
-
       return this;
     }
 
@@ -513,18 +518,34 @@ public com.google.cloud.dialogflow.v2beta1.BatchDeleteEntitiesRequest build() {
     public com.google.cloud.dialogflow.v2beta1.BatchDeleteEntitiesRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.BatchDeleteEntitiesRequest result =
           new com.google.cloud.dialogflow.v2beta1.BatchDeleteEntitiesRequest(this);
-      int from_bitField0_ = bitField0_;
-      result.parent_ = parent_;
-      if (((bitField0_ & 0x00000001) != 0)) {
-        entityValues_ = entityValues_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000001);
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.entityValues_ = entityValues_;
-      result.languageCode_ = languageCode_;
       onBuilt();
       return result;
     }
 
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.BatchDeleteEntitiesRequest result) {
+      if (((bitField0_ & 0x00000002) != 0)) {
+        entityValues_ = entityValues_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000002);
+      }
+      result.entityValues_ = entityValues_;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.BatchDeleteEntitiesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -574,12 +595,13 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.BatchDeleteEntities
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.entityValues_.isEmpty()) {
         if (entityValues_.isEmpty()) {
           entityValues_ = other.entityValues_;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureEntityValuesIsMutable();
           entityValues_.addAll(other.entityValues_);
@@ -588,6 +610,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.BatchDeleteEntities
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -619,7 +642,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -632,7 +655,7 @@ public Builder mergeFrom(
             case 26:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -733,8 +756,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -756,8 +779,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -784,8 +807,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -794,9 +817,9 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureEntityValuesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         entityValues_ = new com.google.protobuf.LazyStringArrayList(entityValues_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
     /**
@@ -947,7 +970,7 @@ public Builder addAllEntityValues(java.lang.Iterable<java.lang.String> values) {
      */
     public Builder clearEntityValues() {
       entityValues_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1049,8 +1072,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1070,8 +1093,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1096,8 +1119,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntityTypesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntityTypesRequest.java
index 6b6754d33a54..bd9dad01d831 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntityTypesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntityTypesRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -128,6 +130,8 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int ENTITY_TYPE_NAMES_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList entityTypeNames_;
   /**
    *
@@ -408,10 +412,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       entityTypeNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -440,17 +444,31 @@ public com.google.cloud.dialogflow.v2beta1.BatchDeleteEntityTypesRequest build()
     public com.google.cloud.dialogflow.v2beta1.BatchDeleteEntityTypesRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.BatchDeleteEntityTypesRequest result =
           new com.google.cloud.dialogflow.v2beta1.BatchDeleteEntityTypesRequest(this);
-      int from_bitField0_ = bitField0_;
-      result.parent_ = parent_;
-      if (((bitField0_ & 0x00000001) != 0)) {
-        entityTypeNames_ = entityTypeNames_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000001);
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.entityTypeNames_ = entityTypeNames_;
       onBuilt();
       return result;
     }
 
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.BatchDeleteEntityTypesRequest result) {
+      if (((bitField0_ & 0x00000002) != 0)) {
+        entityTypeNames_ = entityTypeNames_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000002);
+      }
+      result.entityTypeNames_ = entityTypeNames_;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.BatchDeleteEntityTypesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -501,12 +519,13 @@ public Builder mergeFrom(
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.entityTypeNames_.isEmpty()) {
         if (entityTypeNames_.isEmpty()) {
           entityTypeNames_ = other.entityTypeNames_;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureEntityTypeNamesIsMutable();
           entityTypeNames_.addAll(other.entityTypeNames_);
@@ -542,7 +561,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -647,8 +666,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -669,8 +688,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -696,8 +715,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -706,9 +725,9 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureEntityTypeNamesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         entityTypeNames_ = new com.google.protobuf.LazyStringArrayList(entityTypeNames_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
     /**
@@ -851,7 +870,7 @@ public Builder addAllEntityTypeNames(java.lang.Iterable<java.lang.String> values
      */
     public Builder clearEntityTypeNames() {
       entityTypeNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteIntentsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteIntentsRequest.java
index cafd6e0766de..bc3dec0ebfca 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteIntentsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteIntentsRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -128,6 +130,8 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int INTENTS_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent> intents_;
   /**
    *
@@ -420,15 +424,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       if (intentsBuilder_ == null) {
         intents_ = java.util.Collections.emptyList();
       } else {
         intents_ = null;
         intentsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -457,19 +461,33 @@ public com.google.cloud.dialogflow.v2beta1.BatchDeleteIntentsRequest build() {
     public com.google.cloud.dialogflow.v2beta1.BatchDeleteIntentsRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.BatchDeleteIntentsRequest result =
           new com.google.cloud.dialogflow.v2beta1.BatchDeleteIntentsRequest(this);
-      int from_bitField0_ = bitField0_;
-      result.parent_ = parent_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.BatchDeleteIntentsRequest result) {
       if (intentsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           intents_ = java.util.Collections.unmodifiableList(intents_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.intents_ = intents_;
       } else {
         result.intents_ = intentsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.BatchDeleteIntentsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
     }
 
     @java.lang.Override
@@ -521,13 +539,14 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.BatchDeleteIntentsR
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (intentsBuilder_ == null) {
         if (!other.intents_.isEmpty()) {
           if (intents_.isEmpty()) {
             intents_ = other.intents_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureIntentsIsMutable();
             intents_.addAll(other.intents_);
@@ -540,7 +559,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.BatchDeleteIntentsR
             intentsBuilder_.dispose();
             intentsBuilder_ = null;
             intents_ = other.intents_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             intentsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getIntentsFieldBuilder()
@@ -579,7 +598,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -690,8 +709,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -712,8 +731,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -739,8 +758,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -749,9 +768,9 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureIntentsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         intents_ = new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.Intent>(intents_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -999,7 +1018,7 @@ public Builder addAllIntents(
     public Builder clearIntents() {
       if (intentsBuilder_ == null) {
         intents_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         intentsBuilder_.clear();
@@ -1142,7 +1161,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Builder addIntentsBuilder(int
                 com.google.cloud.dialogflow.v2beta1.Intent,
                 com.google.cloud.dialogflow.v2beta1.Intent.Builder,
                 com.google.cloud.dialogflow.v2beta1.IntentOrBuilder>(
-                intents_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                intents_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         intents_ = null;
       }
       return intentsBuilder_;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntitiesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntitiesRequest.java
index 3cb417879843..023639511ed7 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntitiesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntitiesRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -131,6 +133,8 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int ENTITIES_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.EntityType.Entity> entities_;
   /**
    *
@@ -211,7 +215,9 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder getEntitie
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -310,7 +316,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -545,21 +551,19 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       if (entitiesBuilder_ == null) {
         entities_ = java.util.Collections.emptyList();
       } else {
         entities_ = null;
         entitiesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       languageCode_ = "";
-
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -590,25 +594,39 @@ public com.google.cloud.dialogflow.v2beta1.BatchUpdateEntitiesRequest build() {
     public com.google.cloud.dialogflow.v2beta1.BatchUpdateEntitiesRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.BatchUpdateEntitiesRequest result =
           new com.google.cloud.dialogflow.v2beta1.BatchUpdateEntitiesRequest(this);
-      int from_bitField0_ = bitField0_;
-      result.parent_ = parent_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.BatchUpdateEntitiesRequest result) {
       if (entitiesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           entities_ = java.util.Collections.unmodifiableList(entities_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.entities_ = entities_;
       } else {
         result.entities_ = entitiesBuilder_.build();
       }
-      result.languageCode_ = languageCode_;
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.BatchUpdateEntitiesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -660,13 +678,14 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.BatchUpdateEntities
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (entitiesBuilder_ == null) {
         if (!other.entities_.isEmpty()) {
           if (entities_.isEmpty()) {
             entities_ = other.entities_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureEntitiesIsMutable();
             entities_.addAll(other.entities_);
@@ -679,7 +698,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.BatchUpdateEntities
             entitiesBuilder_.dispose();
             entitiesBuilder_ = null;
             entities_ = other.entities_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             entitiesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getEntitiesFieldBuilder()
@@ -691,6 +710,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.BatchUpdateEntities
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.hasUpdateMask()) {
@@ -725,7 +745,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -745,13 +765,13 @@ public Builder mergeFrom(
             case 26:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -852,8 +872,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -875,8 +895,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -903,8 +923,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -913,11 +933,11 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureEntitiesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         entities_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.EntityType.Entity>(
                 entities_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -1158,7 +1178,7 @@ public Builder addAllEntities(
     public Builder clearEntities() {
       if (entitiesBuilder_ == null) {
         entities_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         entitiesBuilder_.clear();
@@ -1298,7 +1318,7 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder addEntities
                 com.google.cloud.dialogflow.v2beta1.EntityType.Entity,
                 com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder,
                 com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder>(
-                entities_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                entities_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         entities_ = null;
       }
       return entitiesBuilder_;
@@ -1377,8 +1397,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1398,8 +1418,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1424,8 +1444,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1448,7 +1468,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1485,11 +1505,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1504,11 +1524,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1522,17 +1542,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1545,14 +1566,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * <code>.google.protobuf.FieldMask update_mask = 4;</code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1565,7 +1585,7 @@ public Builder clearUpdateMask() {
      * <code>.google.protobuf.FieldMask update_mask = 4;</code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesRequest.java
index 12aa94cefa8b..937898008986 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesRequest.java
@@ -116,7 +116,9 @@ public EntityTypeBatchCase getEntityTypeBatchCase() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -306,7 +308,9 @@ public com.google.cloud.dialogflow.v2beta1.EntityTypeBatch getEntityTypeBatchInl
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 4;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -408,7 +412,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -672,17 +676,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       if (entityTypeBatchInlineBuilder_ != null) {
         entityTypeBatchInlineBuilder_.clear();
       }
       languageCode_ = "";
-
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       entityTypeBatchCase_ = 0;
@@ -715,26 +717,35 @@ public com.google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesRequest build()
     public com.google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesRequest result =
           new com.google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesRequest(this);
-      result.parent_ = parent_;
-      if (entityTypeBatchCase_ == 2) {
-        result.entityTypeBatch_ = entityTypeBatch_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (entityTypeBatchCase_ == 3) {
-        if (entityTypeBatchInlineBuilder_ == null) {
-          result.entityTypeBatch_ = entityTypeBatch_;
-        } else {
-          result.entityTypeBatch_ = entityTypeBatchInlineBuilder_.build();
-        }
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
       }
-      result.languageCode_ = languageCode_;
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
       }
+    }
+
+    private void buildPartialOneofs(
+        com.google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesRequest result) {
       result.entityTypeBatchCase_ = entityTypeBatchCase_;
-      onBuilt();
-      return result;
+      result.entityTypeBatch_ = this.entityTypeBatch_;
+      if (entityTypeBatchCase_ == 3 && entityTypeBatchInlineBuilder_ != null) {
+        result.entityTypeBatch_ = entityTypeBatchInlineBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -787,10 +798,12 @@ public Builder mergeFrom(
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (other.hasUpdateMask()) {
@@ -843,7 +856,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -863,13 +876,13 @@ public Builder mergeFrom(
             case 34:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 42:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             default:
@@ -903,6 +916,8 @@ public Builder clearEntityTypeBatch() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -979,8 +994,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1001,8 +1016,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1028,8 +1043,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1398,7 +1413,6 @@ public Builder clearEntityTypeBatchInline() {
       }
       entityTypeBatchCase_ = 3;
       onChanged();
-      ;
       return entityTypeBatchInlineBuilder_;
     }
 
@@ -1475,8 +1489,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1496,8 +1510,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1522,8 +1536,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1547,7 +1561,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -1586,11 +1600,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1606,11 +1620,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1625,17 +1639,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1649,14 +1664,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1670,7 +1684,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesResponse.java
index 432b1dd1ffaf..7a0548d10887 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesResponse.java
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ENTITY_TYPES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.EntityType> entityTypes_;
   /**
    *
@@ -340,6 +342,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (entityTypesBuilder_ == null) {
         entityTypes_ = java.util.Collections.emptyList();
       } else {
@@ -376,7 +379,16 @@ public com.google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse build(
     public com.google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse result =
           new com.google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse result) {
       if (entityTypesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           entityTypes_ = java.util.Collections.unmodifiableList(entityTypes_);
@@ -386,8 +398,11 @@ public com.google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse buildP
       } else {
         result.entityTypes_ = entityTypesBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsRequest.java
index 1b3892c2b9a2..472f6e6ec69b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsRequest.java
@@ -117,7 +117,9 @@ public IntentBatchCase getIntentBatchCase() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -303,7 +305,9 @@ public com.google.cloud.dialogflow.v2beta1.IntentBatchOrBuilder getIntentBatchIn
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 4;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -402,11 +406,11 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   public static final int INTENT_VIEW_FIELD_NUMBER = 6;
-  private int intentView_;
+  private int intentView_ = 0;
   /**
    *
    *
@@ -435,9 +439,8 @@ public int getIntentViewValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.IntentView getIntentView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.IntentView result =
-        com.google.cloud.dialogflow.v2beta1.IntentView.valueOf(intentView_);
+        com.google.cloud.dialogflow.v2beta1.IntentView.forNumber(intentView_);
     return result == null ? com.google.cloud.dialogflow.v2beta1.IntentView.UNRECOGNIZED : result;
   }
 
@@ -710,21 +713,18 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       if (intentBatchInlineBuilder_ != null) {
         intentBatchInlineBuilder_.clear();
       }
       languageCode_ = "";
-
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       intentView_ = 0;
-
       intentBatchCase_ = 0;
       intentBatch_ = null;
       return this;
@@ -755,27 +755,38 @@ public com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsRequest build() {
     public com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsRequest result =
           new com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsRequest(this);
-      result.parent_ = parent_;
-      if (intentBatchCase_ == 2) {
-        result.intentBatch_ = intentBatch_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (intentBatchCase_ == 3) {
-        if (intentBatchInlineBuilder_ == null) {
-          result.intentBatch_ = intentBatch_;
-        } else {
-          result.intentBatch_ = intentBatchInlineBuilder_.build();
-        }
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
       }
-      result.languageCode_ = languageCode_;
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
       }
-      result.intentView_ = intentView_;
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.intentView_ = intentView_;
+      }
+    }
+
+    private void buildPartialOneofs(
+        com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsRequest result) {
       result.intentBatchCase_ = intentBatchCase_;
-      onBuilt();
-      return result;
+      result.intentBatch_ = this.intentBatch_;
+      if (intentBatchCase_ == 3 && intentBatchInlineBuilder_ != null) {
+        result.intentBatch_ = intentBatchInlineBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -827,10 +838,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsR
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (other.hasUpdateMask()) {
@@ -886,7 +899,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -906,19 +919,19 @@ public Builder mergeFrom(
             case 34:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 42:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             case 48:
               {
                 intentView_ = input.readEnum();
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 48
             default:
@@ -952,6 +965,8 @@ public Builder clearIntentBatch() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -1028,8 +1043,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1050,8 +1065,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1077,8 +1092,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1437,7 +1452,6 @@ public com.google.cloud.dialogflow.v2beta1.IntentBatch.Builder getIntentBatchInl
       }
       intentBatchCase_ = 3;
       onChanged();
-      ;
       return intentBatchInlineBuilder_;
     }
 
@@ -1514,8 +1528,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1535,8 +1549,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1561,8 +1575,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1585,7 +1599,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -1622,11 +1636,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1641,11 +1655,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1659,17 +1673,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1682,14 +1697,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * <code>.google.protobuf.FieldMask update_mask = 5;</code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1702,7 +1716,7 @@ public Builder clearUpdateMask() {
      * <code>.google.protobuf.FieldMask update_mask = 5;</code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
@@ -1779,8 +1793,8 @@ public int getIntentViewValue() {
      * @return This builder for chaining.
      */
     public Builder setIntentViewValue(int value) {
-
       intentView_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1797,9 +1811,8 @@ public Builder setIntentViewValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.IntentView getIntentView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.IntentView result =
-          com.google.cloud.dialogflow.v2beta1.IntentView.valueOf(intentView_);
+          com.google.cloud.dialogflow.v2beta1.IntentView.forNumber(intentView_);
       return result == null ? com.google.cloud.dialogflow.v2beta1.IntentView.UNRECOGNIZED : result;
     }
     /**
@@ -1818,7 +1831,7 @@ public Builder setIntentView(com.google.cloud.dialogflow.v2beta1.IntentView valu
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000020;
       intentView_ = value.getNumber();
       onChanged();
       return this;
@@ -1835,7 +1848,7 @@ public Builder setIntentView(com.google.cloud.dialogflow.v2beta1.IntentView valu
      * @return This builder for chaining.
      */
     public Builder clearIntentView() {
-
+      bitField0_ = (bitField0_ & ~0x00000020);
       intentView_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsResponse.java
index 0f27aee45330..d04184e6d7c2 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsResponse.java
@@ -68,6 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int INTENTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent> intents_;
   /**
    *
@@ -336,6 +338,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (intentsBuilder_ == null) {
         intents_ = java.util.Collections.emptyList();
       } else {
@@ -371,7 +374,16 @@ public com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse build() {
     public com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse result =
           new com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse result) {
       if (intentsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           intents_ = java.util.Collections.unmodifiableList(intents_);
@@ -381,8 +393,11 @@ public com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse buildParti
       } else {
         result.intents_ = intentsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ClearSuggestionFeatureConfigOperationMetadata.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ClearSuggestionFeatureConfigOperationMetadata.java
index bd3d74519a7e..183ad1d86ea0 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ClearSuggestionFeatureConfigOperationMetadata.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ClearSuggestionFeatureConfigOperationMetadata.java
@@ -75,7 +75,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_PROFILE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object conversationProfile_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversationProfile_ = "";
   /**
    *
    *
@@ -128,7 +130,7 @@ public com.google.protobuf.ByteString getConversationProfileBytes() {
   }
 
   public static final int PARTICIPANT_ROLE_FIELD_NUMBER = 2;
-  private int participantRole_;
+  private int participantRole_ = 0;
   /**
    *
    *
@@ -163,16 +165,15 @@ public int getParticipantRoleValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.Participant.Role getParticipantRole() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.Participant.Role result =
-        com.google.cloud.dialogflow.v2beta1.Participant.Role.valueOf(participantRole_);
+        com.google.cloud.dialogflow.v2beta1.Participant.Role.forNumber(participantRole_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.Participant.Role.UNRECOGNIZED
         : result;
   }
 
   public static final int SUGGESTION_FEATURE_TYPE_FIELD_NUMBER = 3;
-  private int suggestionFeatureType_;
+  private int suggestionFeatureType_ = 0;
   /**
    *
    *
@@ -205,9 +206,9 @@ public int getSuggestionFeatureTypeValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type getSuggestionFeatureType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type result =
-        com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.valueOf(suggestionFeatureType_);
+        com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.forNumber(
+            suggestionFeatureType_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.UNRECOGNIZED
         : result;
@@ -256,7 +257,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -508,16 +509,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       conversationProfile_ = "";
-
       participantRole_ = 0;
-
       suggestionFeatureType_ = 0;
-
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
       return this;
@@ -553,18 +551,30 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
       com.google.cloud.dialogflow.v2beta1.ClearSuggestionFeatureConfigOperationMetadata result =
           new com.google.cloud.dialogflow.v2beta1.ClearSuggestionFeatureConfigOperationMetadata(
               this);
-      result.conversationProfile_ = conversationProfile_;
-      result.participantRole_ = participantRole_;
-      result.suggestionFeatureType_ = suggestionFeatureType_;
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.ClearSuggestionFeatureConfigOperationMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversationProfile_ = conversationProfile_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.participantRole_ = participantRole_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.suggestionFeatureType_ = suggestionFeatureType_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -619,6 +629,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getConversationProfile().isEmpty()) {
         conversationProfile_ = other.conversationProfile_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.participantRole_ != 0) {
@@ -659,25 +670,25 @@ public Builder mergeFrom(
             case 10:
               {
                 conversationProfile_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 participantRole_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 24:
               {
                 suggestionFeatureType_ = input.readEnum();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 34:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -697,6 +708,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object conversationProfile_ = "";
     /**
      *
@@ -764,8 +777,8 @@ public Builder setConversationProfile(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversationProfile_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -783,8 +796,8 @@ public Builder setConversationProfile(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationProfile() {
-
       conversationProfile_ = getDefaultInstance().getConversationProfile();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -807,8 +820,8 @@ public Builder setConversationProfileBytes(com.google.protobuf.ByteString value)
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversationProfile_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -848,8 +861,8 @@ public int getParticipantRoleValue() {
      * @return This builder for chaining.
      */
     public Builder setParticipantRoleValue(int value) {
-
       participantRole_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -869,9 +882,8 @@ public Builder setParticipantRoleValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.Participant.Role getParticipantRole() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.Participant.Role result =
-          com.google.cloud.dialogflow.v2beta1.Participant.Role.valueOf(participantRole_);
+          com.google.cloud.dialogflow.v2beta1.Participant.Role.forNumber(participantRole_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.Participant.Role.UNRECOGNIZED
           : result;
@@ -895,7 +907,7 @@ public Builder setParticipantRole(com.google.cloud.dialogflow.v2beta1.Participan
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       participantRole_ = value.getNumber();
       onChanged();
       return this;
@@ -915,7 +927,7 @@ public Builder setParticipantRole(com.google.cloud.dialogflow.v2beta1.Participan
      * @return This builder for chaining.
      */
     public Builder clearParticipantRole() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       participantRole_ = 0;
       onChanged();
       return this;
@@ -954,8 +966,8 @@ public int getSuggestionFeatureTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setSuggestionFeatureTypeValue(int value) {
-
       suggestionFeatureType_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -974,9 +986,8 @@ public Builder setSuggestionFeatureTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type getSuggestionFeatureType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type result =
-          com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.valueOf(
+          com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.forNumber(
               suggestionFeatureType_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.UNRECOGNIZED
@@ -1001,7 +1012,7 @@ public Builder setSuggestionFeatureType(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000004;
       suggestionFeatureType_ = value.getNumber();
       onChanged();
       return this;
@@ -1020,7 +1031,7 @@ public Builder setSuggestionFeatureType(
      * @return This builder for chaining.
      */
     public Builder clearSuggestionFeatureType() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       suggestionFeatureType_ = 0;
       onChanged();
       return this;
@@ -1044,7 +1055,7 @@ public Builder clearSuggestionFeatureType() {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1081,11 +1092,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1100,11 +1111,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1118,17 +1129,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
         } else {
           createTime_ = value;
         }
-        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1141,14 +1153,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * <code>.google.protobuf.Timestamp create_time = 4;</code>
      */
     public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1161,7 +1172,7 @@ public Builder clearCreateTime() {
      * <code>.google.protobuf.Timestamp create_time = 4;</code>
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ClearSuggestionFeatureConfigRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ClearSuggestionFeatureConfigRequest.java
index dbeff527b6ac..39ef962c2f10 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ClearSuggestionFeatureConfigRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ClearSuggestionFeatureConfigRequest.java
@@ -72,7 +72,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_PROFILE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object conversationProfile_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversationProfile_ = "";
   /**
    *
    *
@@ -125,7 +127,7 @@ public com.google.protobuf.ByteString getConversationProfileBytes() {
   }
 
   public static final int PARTICIPANT_ROLE_FIELD_NUMBER = 2;
-  private int participantRole_;
+  private int participantRole_ = 0;
   /**
    *
    *
@@ -160,16 +162,15 @@ public int getParticipantRoleValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.Participant.Role getParticipantRole() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.Participant.Role result =
-        com.google.cloud.dialogflow.v2beta1.Participant.Role.valueOf(participantRole_);
+        com.google.cloud.dialogflow.v2beta1.Participant.Role.forNumber(participantRole_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.Participant.Role.UNRECOGNIZED
         : result;
   }
 
   public static final int SUGGESTION_FEATURE_TYPE_FIELD_NUMBER = 3;
-  private int suggestionFeatureType_;
+  private int suggestionFeatureType_ = 0;
   /**
    *
    *
@@ -202,9 +203,9 @@ public int getSuggestionFeatureTypeValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type getSuggestionFeatureType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type result =
-        com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.valueOf(suggestionFeatureType_);
+        com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.forNumber(
+            suggestionFeatureType_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.UNRECOGNIZED
         : result;
@@ -435,12 +436,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       conversationProfile_ = "";
-
       participantRole_ = 0;
-
       suggestionFeatureType_ = 0;
-
       return this;
     }
 
@@ -471,13 +470,27 @@ public com.google.cloud.dialogflow.v2beta1.ClearSuggestionFeatureConfigRequest b
     public com.google.cloud.dialogflow.v2beta1.ClearSuggestionFeatureConfigRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ClearSuggestionFeatureConfigRequest result =
           new com.google.cloud.dialogflow.v2beta1.ClearSuggestionFeatureConfigRequest(this);
-      result.conversationProfile_ = conversationProfile_;
-      result.participantRole_ = participantRole_;
-      result.suggestionFeatureType_ = suggestionFeatureType_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.ClearSuggestionFeatureConfigRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversationProfile_ = conversationProfile_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.participantRole_ = participantRole_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.suggestionFeatureType_ = suggestionFeatureType_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -530,6 +543,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getConversationProfile().isEmpty()) {
         conversationProfile_ = other.conversationProfile_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.participantRole_ != 0) {
@@ -567,19 +581,19 @@ public Builder mergeFrom(
             case 10:
               {
                 conversationProfile_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 participantRole_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 24:
               {
                 suggestionFeatureType_ = input.readEnum();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             default:
@@ -599,6 +613,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object conversationProfile_ = "";
     /**
      *
@@ -666,8 +682,8 @@ public Builder setConversationProfile(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversationProfile_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -685,8 +701,8 @@ public Builder setConversationProfile(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationProfile() {
-
       conversationProfile_ = getDefaultInstance().getConversationProfile();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -709,8 +725,8 @@ public Builder setConversationProfileBytes(com.google.protobuf.ByteString value)
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversationProfile_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -750,8 +766,8 @@ public int getParticipantRoleValue() {
      * @return This builder for chaining.
      */
     public Builder setParticipantRoleValue(int value) {
-
       participantRole_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -771,9 +787,8 @@ public Builder setParticipantRoleValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.Participant.Role getParticipantRole() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.Participant.Role result =
-          com.google.cloud.dialogflow.v2beta1.Participant.Role.valueOf(participantRole_);
+          com.google.cloud.dialogflow.v2beta1.Participant.Role.forNumber(participantRole_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.Participant.Role.UNRECOGNIZED
           : result;
@@ -797,7 +812,7 @@ public Builder setParticipantRole(com.google.cloud.dialogflow.v2beta1.Participan
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       participantRole_ = value.getNumber();
       onChanged();
       return this;
@@ -817,7 +832,7 @@ public Builder setParticipantRole(com.google.cloud.dialogflow.v2beta1.Participan
      * @return This builder for chaining.
      */
     public Builder clearParticipantRole() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       participantRole_ = 0;
       onChanged();
       return this;
@@ -856,8 +871,8 @@ public int getSuggestionFeatureTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setSuggestionFeatureTypeValue(int value) {
-
       suggestionFeatureType_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -876,9 +891,8 @@ public Builder setSuggestionFeatureTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type getSuggestionFeatureType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type result =
-          com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.valueOf(
+          com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.forNumber(
               suggestionFeatureType_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.UNRECOGNIZED
@@ -903,7 +917,7 @@ public Builder setSuggestionFeatureType(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000004;
       suggestionFeatureType_ = value.getNumber();
       onChanged();
       return this;
@@ -922,7 +936,7 @@ public Builder setSuggestionFeatureType(
      * @return This builder for chaining.
      */
     public Builder clearSuggestionFeatureType() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       suggestionFeatureType_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CompileSuggestionRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CompileSuggestionRequest.java
index 5f414a9c30c0..a662020cae0f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CompileSuggestionRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CompileSuggestionRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -123,7 +125,9 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int LATEST_MESSAGE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object latestMessage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object latestMessage_ = "";
   /**
    *
    *
@@ -178,7 +182,7 @@ public com.google.protobuf.ByteString getLatestMessageBytes() {
   }
 
   public static final int CONTEXT_SIZE_FIELD_NUMBER = 3;
-  private int contextSize_;
+  private int contextSize_ = 0;
   /**
    *
    *
@@ -413,12 +417,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       latestMessage_ = "";
-
       contextSize_ = 0;
-
       return this;
     }
 
@@ -447,13 +449,27 @@ public com.google.cloud.dialogflow.v2beta1.CompileSuggestionRequest build() {
     public com.google.cloud.dialogflow.v2beta1.CompileSuggestionRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.CompileSuggestionRequest result =
           new com.google.cloud.dialogflow.v2beta1.CompileSuggestionRequest(this);
-      result.parent_ = parent_;
-      result.latestMessage_ = latestMessage_;
-      result.contextSize_ = contextSize_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.CompileSuggestionRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.latestMessage_ = latestMessage_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.contextSize_ = contextSize_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -503,10 +519,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.CompileSuggestionRe
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLatestMessage().isEmpty()) {
         latestMessage_ = other.latestMessage_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getContextSize() != 0) {
@@ -541,19 +559,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 latestMessage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 contextSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             default:
@@ -573,6 +591,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -640,8 +660,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -659,8 +679,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -683,8 +703,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -759,8 +779,8 @@ public Builder setLatestMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -779,8 +799,8 @@ public Builder setLatestMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLatestMessage() {
-
       latestMessage_ = getDefaultInstance().getLatestMessage();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -804,8 +824,8 @@ public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -845,6 +865,7 @@ public int getContextSize() {
     public Builder setContextSize(int value) {
 
       contextSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -862,7 +883,7 @@ public Builder setContextSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearContextSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       contextSize_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CompileSuggestionResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CompileSuggestionResponse.java
index 140e0a7c0283..3bdc483fda2d 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CompileSuggestionResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CompileSuggestionResponse.java
@@ -113,11 +113,15 @@ public com.google.cloud.dialogflow.v2beta1.Suggestion getSuggestion() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.SuggestionOrBuilder getSuggestionOrBuilder() {
-    return getSuggestion();
+    return suggestion_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Suggestion.getDefaultInstance()
+        : suggestion_;
   }
 
   public static final int LATEST_MESSAGE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object latestMessage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object latestMessage_ = "";
   /**
    *
    *
@@ -172,7 +176,7 @@ public com.google.protobuf.ByteString getLatestMessageBytes() {
   }
 
   public static final int CONTEXT_SIZE_FIELD_NUMBER = 3;
-  private int contextSize_;
+  private int contextSize_ = 0;
   /**
    *
    *
@@ -414,16 +418,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (suggestionBuilder_ == null) {
-        suggestion_ = null;
-      } else {
-        suggestion_ = null;
+      bitField0_ = 0;
+      suggestion_ = null;
+      if (suggestionBuilder_ != null) {
+        suggestionBuilder_.dispose();
         suggestionBuilder_ = null;
       }
       latestMessage_ = "";
-
       contextSize_ = 0;
-
       return this;
     }
 
@@ -452,17 +454,27 @@ public com.google.cloud.dialogflow.v2beta1.CompileSuggestionResponse build() {
     public com.google.cloud.dialogflow.v2beta1.CompileSuggestionResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.CompileSuggestionResponse result =
           new com.google.cloud.dialogflow.v2beta1.CompileSuggestionResponse(this);
-      if (suggestionBuilder_ == null) {
-        result.suggestion_ = suggestion_;
-      } else {
-        result.suggestion_ = suggestionBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.latestMessage_ = latestMessage_;
-      result.contextSize_ = contextSize_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.CompileSuggestionResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.suggestion_ = suggestionBuilder_ == null ? suggestion_ : suggestionBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.latestMessage_ = latestMessage_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.contextSize_ = contextSize_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -515,6 +527,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.CompileSuggestionRe
       }
       if (!other.getLatestMessage().isEmpty()) {
         latestMessage_ = other.latestMessage_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getContextSize() != 0) {
@@ -549,19 +562,19 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getSuggestionFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 latestMessage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 contextSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             default:
@@ -581,6 +594,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2beta1.Suggestion suggestion_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.Suggestion,
@@ -599,7 +614,7 @@ public Builder mergeFrom(
      * @return Whether the suggestion field is set.
      */
     public boolean hasSuggestion() {
-      return suggestionBuilder_ != null || suggestion_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -636,11 +651,11 @@ public Builder setSuggestion(com.google.cloud.dialogflow.v2beta1.Suggestion valu
           throw new NullPointerException();
         }
         suggestion_ = value;
-        onChanged();
       } else {
         suggestionBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -656,11 +671,11 @@ public Builder setSuggestion(
         com.google.cloud.dialogflow.v2beta1.Suggestion.Builder builderForValue) {
       if (suggestionBuilder_ == null) {
         suggestion_ = builderForValue.build();
-        onChanged();
       } else {
         suggestionBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -674,19 +689,18 @@ public Builder setSuggestion(
      */
     public Builder mergeSuggestion(com.google.cloud.dialogflow.v2beta1.Suggestion value) {
       if (suggestionBuilder_ == null) {
-        if (suggestion_ != null) {
-          suggestion_ =
-              com.google.cloud.dialogflow.v2beta1.Suggestion.newBuilder(suggestion_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && suggestion_ != null
+            && suggestion_ != com.google.cloud.dialogflow.v2beta1.Suggestion.getDefaultInstance()) {
+          getSuggestionBuilder().mergeFrom(value);
         } else {
           suggestion_ = value;
         }
-        onChanged();
       } else {
         suggestionBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -699,14 +713,13 @@ public Builder mergeSuggestion(com.google.cloud.dialogflow.v2beta1.Suggestion va
      * <code>.google.cloud.dialogflow.v2beta1.Suggestion suggestion = 1;</code>
      */
     public Builder clearSuggestion() {
-      if (suggestionBuilder_ == null) {
-        suggestion_ = null;
-        onChanged();
-      } else {
-        suggestion_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      suggestion_ = null;
+      if (suggestionBuilder_ != null) {
+        suggestionBuilder_.dispose();
         suggestionBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -719,7 +732,7 @@ public Builder clearSuggestion() {
      * <code>.google.cloud.dialogflow.v2beta1.Suggestion suggestion = 1;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.Suggestion.Builder getSuggestionBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getSuggestionFieldBuilder().getBuilder();
     }
@@ -837,8 +850,8 @@ public Builder setLatestMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -857,8 +870,8 @@ public Builder setLatestMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLatestMessage() {
-
       latestMessage_ = getDefaultInstance().getLatestMessage();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -882,8 +895,8 @@ public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -927,6 +940,7 @@ public int getContextSize() {
     public Builder setContextSize(int value) {
 
       contextSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -946,7 +960,7 @@ public Builder setContextSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearContextSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       contextSize_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CompleteConversationRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CompleteConversationRequest.java
index 1078b62f695e..be0a299ca6ca 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CompleteConversationRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CompleteConversationRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -322,8 +324,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -352,11 +354,21 @@ public com.google.cloud.dialogflow.v2beta1.CompleteConversationRequest build() {
     public com.google.cloud.dialogflow.v2beta1.CompleteConversationRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.CompleteConversationRequest result =
           new com.google.cloud.dialogflow.v2beta1.CompleteConversationRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.CompleteConversationRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -407,6 +419,7 @@ public Builder mergeFrom(
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -438,7 +451,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -458,6 +471,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -531,8 +546,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -552,8 +567,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -578,8 +593,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Context.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Context.java
index 298b9b2e612e..d5e8756adc0b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Context.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Context.java
@@ -80,7 +80,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -165,7 +167,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int LIFESPAN_COUNT_FIELD_NUMBER = 2;
-  private int lifespanCount_;
+  private int lifespanCount_ = 0;
   /**
    *
    *
@@ -267,7 +269,7 @@ public com.google.protobuf.Struct getParameters() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getParametersOrBuilder() {
-    return getParameters();
+    return parameters_ == null ? com.google.protobuf.Struct.getDefaultInstance() : parameters_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -502,14 +504,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       lifespanCount_ = 0;
-
-      if (parametersBuilder_ == null) {
-        parameters_ = null;
-      } else {
-        parameters_ = null;
+      parameters_ = null;
+      if (parametersBuilder_ != null) {
+        parametersBuilder_.dispose();
         parametersBuilder_ = null;
       }
       return this;
@@ -539,17 +539,26 @@ public com.google.cloud.dialogflow.v2beta1.Context build() {
     public com.google.cloud.dialogflow.v2beta1.Context buildPartial() {
       com.google.cloud.dialogflow.v2beta1.Context result =
           new com.google.cloud.dialogflow.v2beta1.Context(this);
-      result.name_ = name_;
-      result.lifespanCount_ = lifespanCount_;
-      if (parametersBuilder_ == null) {
-        result.parameters_ = parameters_;
-      } else {
-        result.parameters_ = parametersBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.Context result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.lifespanCount_ = lifespanCount_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.parameters_ = parametersBuilder_ == null ? parameters_ : parametersBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -597,6 +606,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Context other) {
       if (other == com.google.cloud.dialogflow.v2beta1.Context.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getLifespanCount() != 0) {
@@ -634,19 +644,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 lifespanCount_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 input.readMessage(getParametersFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -666,6 +676,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -781,8 +793,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -816,8 +828,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -856,8 +868,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -899,6 +911,7 @@ public int getLifespanCount() {
     public Builder setLifespanCount(int value) {
 
       lifespanCount_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -917,7 +930,7 @@ public Builder setLifespanCount(int value) {
      * @return This builder for chaining.
      */
     public Builder clearLifespanCount() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       lifespanCount_ = 0;
       onChanged();
       return this;
@@ -954,7 +967,7 @@ public Builder clearLifespanCount() {
      * @return Whether the parameters field is set.
      */
     public boolean hasParameters() {
-      return parametersBuilder_ != null || parameters_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1015,11 +1028,11 @@ public Builder setParameters(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         parameters_ = value;
-        onChanged();
       } else {
         parametersBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1047,11 +1060,11 @@ public Builder setParameters(com.google.protobuf.Struct value) {
     public Builder setParameters(com.google.protobuf.Struct.Builder builderForValue) {
       if (parametersBuilder_ == null) {
         parameters_ = builderForValue.build();
-        onChanged();
       } else {
         parametersBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1078,17 +1091,18 @@ public Builder setParameters(com.google.protobuf.Struct.Builder builderForValue)
      */
     public Builder mergeParameters(com.google.protobuf.Struct value) {
       if (parametersBuilder_ == null) {
-        if (parameters_ != null) {
-          parameters_ =
-              com.google.protobuf.Struct.newBuilder(parameters_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && parameters_ != null
+            && parameters_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getParametersBuilder().mergeFrom(value);
         } else {
           parameters_ = value;
         }
-        onChanged();
       } else {
         parametersBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1114,14 +1128,13 @@ public Builder mergeParameters(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct parameters = 3;</code>
      */
     public Builder clearParameters() {
-      if (parametersBuilder_ == null) {
-        parameters_ = null;
-        onChanged();
-      } else {
-        parameters_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      parameters_ = null;
+      if (parametersBuilder_ != null) {
+        parametersBuilder_.dispose();
         parametersBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1147,7 +1160,7 @@ public Builder clearParameters() {
      * <code>.google.protobuf.Struct parameters = 3;</code>
      */
     public com.google.protobuf.Struct.Builder getParametersBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getParametersFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Conversation.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Conversation.java
index c31d75d50d7b..65f4ca9746f9 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Conversation.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Conversation.java
@@ -399,7 +399,9 @@ private ConversationStage(int value) {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -452,7 +454,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int LIFECYCLE_STATE_FIELD_NUMBER = 2;
-  private int lifecycleState_;
+  private int lifecycleState_ = 0;
   /**
    *
    *
@@ -485,16 +487,17 @@ public int getLifecycleStateValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.Conversation.LifecycleState getLifecycleState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.Conversation.LifecycleState result =
-        com.google.cloud.dialogflow.v2beta1.Conversation.LifecycleState.valueOf(lifecycleState_);
+        com.google.cloud.dialogflow.v2beta1.Conversation.LifecycleState.forNumber(lifecycleState_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.Conversation.LifecycleState.UNRECOGNIZED
         : result;
   }
 
   public static final int CONVERSATION_PROFILE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object conversationProfile_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversationProfile_ = "";
   /**
    *
    *
@@ -607,11 +610,13 @@ public com.google.cloud.dialogflow.v2beta1.ConversationPhoneNumber getPhoneNumbe
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.ConversationPhoneNumberOrBuilder
       getPhoneNumberOrBuilder() {
-    return getPhoneNumber();
+    return phoneNumber_ == null
+        ? com.google.cloud.dialogflow.v2beta1.ConversationPhoneNumber.getDefaultInstance()
+        : phoneNumber_;
   }
 
   public static final int CONVERSATION_STAGE_FIELD_NUMBER = 7;
-  private int conversationStage_;
+  private int conversationStage_ = 0;
   /**
    *
    *
@@ -662,9 +667,8 @@ public int getConversationStageValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.Conversation.ConversationStage getConversationStage() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.Conversation.ConversationStage result =
-        com.google.cloud.dialogflow.v2beta1.Conversation.ConversationStage.valueOf(
+        com.google.cloud.dialogflow.v2beta1.Conversation.ConversationStage.forNumber(
             conversationStage_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.Conversation.ConversationStage.UNRECOGNIZED
@@ -717,7 +721,7 @@ public com.google.protobuf.Timestamp getStartTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
-    return getStartTime();
+    return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_;
   }
 
   public static final int END_TIME_FIELD_NUMBER = 6;
@@ -766,7 +770,7 @@ public com.google.protobuf.Timestamp getEndTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
-    return getEndTime();
+    return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -1050,30 +1054,24 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       lifecycleState_ = 0;
-
       conversationProfile_ = "";
-
-      if (phoneNumberBuilder_ == null) {
-        phoneNumber_ = null;
-      } else {
-        phoneNumber_ = null;
+      phoneNumber_ = null;
+      if (phoneNumberBuilder_ != null) {
+        phoneNumberBuilder_.dispose();
         phoneNumberBuilder_ = null;
       }
       conversationStage_ = 0;
-
-      if (startTimeBuilder_ == null) {
-        startTime_ = null;
-      } else {
-        startTime_ = null;
+      startTime_ = null;
+      if (startTimeBuilder_ != null) {
+        startTimeBuilder_.dispose();
         startTimeBuilder_ = null;
       }
-      if (endTimeBuilder_ == null) {
-        endTime_ = null;
-      } else {
-        endTime_ = null;
+      endTime_ = null;
+      if (endTimeBuilder_ != null) {
+        endTimeBuilder_.dispose();
         endTimeBuilder_ = null;
       }
       return this;
@@ -1103,29 +1101,39 @@ public com.google.cloud.dialogflow.v2beta1.Conversation build() {
     public com.google.cloud.dialogflow.v2beta1.Conversation buildPartial() {
       com.google.cloud.dialogflow.v2beta1.Conversation result =
           new com.google.cloud.dialogflow.v2beta1.Conversation(this);
-      result.name_ = name_;
-      result.lifecycleState_ = lifecycleState_;
-      result.conversationProfile_ = conversationProfile_;
-      if (phoneNumberBuilder_ == null) {
-        result.phoneNumber_ = phoneNumber_;
-      } else {
-        result.phoneNumber_ = phoneNumberBuilder_.build();
-      }
-      result.conversationStage_ = conversationStage_;
-      if (startTimeBuilder_ == null) {
-        result.startTime_ = startTime_;
-      } else {
-        result.startTime_ = startTimeBuilder_.build();
-      }
-      if (endTimeBuilder_ == null) {
-        result.endTime_ = endTime_;
-      } else {
-        result.endTime_ = endTimeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.Conversation result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.lifecycleState_ = lifecycleState_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.conversationProfile_ = conversationProfile_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.phoneNumber_ =
+            phoneNumberBuilder_ == null ? phoneNumber_ : phoneNumberBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.conversationStage_ = conversationStage_;
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.startTime_ = startTimeBuilder_ == null ? startTime_ : startTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.endTime_ = endTimeBuilder_ == null ? endTime_ : endTimeBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -1174,6 +1182,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Conversation other)
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.lifecycleState_ != 0) {
@@ -1181,6 +1190,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Conversation other)
       }
       if (!other.getConversationProfile().isEmpty()) {
         conversationProfile_ = other.conversationProfile_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.hasPhoneNumber()) {
@@ -1224,43 +1234,43 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 lifecycleState_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 conversationProfile_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(getPhoneNumberFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 42:
               {
                 input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 42
             case 50:
               {
                 input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 50
             case 56:
               {
                 conversationStage_ = input.readEnum();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 56
             default:
@@ -1280,6 +1290,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -1347,8 +1359,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1366,8 +1378,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1390,8 +1402,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1429,8 +1441,8 @@ public int getLifecycleStateValue() {
      * @return This builder for chaining.
      */
     public Builder setLifecycleStateValue(int value) {
-
       lifecycleState_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1449,9 +1461,9 @@ public Builder setLifecycleStateValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.Conversation.LifecycleState getLifecycleState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.Conversation.LifecycleState result =
-          com.google.cloud.dialogflow.v2beta1.Conversation.LifecycleState.valueOf(lifecycleState_);
+          com.google.cloud.dialogflow.v2beta1.Conversation.LifecycleState.forNumber(
+              lifecycleState_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.Conversation.LifecycleState.UNRECOGNIZED
           : result;
@@ -1475,7 +1487,7 @@ public Builder setLifecycleState(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       lifecycleState_ = value.getNumber();
       onChanged();
       return this;
@@ -1494,7 +1506,7 @@ public Builder setLifecycleState(
      * @return This builder for chaining.
      */
     public Builder clearLifecycleState() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       lifecycleState_ = 0;
       onChanged();
       return this;
@@ -1576,8 +1588,8 @@ public Builder setConversationProfile(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversationProfile_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1598,8 +1610,8 @@ public Builder setConversationProfile(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationProfile() {
-
       conversationProfile_ = getDefaultInstance().getConversationProfile();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1625,8 +1637,8 @@ public Builder setConversationProfileBytes(com.google.protobuf.ByteString value)
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversationProfile_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1652,7 +1664,7 @@ public Builder setConversationProfileBytes(com.google.protobuf.ByteString value)
      * @return Whether the phoneNumber field is set.
      */
     public boolean hasPhoneNumber() {
-      return phoneNumberBuilder_ != null || phoneNumber_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1696,11 +1708,11 @@ public Builder setPhoneNumber(
           throw new NullPointerException();
         }
         phoneNumber_ = value;
-        onChanged();
       } else {
         phoneNumberBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1719,11 +1731,11 @@ public Builder setPhoneNumber(
         com.google.cloud.dialogflow.v2beta1.ConversationPhoneNumber.Builder builderForValue) {
       if (phoneNumberBuilder_ == null) {
         phoneNumber_ = builderForValue.build();
-        onChanged();
       } else {
         phoneNumberBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1741,19 +1753,20 @@ public Builder setPhoneNumber(
     public Builder mergePhoneNumber(
         com.google.cloud.dialogflow.v2beta1.ConversationPhoneNumber value) {
       if (phoneNumberBuilder_ == null) {
-        if (phoneNumber_ != null) {
-          phoneNumber_ =
-              com.google.cloud.dialogflow.v2beta1.ConversationPhoneNumber.newBuilder(phoneNumber_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && phoneNumber_ != null
+            && phoneNumber_
+                != com.google.cloud.dialogflow.v2beta1.ConversationPhoneNumber
+                    .getDefaultInstance()) {
+          getPhoneNumberBuilder().mergeFrom(value);
         } else {
           phoneNumber_ = value;
         }
-        onChanged();
       } else {
         phoneNumberBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1769,14 +1782,13 @@ public Builder mergePhoneNumber(
      * </code>
      */
     public Builder clearPhoneNumber() {
-      if (phoneNumberBuilder_ == null) {
-        phoneNumber_ = null;
-        onChanged();
-      } else {
-        phoneNumber_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      phoneNumber_ = null;
+      if (phoneNumberBuilder_ != null) {
+        phoneNumberBuilder_.dispose();
         phoneNumberBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1793,7 +1805,7 @@ public Builder clearPhoneNumber() {
      */
     public com.google.cloud.dialogflow.v2beta1.ConversationPhoneNumber.Builder
         getPhoneNumberBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getPhoneNumberFieldBuilder().getBuilder();
     }
@@ -1899,8 +1911,8 @@ public int getConversationStageValue() {
      * @return This builder for chaining.
      */
     public Builder setConversationStageValue(int value) {
-
       conversationStage_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1929,9 +1941,8 @@ public Builder setConversationStageValue(int value) {
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.Conversation.ConversationStage
         getConversationStage() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.Conversation.ConversationStage result =
-          com.google.cloud.dialogflow.v2beta1.Conversation.ConversationStage.valueOf(
+          com.google.cloud.dialogflow.v2beta1.Conversation.ConversationStage.forNumber(
               conversationStage_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.Conversation.ConversationStage.UNRECOGNIZED
@@ -1965,7 +1976,7 @@ public Builder setConversationStage(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000010;
       conversationStage_ = value.getNumber();
       onChanged();
       return this;
@@ -1993,7 +2004,7 @@ public Builder setConversationStage(
      * @return This builder for chaining.
      */
     public Builder clearConversationStage() {
-
+      bitField0_ = (bitField0_ & ~0x00000010);
       conversationStage_ = 0;
       onChanged();
       return this;
@@ -2018,7 +2029,7 @@ public Builder clearConversationStage() {
      * @return Whether the startTime field is set.
      */
     public boolean hasStartTime() {
-      return startTimeBuilder_ != null || startTime_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -2055,11 +2066,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         startTime_ = value;
-        onChanged();
       } else {
         startTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2075,11 +2086,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) {
     public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (startTimeBuilder_ == null) {
         startTime_ = builderForValue.build();
-        onChanged();
       } else {
         startTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2094,17 +2105,18 @@ public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValu
      */
     public Builder mergeStartTime(com.google.protobuf.Timestamp value) {
       if (startTimeBuilder_ == null) {
-        if (startTime_ != null) {
-          startTime_ =
-              com.google.protobuf.Timestamp.newBuilder(startTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && startTime_ != null
+            && startTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getStartTimeBuilder().mergeFrom(value);
         } else {
           startTime_ = value;
         }
-        onChanged();
       } else {
         startTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2118,14 +2130,13 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) {
      * </code>
      */
     public Builder clearStartTime() {
-      if (startTimeBuilder_ == null) {
-        startTime_ = null;
-        onChanged();
-      } else {
-        startTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      startTime_ = null;
+      if (startTimeBuilder_ != null) {
+        startTimeBuilder_.dispose();
         startTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2139,7 +2150,7 @@ public Builder clearStartTime() {
      * </code>
      */
     public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getStartTimeFieldBuilder().getBuilder();
     }
@@ -2206,7 +2217,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
      * @return Whether the endTime field is set.
      */
     public boolean hasEndTime() {
-      return endTimeBuilder_ != null || endTime_ != null;
+      return ((bitField0_ & 0x00000040) != 0);
     }
     /**
      *
@@ -2243,11 +2254,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         endTime_ = value;
-        onChanged();
       } else {
         endTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2263,11 +2274,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) {
     public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (endTimeBuilder_ == null) {
         endTime_ = builderForValue.build();
-        onChanged();
       } else {
         endTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2282,17 +2293,18 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue)
      */
     public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
       if (endTimeBuilder_ == null) {
-        if (endTime_ != null) {
-          endTime_ =
-              com.google.protobuf.Timestamp.newBuilder(endTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000040) != 0)
+            && endTime_ != null
+            && endTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getEndTimeBuilder().mergeFrom(value);
         } else {
           endTime_ = value;
         }
-        onChanged();
       } else {
         endTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2306,14 +2318,13 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
      * </code>
      */
     public Builder clearEndTime() {
-      if (endTimeBuilder_ == null) {
-        endTime_ = null;
-        onChanged();
-      } else {
-        endTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      endTime_ = null;
+      if (endTimeBuilder_ != null) {
+        endTimeBuilder_.dispose();
         endTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2327,7 +2338,7 @@ public Builder clearEndTime() {
      * </code>
      */
     public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() {
-
+      bitField0_ |= 0x00000040;
       onChanged();
       return getEndTimeFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ConversationEvent.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ConversationEvent.java
index 6d1c030e2625..a92abe732de3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ConversationEvent.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ConversationEvent.java
@@ -361,7 +361,9 @@ public PayloadCase getPayloadCase() {
   }
 
   public static final int CONVERSATION_FIELD_NUMBER = 1;
-  private volatile java.lang.Object conversation_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversation_ = "";
   /**
    *
    *
@@ -414,7 +416,7 @@ public com.google.protobuf.ByteString getConversationBytes() {
   }
 
   public static final int TYPE_FIELD_NUMBER = 2;
-  private int type_;
+  private int type_ = 0;
   /**
    *
    *
@@ -443,9 +445,8 @@ public int getTypeValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.ConversationEvent.Type getType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.ConversationEvent.Type result =
-        com.google.cloud.dialogflow.v2beta1.ConversationEvent.Type.valueOf(type_);
+        com.google.cloud.dialogflow.v2beta1.ConversationEvent.Type.forNumber(type_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.ConversationEvent.Type.UNRECOGNIZED
         : result;
@@ -497,7 +498,7 @@ public com.google.rpc.Status getErrorStatus() {
    */
   @java.lang.Override
   public com.google.rpc.StatusOrBuilder getErrorStatusOrBuilder() {
-    return getErrorStatus();
+    return errorStatus_ == null ? com.google.rpc.Status.getDefaultInstance() : errorStatus_;
   }
 
   public static final int NEW_MESSAGE_PAYLOAD_FIELD_NUMBER = 4;
@@ -801,14 +802,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       conversation_ = "";
-
       type_ = 0;
-
-      if (errorStatusBuilder_ == null) {
-        errorStatus_ = null;
-      } else {
-        errorStatus_ = null;
+      errorStatus_ = null;
+      if (errorStatusBuilder_ != null) {
+        errorStatusBuilder_.dispose();
         errorStatusBuilder_ = null;
       }
       if (newMessagePayloadBuilder_ != null) {
@@ -843,25 +842,36 @@ public com.google.cloud.dialogflow.v2beta1.ConversationEvent build() {
     public com.google.cloud.dialogflow.v2beta1.ConversationEvent buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ConversationEvent result =
           new com.google.cloud.dialogflow.v2beta1.ConversationEvent(this);
-      result.conversation_ = conversation_;
-      result.type_ = type_;
-      if (errorStatusBuilder_ == null) {
-        result.errorStatus_ = errorStatus_;
-      } else {
-        result.errorStatus_ = errorStatusBuilder_.build();
-      }
-      if (payloadCase_ == 4) {
-        if (newMessagePayloadBuilder_ == null) {
-          result.payload_ = payload_;
-        } else {
-          result.payload_ = newMessagePayloadBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.payloadCase_ = payloadCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ConversationEvent result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversation_ = conversation_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.type_ = type_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.errorStatus_ =
+            errorStatusBuilder_ == null ? errorStatus_ : errorStatusBuilder_.build();
+      }
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2beta1.ConversationEvent result) {
+      result.payloadCase_ = payloadCase_;
+      result.payload_ = this.payload_;
+      if (payloadCase_ == 4 && newMessagePayloadBuilder_ != null) {
+        result.payload_ = newMessagePayloadBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -910,6 +920,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ConversationEvent o
         return this;
       if (!other.getConversation().isEmpty()) {
         conversation_ = other.conversation_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.type_ != 0) {
@@ -958,19 +969,19 @@ public Builder mergeFrom(
             case 10:
               {
                 conversation_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 type_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 input.readMessage(getErrorStatusFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
@@ -1011,6 +1022,8 @@ public Builder clearPayload() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object conversation_ = "";
     /**
      *
@@ -1078,8 +1091,8 @@ public Builder setConversation(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversation_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1097,8 +1110,8 @@ public Builder setConversation(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversation() {
-
       conversation_ = getDefaultInstance().getConversation();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1121,8 +1134,8 @@ public Builder setConversationBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversation_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1156,8 +1169,8 @@ public int getTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setTypeValue(int value) {
-
       type_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1174,9 +1187,8 @@ public Builder setTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.ConversationEvent.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.ConversationEvent.Type result =
-          com.google.cloud.dialogflow.v2beta1.ConversationEvent.Type.valueOf(type_);
+          com.google.cloud.dialogflow.v2beta1.ConversationEvent.Type.forNumber(type_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.ConversationEvent.Type.UNRECOGNIZED
           : result;
@@ -1197,7 +1209,7 @@ public Builder setType(com.google.cloud.dialogflow.v2beta1.ConversationEvent.Typ
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       type_ = value.getNumber();
       onChanged();
       return this;
@@ -1214,7 +1226,7 @@ public Builder setType(com.google.cloud.dialogflow.v2beta1.ConversationEvent.Typ
      * @return This builder for chaining.
      */
     public Builder clearType() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       type_ = 0;
       onChanged();
       return this;
@@ -1237,7 +1249,7 @@ public Builder clearType() {
      * @return Whether the errorStatus field is set.
      */
     public boolean hasErrorStatus() {
-      return errorStatusBuilder_ != null || errorStatus_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1274,11 +1286,11 @@ public Builder setErrorStatus(com.google.rpc.Status value) {
           throw new NullPointerException();
         }
         errorStatus_ = value;
-        onChanged();
       } else {
         errorStatusBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1294,11 +1306,11 @@ public Builder setErrorStatus(com.google.rpc.Status value) {
     public Builder setErrorStatus(com.google.rpc.Status.Builder builderForValue) {
       if (errorStatusBuilder_ == null) {
         errorStatus_ = builderForValue.build();
-        onChanged();
       } else {
         errorStatusBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1313,17 +1325,18 @@ public Builder setErrorStatus(com.google.rpc.Status.Builder builderForValue) {
      */
     public Builder mergeErrorStatus(com.google.rpc.Status value) {
       if (errorStatusBuilder_ == null) {
-        if (errorStatus_ != null) {
-          errorStatus_ =
-              com.google.rpc.Status.newBuilder(errorStatus_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && errorStatus_ != null
+            && errorStatus_ != com.google.rpc.Status.getDefaultInstance()) {
+          getErrorStatusBuilder().mergeFrom(value);
         } else {
           errorStatus_ = value;
         }
-        onChanged();
       } else {
         errorStatusBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1337,14 +1350,13 @@ public Builder mergeErrorStatus(com.google.rpc.Status value) {
      * <code>.google.rpc.Status error_status = 3;</code>
      */
     public Builder clearErrorStatus() {
-      if (errorStatusBuilder_ == null) {
-        errorStatus_ = null;
-        onChanged();
-      } else {
-        errorStatus_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      errorStatus_ = null;
+      if (errorStatusBuilder_ != null) {
+        errorStatusBuilder_.dispose();
         errorStatusBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1358,7 +1370,7 @@ public Builder clearErrorStatus() {
      * <code>.google.rpc.Status error_status = 3;</code>
      */
     public com.google.rpc.Status.Builder getErrorStatusBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getErrorStatusFieldBuilder().getBuilder();
     }
@@ -1610,7 +1622,6 @@ public com.google.cloud.dialogflow.v2beta1.MessageOrBuilder getNewMessagePayload
       }
       payloadCase_ = 4;
       onChanged();
-      ;
       return newMessagePayloadBuilder_;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ConversationPhoneNumber.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ConversationPhoneNumber.java
index 8b8ad15475fc..e652ff5cc0f3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ConversationPhoneNumber.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ConversationPhoneNumber.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PHONE_NUMBER_FIELD_NUMBER = 3;
-  private volatile java.lang.Object phoneNumber_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object phoneNumber_ = "";
   /**
    *
    *
@@ -316,8 +318,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       phoneNumber_ = "";
-
       return this;
     }
 
@@ -345,11 +347,20 @@ public com.google.cloud.dialogflow.v2beta1.ConversationPhoneNumber build() {
     public com.google.cloud.dialogflow.v2beta1.ConversationPhoneNumber buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ConversationPhoneNumber result =
           new com.google.cloud.dialogflow.v2beta1.ConversationPhoneNumber(this);
-      result.phoneNumber_ = phoneNumber_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ConversationPhoneNumber result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.phoneNumber_ = phoneNumber_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -398,6 +409,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ConversationPhoneNu
         return this;
       if (!other.getPhoneNumber().isEmpty()) {
         phoneNumber_ = other.phoneNumber_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -429,7 +441,7 @@ public Builder mergeFrom(
             case 26:
               {
                 phoneNumber_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 26
             default:
@@ -449,6 +461,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object phoneNumber_ = "";
     /**
      *
@@ -510,8 +524,8 @@ public Builder setPhoneNumber(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       phoneNumber_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -527,8 +541,8 @@ public Builder setPhoneNumber(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPhoneNumber() {
-
       phoneNumber_ = getDefaultInstance().getPhoneNumber();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -549,8 +563,8 @@ public Builder setPhoneNumberBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       phoneNumber_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ConversationProfile.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ConversationProfile.java
index 699d386db6f0..443a6a993619 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ConversationProfile.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ConversationProfile.java
@@ -72,7 +72,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -125,7 +127,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
@@ -219,7 +223,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
 
   public static final int UPDATE_TIME_FIELD_NUMBER = 12;
@@ -268,7 +272,7 @@ public com.google.protobuf.Timestamp getUpdateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
-    return getUpdateTime();
+    return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
   }
 
   public static final int AUTOMATED_AGENT_CONFIG_FIELD_NUMBER = 3;
@@ -317,7 +321,9 @@ public com.google.cloud.dialogflow.v2beta1.AutomatedAgentConfig getAutomatedAgen
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.AutomatedAgentConfigOrBuilder
       getAutomatedAgentConfigOrBuilder() {
-    return getAutomatedAgentConfig();
+    return automatedAgentConfig_ == null
+        ? com.google.cloud.dialogflow.v2beta1.AutomatedAgentConfig.getDefaultInstance()
+        : automatedAgentConfig_;
   }
 
   public static final int HUMAN_AGENT_ASSISTANT_CONFIG_FIELD_NUMBER = 4;
@@ -373,7 +379,9 @@ public boolean hasHumanAgentAssistantConfig() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfigOrBuilder
       getHumanAgentAssistantConfigOrBuilder() {
-    return getHumanAgentAssistantConfig();
+    return humanAgentAssistantConfig_ == null
+        ? com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.getDefaultInstance()
+        : humanAgentAssistantConfig_;
   }
 
   public static final int HUMAN_AGENT_HANDOFF_CONFIG_FIELD_NUMBER = 5;
@@ -431,7 +439,9 @@ public com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfig getHumanAgent
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfigOrBuilder
       getHumanAgentHandoffConfigOrBuilder() {
-    return getHumanAgentHandoffConfig();
+    return humanAgentHandoffConfig_ == null
+        ? com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfig.getDefaultInstance()
+        : humanAgentHandoffConfig_;
   }
 
   public static final int NOTIFICATION_CONFIG_FIELD_NUMBER = 6;
@@ -480,7 +490,9 @@ public com.google.cloud.dialogflow.v2beta1.NotificationConfig getNotificationCon
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.NotificationConfigOrBuilder
       getNotificationConfigOrBuilder() {
-    return getNotificationConfig();
+    return notificationConfig_ == null
+        ? com.google.cloud.dialogflow.v2beta1.NotificationConfig.getDefaultInstance()
+        : notificationConfig_;
   }
 
   public static final int LOGGING_CONFIG_FIELD_NUMBER = 7;
@@ -528,7 +540,9 @@ public com.google.cloud.dialogflow.v2beta1.LoggingConfig getLoggingConfig() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.LoggingConfigOrBuilder getLoggingConfigOrBuilder() {
-    return getLoggingConfig();
+    return loggingConfig_ == null
+        ? com.google.cloud.dialogflow.v2beta1.LoggingConfig.getDefaultInstance()
+        : loggingConfig_;
   }
 
   public static final int NEW_MESSAGE_EVENT_NOTIFICATION_CONFIG_FIELD_NUMBER = 8;
@@ -587,7 +601,9 @@ public boolean hasNewMessageEventNotificationConfig() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.NotificationConfigOrBuilder
       getNewMessageEventNotificationConfigOrBuilder() {
-    return getNewMessageEventNotificationConfig();
+    return newMessageEventNotificationConfig_ == null
+        ? com.google.cloud.dialogflow.v2beta1.NotificationConfig.getDefaultInstance()
+        : newMessageEventNotificationConfig_;
   }
 
   public static final int STT_CONFIG_FIELD_NUMBER = 9;
@@ -635,11 +651,15 @@ public com.google.cloud.dialogflow.v2beta1.SpeechToTextConfig getSttConfig() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.SpeechToTextConfigOrBuilder getSttConfigOrBuilder() {
-    return getSttConfig();
+    return sttConfig_ == null
+        ? com.google.cloud.dialogflow.v2beta1.SpeechToTextConfig.getDefaultInstance()
+        : sttConfig_;
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 10;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -696,7 +716,9 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
   }
 
   public static final int TIME_ZONE_FIELD_NUMBER = 14;
-  private volatile java.lang.Object timeZone_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object timeZone_ = "";
   /**
    *
    *
@@ -749,7 +771,9 @@ public com.google.protobuf.ByteString getTimeZoneBytes() {
   }
 
   public static final int SECURITY_SETTINGS_FIELD_NUMBER = 13;
-  private volatile java.lang.Object securitySettings_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object securitySettings_ = "";
   /**
    *
    *
@@ -1170,70 +1194,57 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       displayName_ = "";
-
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-      if (updateTimeBuilder_ == null) {
-        updateTime_ = null;
-      } else {
-        updateTime_ = null;
+      updateTime_ = null;
+      if (updateTimeBuilder_ != null) {
+        updateTimeBuilder_.dispose();
         updateTimeBuilder_ = null;
       }
-      if (automatedAgentConfigBuilder_ == null) {
-        automatedAgentConfig_ = null;
-      } else {
-        automatedAgentConfig_ = null;
+      automatedAgentConfig_ = null;
+      if (automatedAgentConfigBuilder_ != null) {
+        automatedAgentConfigBuilder_.dispose();
         automatedAgentConfigBuilder_ = null;
       }
-      if (humanAgentAssistantConfigBuilder_ == null) {
-        humanAgentAssistantConfig_ = null;
-      } else {
-        humanAgentAssistantConfig_ = null;
+      humanAgentAssistantConfig_ = null;
+      if (humanAgentAssistantConfigBuilder_ != null) {
+        humanAgentAssistantConfigBuilder_.dispose();
         humanAgentAssistantConfigBuilder_ = null;
       }
-      if (humanAgentHandoffConfigBuilder_ == null) {
-        humanAgentHandoffConfig_ = null;
-      } else {
-        humanAgentHandoffConfig_ = null;
+      humanAgentHandoffConfig_ = null;
+      if (humanAgentHandoffConfigBuilder_ != null) {
+        humanAgentHandoffConfigBuilder_.dispose();
         humanAgentHandoffConfigBuilder_ = null;
       }
-      if (notificationConfigBuilder_ == null) {
-        notificationConfig_ = null;
-      } else {
-        notificationConfig_ = null;
+      notificationConfig_ = null;
+      if (notificationConfigBuilder_ != null) {
+        notificationConfigBuilder_.dispose();
         notificationConfigBuilder_ = null;
       }
-      if (loggingConfigBuilder_ == null) {
-        loggingConfig_ = null;
-      } else {
-        loggingConfig_ = null;
+      loggingConfig_ = null;
+      if (loggingConfigBuilder_ != null) {
+        loggingConfigBuilder_.dispose();
         loggingConfigBuilder_ = null;
       }
-      if (newMessageEventNotificationConfigBuilder_ == null) {
-        newMessageEventNotificationConfig_ = null;
-      } else {
-        newMessageEventNotificationConfig_ = null;
+      newMessageEventNotificationConfig_ = null;
+      if (newMessageEventNotificationConfigBuilder_ != null) {
+        newMessageEventNotificationConfigBuilder_.dispose();
         newMessageEventNotificationConfigBuilder_ = null;
       }
-      if (sttConfigBuilder_ == null) {
-        sttConfig_ = null;
-      } else {
-        sttConfig_ = null;
+      sttConfig_ = null;
+      if (sttConfigBuilder_ != null) {
+        sttConfigBuilder_.dispose();
         sttConfigBuilder_ = null;
       }
       languageCode_ = "";
-
       timeZone_ = "";
-
       securitySettings_ = "";
-
       return this;
     }
 
@@ -1261,59 +1272,73 @@ public com.google.cloud.dialogflow.v2beta1.ConversationProfile build() {
     public com.google.cloud.dialogflow.v2beta1.ConversationProfile buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ConversationProfile result =
           new com.google.cloud.dialogflow.v2beta1.ConversationProfile(this);
-      result.name_ = name_;
-      result.displayName_ = displayName_;
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (updateTimeBuilder_ == null) {
-        result.updateTime_ = updateTime_;
-      } else {
-        result.updateTime_ = updateTimeBuilder_.build();
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ConversationProfile result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
       }
-      if (automatedAgentConfigBuilder_ == null) {
-        result.automatedAgentConfig_ = automatedAgentConfig_;
-      } else {
-        result.automatedAgentConfig_ = automatedAgentConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.displayName_ = displayName_;
       }
-      if (humanAgentAssistantConfigBuilder_ == null) {
-        result.humanAgentAssistantConfig_ = humanAgentAssistantConfig_;
-      } else {
-        result.humanAgentAssistantConfig_ = humanAgentAssistantConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
       }
-      if (humanAgentHandoffConfigBuilder_ == null) {
-        result.humanAgentHandoffConfig_ = humanAgentHandoffConfig_;
-      } else {
-        result.humanAgentHandoffConfig_ = humanAgentHandoffConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
       }
-      if (notificationConfigBuilder_ == null) {
-        result.notificationConfig_ = notificationConfig_;
-      } else {
-        result.notificationConfig_ = notificationConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.automatedAgentConfig_ =
+            automatedAgentConfigBuilder_ == null
+                ? automatedAgentConfig_
+                : automatedAgentConfigBuilder_.build();
       }
-      if (loggingConfigBuilder_ == null) {
-        result.loggingConfig_ = loggingConfig_;
-      } else {
-        result.loggingConfig_ = loggingConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.humanAgentAssistantConfig_ =
+            humanAgentAssistantConfigBuilder_ == null
+                ? humanAgentAssistantConfig_
+                : humanAgentAssistantConfigBuilder_.build();
       }
-      if (newMessageEventNotificationConfigBuilder_ == null) {
-        result.newMessageEventNotificationConfig_ = newMessageEventNotificationConfig_;
-      } else {
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.humanAgentHandoffConfig_ =
+            humanAgentHandoffConfigBuilder_ == null
+                ? humanAgentHandoffConfig_
+                : humanAgentHandoffConfigBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.notificationConfig_ =
+            notificationConfigBuilder_ == null
+                ? notificationConfig_
+                : notificationConfigBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000100) != 0)) {
+        result.loggingConfig_ =
+            loggingConfigBuilder_ == null ? loggingConfig_ : loggingConfigBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000200) != 0)) {
         result.newMessageEventNotificationConfig_ =
-            newMessageEventNotificationConfigBuilder_.build();
+            newMessageEventNotificationConfigBuilder_ == null
+                ? newMessageEventNotificationConfig_
+                : newMessageEventNotificationConfigBuilder_.build();
       }
-      if (sttConfigBuilder_ == null) {
-        result.sttConfig_ = sttConfig_;
-      } else {
-        result.sttConfig_ = sttConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000400) != 0)) {
+        result.sttConfig_ = sttConfigBuilder_ == null ? sttConfig_ : sttConfigBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000800) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00001000) != 0)) {
+        result.timeZone_ = timeZone_;
+      }
+      if (((from_bitField0_ & 0x00002000) != 0)) {
+        result.securitySettings_ = securitySettings_;
       }
-      result.languageCode_ = languageCode_;
-      result.timeZone_ = timeZone_;
-      result.securitySettings_ = securitySettings_;
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -1364,10 +1389,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ConversationProfile
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasCreateTime()) {
@@ -1399,14 +1426,17 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ConversationProfile
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000800;
         onChanged();
       }
       if (!other.getTimeZone().isEmpty()) {
         timeZone_ = other.timeZone_;
+        bitField0_ |= 0x00001000;
         onChanged();
       }
       if (!other.getSecuritySettings().isEmpty()) {
         securitySettings_ = other.securitySettings_;
+        bitField0_ |= 0x00002000;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -1438,47 +1468,47 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 displayName_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(
                     getAutomatedAgentConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(
                     getHumanAgentAssistantConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 34
             case 42:
               {
                 input.readMessage(
                     getHumanAgentHandoffConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 42
             case 50:
               {
                 input.readMessage(
                     getNotificationConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 50
             case 58:
               {
                 input.readMessage(getLoggingConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000100;
                 break;
               } // case 58
             case 66:
@@ -1486,43 +1516,43 @@ public Builder mergeFrom(
                 input.readMessage(
                     getNewMessageEventNotificationConfigFieldBuilder().getBuilder(),
                     extensionRegistry);
-
+                bitField0_ |= 0x00000200;
                 break;
               } // case 66
             case 74:
               {
                 input.readMessage(getSttConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000400;
                 break;
               } // case 74
             case 82:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000800;
                 break;
               } // case 82
             case 90:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 90
             case 98:
               {
                 input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 98
             case 106:
               {
                 securitySettings_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00002000;
                 break;
               } // case 106
             case 114:
               {
                 timeZone_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00001000;
                 break;
               } // case 114
             default:
@@ -1542,6 +1572,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -1609,8 +1641,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1628,8 +1660,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1652,8 +1684,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1719,8 +1751,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1736,8 +1768,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
-
       displayName_ = getDefaultInstance().getDisplayName();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1758,8 +1790,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1784,7 +1816,7 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1825,11 +1857,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1846,11 +1878,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1866,17 +1898,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
         } else {
           createTime_ = value;
         }
-        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1891,14 +1924,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * </code>
      */
     public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1913,7 +1945,7 @@ public Builder clearCreateTime() {
      * </code>
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
@@ -1985,7 +2017,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
      * @return Whether the updateTime field is set.
      */
     public boolean hasUpdateTime() {
-      return updateTimeBuilder_ != null || updateTime_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -2026,11 +2058,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         updateTime_ = value;
-        onChanged();
       } else {
         updateTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -2047,11 +2079,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
     public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (updateTimeBuilder_ == null) {
         updateTime_ = builderForValue.build();
-        onChanged();
       } else {
         updateTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -2067,17 +2099,18 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       if (updateTimeBuilder_ == null) {
-        if (updateTime_ != null) {
-          updateTime_ =
-              com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && updateTime_ != null
+            && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getUpdateTimeBuilder().mergeFrom(value);
         } else {
           updateTime_ = value;
         }
-        onChanged();
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -2092,14 +2125,13 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
      * </code>
      */
     public Builder clearUpdateTime() {
-      if (updateTimeBuilder_ == null) {
-        updateTime_ = null;
-        onChanged();
-      } else {
-        updateTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      updateTime_ = null;
+      if (updateTimeBuilder_ != null) {
+        updateTimeBuilder_.dispose();
         updateTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2114,7 +2146,7 @@ public Builder clearUpdateTime() {
      * </code>
      */
     public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getUpdateTimeFieldBuilder().getBuilder();
     }
@@ -2185,7 +2217,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
      * @return Whether the automatedAgentConfig field is set.
      */
     public boolean hasAutomatedAgentConfig() {
-      return automatedAgentConfigBuilder_ != null || automatedAgentConfig_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -2225,11 +2257,11 @@ public Builder setAutomatedAgentConfig(
           throw new NullPointerException();
         }
         automatedAgentConfig_ = value;
-        onChanged();
       } else {
         automatedAgentConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2246,11 +2278,11 @@ public Builder setAutomatedAgentConfig(
         com.google.cloud.dialogflow.v2beta1.AutomatedAgentConfig.Builder builderForValue) {
       if (automatedAgentConfigBuilder_ == null) {
         automatedAgentConfig_ = builderForValue.build();
-        onChanged();
       } else {
         automatedAgentConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2266,20 +2298,19 @@ public Builder setAutomatedAgentConfig(
     public Builder mergeAutomatedAgentConfig(
         com.google.cloud.dialogflow.v2beta1.AutomatedAgentConfig value) {
       if (automatedAgentConfigBuilder_ == null) {
-        if (automatedAgentConfig_ != null) {
-          automatedAgentConfig_ =
-              com.google.cloud.dialogflow.v2beta1.AutomatedAgentConfig.newBuilder(
-                      automatedAgentConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && automatedAgentConfig_ != null
+            && automatedAgentConfig_
+                != com.google.cloud.dialogflow.v2beta1.AutomatedAgentConfig.getDefaultInstance()) {
+          getAutomatedAgentConfigBuilder().mergeFrom(value);
         } else {
           automatedAgentConfig_ = value;
         }
-        onChanged();
       } else {
         automatedAgentConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2293,14 +2324,13 @@ public Builder mergeAutomatedAgentConfig(
      * </code>
      */
     public Builder clearAutomatedAgentConfig() {
-      if (automatedAgentConfigBuilder_ == null) {
-        automatedAgentConfig_ = null;
-        onChanged();
-      } else {
-        automatedAgentConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      automatedAgentConfig_ = null;
+      if (automatedAgentConfigBuilder_ != null) {
+        automatedAgentConfigBuilder_.dispose();
         automatedAgentConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2315,7 +2345,7 @@ public Builder clearAutomatedAgentConfig() {
      */
     public com.google.cloud.dialogflow.v2beta1.AutomatedAgentConfig.Builder
         getAutomatedAgentConfigBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getAutomatedAgentConfigFieldBuilder().getBuilder();
     }
@@ -2387,7 +2417,7 @@ public Builder clearAutomatedAgentConfig() {
      * @return Whether the humanAgentAssistantConfig field is set.
      */
     public boolean hasHumanAgentAssistantConfig() {
-      return humanAgentAssistantConfigBuilder_ != null || humanAgentAssistantConfig_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -2430,11 +2460,11 @@ public Builder setHumanAgentAssistantConfig(
           throw new NullPointerException();
         }
         humanAgentAssistantConfig_ = value;
-        onChanged();
       } else {
         humanAgentAssistantConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2452,11 +2482,11 @@ public Builder setHumanAgentAssistantConfig(
         com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.Builder builderForValue) {
       if (humanAgentAssistantConfigBuilder_ == null) {
         humanAgentAssistantConfig_ = builderForValue.build();
-        onChanged();
       } else {
         humanAgentAssistantConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2473,20 +2503,20 @@ public Builder setHumanAgentAssistantConfig(
     public Builder mergeHumanAgentAssistantConfig(
         com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig value) {
       if (humanAgentAssistantConfigBuilder_ == null) {
-        if (humanAgentAssistantConfig_ != null) {
-          humanAgentAssistantConfig_ =
-              com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.newBuilder(
-                      humanAgentAssistantConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && humanAgentAssistantConfig_ != null
+            && humanAgentAssistantConfig_
+                != com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
+                    .getDefaultInstance()) {
+          getHumanAgentAssistantConfigBuilder().mergeFrom(value);
         } else {
           humanAgentAssistantConfig_ = value;
         }
-        onChanged();
       } else {
         humanAgentAssistantConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2501,14 +2531,13 @@ public Builder mergeHumanAgentAssistantConfig(
      * </code>
      */
     public Builder clearHumanAgentAssistantConfig() {
-      if (humanAgentAssistantConfigBuilder_ == null) {
-        humanAgentAssistantConfig_ = null;
-        onChanged();
-      } else {
-        humanAgentAssistantConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      humanAgentAssistantConfig_ = null;
+      if (humanAgentAssistantConfigBuilder_ != null) {
+        humanAgentAssistantConfigBuilder_.dispose();
         humanAgentAssistantConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2524,7 +2553,7 @@ public Builder clearHumanAgentAssistantConfig() {
      */
     public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.Builder
         getHumanAgentAssistantConfigBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getHumanAgentAssistantConfigFieldBuilder().getBuilder();
     }
@@ -2599,7 +2628,7 @@ public Builder clearHumanAgentAssistantConfig() {
      * @return Whether the humanAgentHandoffConfig field is set.
      */
     public boolean hasHumanAgentHandoffConfig() {
-      return humanAgentHandoffConfigBuilder_ != null || humanAgentHandoffConfig_ != null;
+      return ((bitField0_ & 0x00000040) != 0);
     }
     /**
      *
@@ -2646,11 +2675,11 @@ public Builder setHumanAgentHandoffConfig(
           throw new NullPointerException();
         }
         humanAgentHandoffConfig_ = value;
-        onChanged();
       } else {
         humanAgentHandoffConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2670,11 +2699,11 @@ public Builder setHumanAgentHandoffConfig(
         com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfig.Builder builderForValue) {
       if (humanAgentHandoffConfigBuilder_ == null) {
         humanAgentHandoffConfig_ = builderForValue.build();
-        onChanged();
       } else {
         humanAgentHandoffConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2693,20 +2722,20 @@ public Builder setHumanAgentHandoffConfig(
     public Builder mergeHumanAgentHandoffConfig(
         com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfig value) {
       if (humanAgentHandoffConfigBuilder_ == null) {
-        if (humanAgentHandoffConfig_ != null) {
-          humanAgentHandoffConfig_ =
-              com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfig.newBuilder(
-                      humanAgentHandoffConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000040) != 0)
+            && humanAgentHandoffConfig_ != null
+            && humanAgentHandoffConfig_
+                != com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfig
+                    .getDefaultInstance()) {
+          getHumanAgentHandoffConfigBuilder().mergeFrom(value);
         } else {
           humanAgentHandoffConfig_ = value;
         }
-        onChanged();
       } else {
         humanAgentHandoffConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2723,14 +2752,13 @@ public Builder mergeHumanAgentHandoffConfig(
      * </code>
      */
     public Builder clearHumanAgentHandoffConfig() {
-      if (humanAgentHandoffConfigBuilder_ == null) {
-        humanAgentHandoffConfig_ = null;
-        onChanged();
-      } else {
-        humanAgentHandoffConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      humanAgentHandoffConfig_ = null;
+      if (humanAgentHandoffConfigBuilder_ != null) {
+        humanAgentHandoffConfigBuilder_.dispose();
         humanAgentHandoffConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2748,7 +2776,7 @@ public Builder clearHumanAgentHandoffConfig() {
      */
     public com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfig.Builder
         getHumanAgentHandoffConfigBuilder() {
-
+      bitField0_ |= 0x00000040;
       onChanged();
       return getHumanAgentHandoffConfigFieldBuilder().getBuilder();
     }
@@ -2823,7 +2851,7 @@ public Builder clearHumanAgentHandoffConfig() {
      * @return Whether the notificationConfig field is set.
      */
     public boolean hasNotificationConfig() {
-      return notificationConfigBuilder_ != null || notificationConfig_ != null;
+      return ((bitField0_ & 0x00000080) != 0);
     }
     /**
      *
@@ -2861,11 +2889,11 @@ public Builder setNotificationConfig(
           throw new NullPointerException();
         }
         notificationConfig_ = value;
-        onChanged();
       } else {
         notificationConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2881,11 +2909,11 @@ public Builder setNotificationConfig(
         com.google.cloud.dialogflow.v2beta1.NotificationConfig.Builder builderForValue) {
       if (notificationConfigBuilder_ == null) {
         notificationConfig_ = builderForValue.build();
-        onChanged();
       } else {
         notificationConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2900,19 +2928,19 @@ public Builder setNotificationConfig(
     public Builder mergeNotificationConfig(
         com.google.cloud.dialogflow.v2beta1.NotificationConfig value) {
       if (notificationConfigBuilder_ == null) {
-        if (notificationConfig_ != null) {
-          notificationConfig_ =
-              com.google.cloud.dialogflow.v2beta1.NotificationConfig.newBuilder(notificationConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000080) != 0)
+            && notificationConfig_ != null
+            && notificationConfig_
+                != com.google.cloud.dialogflow.v2beta1.NotificationConfig.getDefaultInstance()) {
+          getNotificationConfigBuilder().mergeFrom(value);
         } else {
           notificationConfig_ = value;
         }
-        onChanged();
       } else {
         notificationConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2925,14 +2953,13 @@ public Builder mergeNotificationConfig(
      * <code>.google.cloud.dialogflow.v2beta1.NotificationConfig notification_config = 6;</code>
      */
     public Builder clearNotificationConfig() {
-      if (notificationConfigBuilder_ == null) {
-        notificationConfig_ = null;
-        onChanged();
-      } else {
-        notificationConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000080);
+      notificationConfig_ = null;
+      if (notificationConfigBuilder_ != null) {
+        notificationConfigBuilder_.dispose();
         notificationConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2946,7 +2973,7 @@ public Builder clearNotificationConfig() {
      */
     public com.google.cloud.dialogflow.v2beta1.NotificationConfig.Builder
         getNotificationConfigBuilder() {
-
+      bitField0_ |= 0x00000080;
       onChanged();
       return getNotificationConfigFieldBuilder().getBuilder();
     }
@@ -3013,7 +3040,7 @@ public Builder clearNotificationConfig() {
      * @return Whether the loggingConfig field is set.
      */
     public boolean hasLoggingConfig() {
-      return loggingConfigBuilder_ != null || loggingConfig_ != null;
+      return ((bitField0_ & 0x00000100) != 0);
     }
     /**
      *
@@ -3050,11 +3077,11 @@ public Builder setLoggingConfig(com.google.cloud.dialogflow.v2beta1.LoggingConfi
           throw new NullPointerException();
         }
         loggingConfig_ = value;
-        onChanged();
       } else {
         loggingConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -3070,11 +3097,11 @@ public Builder setLoggingConfig(
         com.google.cloud.dialogflow.v2beta1.LoggingConfig.Builder builderForValue) {
       if (loggingConfigBuilder_ == null) {
         loggingConfig_ = builderForValue.build();
-        onChanged();
       } else {
         loggingConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -3088,19 +3115,19 @@ public Builder setLoggingConfig(
      */
     public Builder mergeLoggingConfig(com.google.cloud.dialogflow.v2beta1.LoggingConfig value) {
       if (loggingConfigBuilder_ == null) {
-        if (loggingConfig_ != null) {
-          loggingConfig_ =
-              com.google.cloud.dialogflow.v2beta1.LoggingConfig.newBuilder(loggingConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000100) != 0)
+            && loggingConfig_ != null
+            && loggingConfig_
+                != com.google.cloud.dialogflow.v2beta1.LoggingConfig.getDefaultInstance()) {
+          getLoggingConfigBuilder().mergeFrom(value);
         } else {
           loggingConfig_ = value;
         }
-        onChanged();
       } else {
         loggingConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -3113,14 +3140,13 @@ public Builder mergeLoggingConfig(com.google.cloud.dialogflow.v2beta1.LoggingCon
      * <code>.google.cloud.dialogflow.v2beta1.LoggingConfig logging_config = 7;</code>
      */
     public Builder clearLoggingConfig() {
-      if (loggingConfigBuilder_ == null) {
-        loggingConfig_ = null;
-        onChanged();
-      } else {
-        loggingConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000100);
+      loggingConfig_ = null;
+      if (loggingConfigBuilder_ != null) {
+        loggingConfigBuilder_.dispose();
         loggingConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3133,7 +3159,7 @@ public Builder clearLoggingConfig() {
      * <code>.google.cloud.dialogflow.v2beta1.LoggingConfig logging_config = 7;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.LoggingConfig.Builder getLoggingConfigBuilder() {
-
+      bitField0_ |= 0x00000100;
       onChanged();
       return getLoggingConfigFieldBuilder().getBuilder();
     }
@@ -3203,8 +3229,7 @@ public com.google.cloud.dialogflow.v2beta1.LoggingConfigOrBuilder getLoggingConf
      * @return Whether the newMessageEventNotificationConfig field is set.
      */
     public boolean hasNewMessageEventNotificationConfig() {
-      return newMessageEventNotificationConfigBuilder_ != null
-          || newMessageEventNotificationConfig_ != null;
+      return ((bitField0_ & 0x00000200) != 0);
     }
     /**
      *
@@ -3249,11 +3274,11 @@ public Builder setNewMessageEventNotificationConfig(
           throw new NullPointerException();
         }
         newMessageEventNotificationConfig_ = value;
-        onChanged();
       } else {
         newMessageEventNotificationConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -3272,11 +3297,11 @@ public Builder setNewMessageEventNotificationConfig(
         com.google.cloud.dialogflow.v2beta1.NotificationConfig.Builder builderForValue) {
       if (newMessageEventNotificationConfigBuilder_ == null) {
         newMessageEventNotificationConfig_ = builderForValue.build();
-        onChanged();
       } else {
         newMessageEventNotificationConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -3294,20 +3319,19 @@ public Builder setNewMessageEventNotificationConfig(
     public Builder mergeNewMessageEventNotificationConfig(
         com.google.cloud.dialogflow.v2beta1.NotificationConfig value) {
       if (newMessageEventNotificationConfigBuilder_ == null) {
-        if (newMessageEventNotificationConfig_ != null) {
-          newMessageEventNotificationConfig_ =
-              com.google.cloud.dialogflow.v2beta1.NotificationConfig.newBuilder(
-                      newMessageEventNotificationConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000200) != 0)
+            && newMessageEventNotificationConfig_ != null
+            && newMessageEventNotificationConfig_
+                != com.google.cloud.dialogflow.v2beta1.NotificationConfig.getDefaultInstance()) {
+          getNewMessageEventNotificationConfigBuilder().mergeFrom(value);
         } else {
           newMessageEventNotificationConfig_ = value;
         }
-        onChanged();
       } else {
         newMessageEventNotificationConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -3323,14 +3347,13 @@ public Builder mergeNewMessageEventNotificationConfig(
      * </code>
      */
     public Builder clearNewMessageEventNotificationConfig() {
-      if (newMessageEventNotificationConfigBuilder_ == null) {
-        newMessageEventNotificationConfig_ = null;
-        onChanged();
-      } else {
-        newMessageEventNotificationConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000200);
+      newMessageEventNotificationConfig_ = null;
+      if (newMessageEventNotificationConfigBuilder_ != null) {
+        newMessageEventNotificationConfigBuilder_.dispose();
         newMessageEventNotificationConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3347,7 +3370,7 @@ public Builder clearNewMessageEventNotificationConfig() {
      */
     public com.google.cloud.dialogflow.v2beta1.NotificationConfig.Builder
         getNewMessageEventNotificationConfigBuilder() {
-
+      bitField0_ |= 0x00000200;
       onChanged();
       return getNewMessageEventNotificationConfigFieldBuilder().getBuilder();
     }
@@ -3420,7 +3443,7 @@ public Builder clearNewMessageEventNotificationConfig() {
      * @return Whether the sttConfig field is set.
      */
     public boolean hasSttConfig() {
-      return sttConfigBuilder_ != null || sttConfig_ != null;
+      return ((bitField0_ & 0x00000400) != 0);
     }
     /**
      *
@@ -3457,11 +3480,11 @@ public Builder setSttConfig(com.google.cloud.dialogflow.v2beta1.SpeechToTextConf
           throw new NullPointerException();
         }
         sttConfig_ = value;
-        onChanged();
       } else {
         sttConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000400;
+      onChanged();
       return this;
     }
     /**
@@ -3477,11 +3500,11 @@ public Builder setSttConfig(
         com.google.cloud.dialogflow.v2beta1.SpeechToTextConfig.Builder builderForValue) {
       if (sttConfigBuilder_ == null) {
         sttConfig_ = builderForValue.build();
-        onChanged();
       } else {
         sttConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000400;
+      onChanged();
       return this;
     }
     /**
@@ -3495,19 +3518,19 @@ public Builder setSttConfig(
      */
     public Builder mergeSttConfig(com.google.cloud.dialogflow.v2beta1.SpeechToTextConfig value) {
       if (sttConfigBuilder_ == null) {
-        if (sttConfig_ != null) {
-          sttConfig_ =
-              com.google.cloud.dialogflow.v2beta1.SpeechToTextConfig.newBuilder(sttConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000400) != 0)
+            && sttConfig_ != null
+            && sttConfig_
+                != com.google.cloud.dialogflow.v2beta1.SpeechToTextConfig.getDefaultInstance()) {
+          getSttConfigBuilder().mergeFrom(value);
         } else {
           sttConfig_ = value;
         }
-        onChanged();
       } else {
         sttConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000400;
+      onChanged();
       return this;
     }
     /**
@@ -3520,14 +3543,13 @@ public Builder mergeSttConfig(com.google.cloud.dialogflow.v2beta1.SpeechToTextCo
      * <code>.google.cloud.dialogflow.v2beta1.SpeechToTextConfig stt_config = 9;</code>
      */
     public Builder clearSttConfig() {
-      if (sttConfigBuilder_ == null) {
-        sttConfig_ = null;
-        onChanged();
-      } else {
-        sttConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000400);
+      sttConfig_ = null;
+      if (sttConfigBuilder_ != null) {
+        sttConfigBuilder_.dispose();
         sttConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3540,7 +3562,7 @@ public Builder clearSttConfig() {
      * <code>.google.cloud.dialogflow.v2beta1.SpeechToTextConfig stt_config = 9;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.SpeechToTextConfig.Builder getSttConfigBuilder() {
-
+      bitField0_ |= 0x00000400;
       onChanged();
       return getSttConfigFieldBuilder().getBuilder();
     }
@@ -3661,8 +3683,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000800;
       onChanged();
       return this;
     }
@@ -3682,8 +3704,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000800);
       onChanged();
       return this;
     }
@@ -3708,8 +3730,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000800;
       onChanged();
       return this;
     }
@@ -3781,8 +3803,8 @@ public Builder setTimeZone(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       timeZone_ = value;
+      bitField0_ |= 0x00001000;
       onChanged();
       return this;
     }
@@ -3800,8 +3822,8 @@ public Builder setTimeZone(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTimeZone() {
-
       timeZone_ = getDefaultInstance().getTimeZone();
+      bitField0_ = (bitField0_ & ~0x00001000);
       onChanged();
       return this;
     }
@@ -3824,8 +3846,8 @@ public Builder setTimeZoneBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       timeZone_ = value;
+      bitField0_ |= 0x00001000;
       onChanged();
       return this;
     }
@@ -3897,8 +3919,8 @@ public Builder setSecuritySettings(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       securitySettings_ = value;
+      bitField0_ |= 0x00002000;
       onChanged();
       return this;
     }
@@ -3916,8 +3938,8 @@ public Builder setSecuritySettings(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSecuritySettings() {
-
       securitySettings_ = getDefaultInstance().getSecuritySettings();
+      bitField0_ = (bitField0_ & ~0x00002000);
       onChanged();
       return this;
     }
@@ -3940,8 +3962,8 @@ public Builder setSecuritySettingsBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       securitySettings_ = value;
+      bitField0_ |= 0x00002000;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateContextRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateContextRequest.java
index e2819c66868f..b0753dd67680 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateContextRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateContextRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -193,7 +195,9 @@ public com.google.cloud.dialogflow.v2beta1.Context getContext() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.ContextOrBuilder getContextOrBuilder() {
-    return getContext();
+    return context_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Context.getDefaultInstance()
+        : context_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -408,12 +412,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (contextBuilder_ == null) {
-        context_ = null;
-      } else {
-        context_ = null;
+      context_ = null;
+      if (contextBuilder_ != null) {
+        contextBuilder_.dispose();
         contextBuilder_ = null;
       }
       return this;
@@ -443,16 +446,23 @@ public com.google.cloud.dialogflow.v2beta1.CreateContextRequest build() {
     public com.google.cloud.dialogflow.v2beta1.CreateContextRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.CreateContextRequest result =
           new com.google.cloud.dialogflow.v2beta1.CreateContextRequest(this);
-      result.parent_ = parent_;
-      if (contextBuilder_ == null) {
-        result.context_ = context_;
-      } else {
-        result.context_ = contextBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.CreateContextRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.context_ = contextBuilder_ == null ? context_ : contextBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -501,6 +511,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.CreateContextReques
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasContext()) {
@@ -535,13 +546,13 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getContextFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -561,6 +572,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -661,8 +674,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -691,8 +704,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -726,8 +739,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -752,7 +765,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the context field is set.
      */
     public boolean hasContext() {
-      return contextBuilder_ != null || context_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -793,11 +806,11 @@ public Builder setContext(com.google.cloud.dialogflow.v2beta1.Context value) {
           throw new NullPointerException();
         }
         context_ = value;
-        onChanged();
       } else {
         contextBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -814,11 +827,11 @@ public Builder setContext(com.google.cloud.dialogflow.v2beta1.Context value) {
     public Builder setContext(com.google.cloud.dialogflow.v2beta1.Context.Builder builderForValue) {
       if (contextBuilder_ == null) {
         context_ = builderForValue.build();
-        onChanged();
       } else {
         contextBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -834,19 +847,18 @@ public Builder setContext(com.google.cloud.dialogflow.v2beta1.Context.Builder bu
      */
     public Builder mergeContext(com.google.cloud.dialogflow.v2beta1.Context value) {
       if (contextBuilder_ == null) {
-        if (context_ != null) {
-          context_ =
-              com.google.cloud.dialogflow.v2beta1.Context.newBuilder(context_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && context_ != null
+            && context_ != com.google.cloud.dialogflow.v2beta1.Context.getDefaultInstance()) {
+          getContextBuilder().mergeFrom(value);
         } else {
           context_ = value;
         }
-        onChanged();
       } else {
         contextBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -861,14 +873,13 @@ public Builder mergeContext(com.google.cloud.dialogflow.v2beta1.Context value) {
      * </code>
      */
     public Builder clearContext() {
-      if (contextBuilder_ == null) {
-        context_ = null;
-        onChanged();
-      } else {
-        context_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      context_ = null;
+      if (contextBuilder_ != null) {
+        contextBuilder_.dispose();
         contextBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -883,7 +894,7 @@ public Builder clearContext() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Context.Builder getContextBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getContextFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateConversationProfileRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateConversationProfileRequest.java
index 66d426687cd8..2bf835602173 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateConversationProfileRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateConversationProfileRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -175,7 +177,9 @@ public com.google.cloud.dialogflow.v2beta1.ConversationProfile getConversationPr
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.ConversationProfileOrBuilder
       getConversationProfileOrBuilder() {
-    return getConversationProfile();
+    return conversationProfile_ == null
+        ? com.google.cloud.dialogflow.v2beta1.ConversationProfile.getDefaultInstance()
+        : conversationProfile_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -392,12 +396,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (conversationProfileBuilder_ == null) {
-        conversationProfile_ = null;
-      } else {
-        conversationProfile_ = null;
+      conversationProfile_ = null;
+      if (conversationProfileBuilder_ != null) {
+        conversationProfileBuilder_.dispose();
         conversationProfileBuilder_ = null;
       }
       return this;
@@ -429,16 +432,27 @@ public com.google.cloud.dialogflow.v2beta1.CreateConversationProfileRequest buil
     public com.google.cloud.dialogflow.v2beta1.CreateConversationProfileRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.CreateConversationProfileRequest result =
           new com.google.cloud.dialogflow.v2beta1.CreateConversationProfileRequest(this);
-      result.parent_ = parent_;
-      if (conversationProfileBuilder_ == null) {
-        result.conversationProfile_ = conversationProfile_;
-      } else {
-        result.conversationProfile_ = conversationProfileBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.CreateConversationProfileRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.conversationProfile_ =
+            conversationProfileBuilder_ == null
+                ? conversationProfile_
+                : conversationProfileBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -490,6 +504,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasConversationProfile()) {
@@ -524,14 +539,14 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(
                     getConversationProfileFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -551,6 +566,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -621,8 +638,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -641,8 +658,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -666,8 +683,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -692,7 +709,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the conversationProfile field is set.
      */
     public boolean hasConversationProfile() {
-      return conversationProfileBuilder_ != null || conversationProfile_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -734,11 +751,11 @@ public Builder setConversationProfile(
           throw new NullPointerException();
         }
         conversationProfile_ = value;
-        onChanged();
       } else {
         conversationProfileBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -756,11 +773,11 @@ public Builder setConversationProfile(
         com.google.cloud.dialogflow.v2beta1.ConversationProfile.Builder builderForValue) {
       if (conversationProfileBuilder_ == null) {
         conversationProfile_ = builderForValue.build();
-        onChanged();
       } else {
         conversationProfileBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -777,20 +794,19 @@ public Builder setConversationProfile(
     public Builder mergeConversationProfile(
         com.google.cloud.dialogflow.v2beta1.ConversationProfile value) {
       if (conversationProfileBuilder_ == null) {
-        if (conversationProfile_ != null) {
-          conversationProfile_ =
-              com.google.cloud.dialogflow.v2beta1.ConversationProfile.newBuilder(
-                      conversationProfile_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && conversationProfile_ != null
+            && conversationProfile_
+                != com.google.cloud.dialogflow.v2beta1.ConversationProfile.getDefaultInstance()) {
+          getConversationProfileBuilder().mergeFrom(value);
         } else {
           conversationProfile_ = value;
         }
-        onChanged();
       } else {
         conversationProfileBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -805,14 +821,13 @@ public Builder mergeConversationProfile(
      * </code>
      */
     public Builder clearConversationProfile() {
-      if (conversationProfileBuilder_ == null) {
-        conversationProfile_ = null;
-        onChanged();
-      } else {
-        conversationProfile_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      conversationProfile_ = null;
+      if (conversationProfileBuilder_ != null) {
+        conversationProfileBuilder_.dispose();
         conversationProfileBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -828,7 +843,7 @@ public Builder clearConversationProfile() {
      */
     public com.google.cloud.dialogflow.v2beta1.ConversationProfile.Builder
         getConversationProfileBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getConversationProfileFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateConversationRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateConversationRequest.java
index fddb17335b36..77969e5f7d22 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateConversationRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateConversationRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -174,11 +176,15 @@ public com.google.cloud.dialogflow.v2beta1.Conversation getConversation() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.ConversationOrBuilder getConversationOrBuilder() {
-    return getConversation();
+    return conversation_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Conversation.getDefaultInstance()
+        : conversation_;
   }
 
   public static final int CONVERSATION_ID_FIELD_NUMBER = 3;
-  private volatile java.lang.Object conversationId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversationId_ = "";
   /**
    *
    *
@@ -463,16 +469,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (conversationBuilder_ == null) {
-        conversation_ = null;
-      } else {
-        conversation_ = null;
+      conversation_ = null;
+      if (conversationBuilder_ != null) {
+        conversationBuilder_.dispose();
         conversationBuilder_ = null;
       }
       conversationId_ = "";
-
       return this;
     }
 
@@ -501,17 +505,28 @@ public com.google.cloud.dialogflow.v2beta1.CreateConversationRequest build() {
     public com.google.cloud.dialogflow.v2beta1.CreateConversationRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.CreateConversationRequest result =
           new com.google.cloud.dialogflow.v2beta1.CreateConversationRequest(this);
-      result.parent_ = parent_;
-      if (conversationBuilder_ == null) {
-        result.conversation_ = conversation_;
-      } else {
-        result.conversation_ = conversationBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.conversationId_ = conversationId_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.CreateConversationRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.conversation_ =
+            conversationBuilder_ == null ? conversation_ : conversationBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.conversationId_ = conversationId_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -561,6 +576,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.CreateConversationR
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasConversation()) {
@@ -568,6 +584,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.CreateConversationR
       }
       if (!other.getConversationId().isEmpty()) {
         conversationId_ = other.conversationId_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -599,19 +616,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getConversationFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 conversationId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -631,6 +648,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -701,8 +720,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -721,8 +740,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -746,8 +765,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -772,7 +791,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the conversation field is set.
      */
     public boolean hasConversation() {
-      return conversationBuilder_ != null || conversation_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -813,11 +832,11 @@ public Builder setConversation(com.google.cloud.dialogflow.v2beta1.Conversation
           throw new NullPointerException();
         }
         conversation_ = value;
-        onChanged();
       } else {
         conversationBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -835,11 +854,11 @@ public Builder setConversation(
         com.google.cloud.dialogflow.v2beta1.Conversation.Builder builderForValue) {
       if (conversationBuilder_ == null) {
         conversation_ = builderForValue.build();
-        onChanged();
       } else {
         conversationBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -855,19 +874,19 @@ public Builder setConversation(
      */
     public Builder mergeConversation(com.google.cloud.dialogflow.v2beta1.Conversation value) {
       if (conversationBuilder_ == null) {
-        if (conversation_ != null) {
-          conversation_ =
-              com.google.cloud.dialogflow.v2beta1.Conversation.newBuilder(conversation_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && conversation_ != null
+            && conversation_
+                != com.google.cloud.dialogflow.v2beta1.Conversation.getDefaultInstance()) {
+          getConversationBuilder().mergeFrom(value);
         } else {
           conversation_ = value;
         }
-        onChanged();
       } else {
         conversationBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -882,14 +901,13 @@ public Builder mergeConversation(com.google.cloud.dialogflow.v2beta1.Conversatio
      * </code>
      */
     public Builder clearConversation() {
-      if (conversationBuilder_ == null) {
-        conversation_ = null;
-        onChanged();
-      } else {
-        conversation_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      conversation_ = null;
+      if (conversationBuilder_ != null) {
+        conversationBuilder_.dispose();
         conversationBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -904,7 +922,7 @@ public Builder clearConversation() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Conversation.Builder getConversationBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getConversationFieldBuilder().getBuilder();
     }
@@ -1041,8 +1059,8 @@ public Builder setConversationId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversationId_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1066,8 +1084,8 @@ public Builder setConversationId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationId() {
-
       conversationId_ = getDefaultInstance().getConversationId();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1096,8 +1114,8 @@ public Builder setConversationIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversationId_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateDocumentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateDocumentRequest.java
index cd50199e7a86..b5e57e098638 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateDocumentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateDocumentRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -175,11 +177,13 @@ public com.google.cloud.dialogflow.v2beta1.Document getDocument() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.DocumentOrBuilder getDocumentOrBuilder() {
-    return getDocument();
+    return document_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Document.getDefaultInstance()
+        : document_;
   }
 
   public static final int IMPORT_GCS_CUSTOM_METADATA_FIELD_NUMBER = 3;
-  private boolean importGcsCustomMetadata_;
+  private boolean importGcsCustomMetadata_ = false;
   /**
    *
    *
@@ -418,16 +422,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (documentBuilder_ == null) {
-        document_ = null;
-      } else {
-        document_ = null;
+      document_ = null;
+      if (documentBuilder_ != null) {
+        documentBuilder_.dispose();
         documentBuilder_ = null;
       }
       importGcsCustomMetadata_ = false;
-
       return this;
     }
 
@@ -455,17 +457,26 @@ public com.google.cloud.dialogflow.v2beta1.CreateDocumentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.CreateDocumentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.CreateDocumentRequest result =
           new com.google.cloud.dialogflow.v2beta1.CreateDocumentRequest(this);
-      result.parent_ = parent_;
-      if (documentBuilder_ == null) {
-        result.document_ = document_;
-      } else {
-        result.document_ = documentBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.importGcsCustomMetadata_ = importGcsCustomMetadata_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.CreateDocumentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.document_ = documentBuilder_ == null ? document_ : documentBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.importGcsCustomMetadata_ = importGcsCustomMetadata_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -514,6 +525,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.CreateDocumentReque
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasDocument()) {
@@ -551,19 +563,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getDocumentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 importGcsCustomMetadata_ = input.readBool();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             default:
@@ -583,6 +595,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -656,8 +670,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -677,8 +691,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -703,8 +717,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -729,7 +743,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the document field is set.
      */
     public boolean hasDocument() {
-      return documentBuilder_ != null || document_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -770,11 +784,11 @@ public Builder setDocument(com.google.cloud.dialogflow.v2beta1.Document value) {
           throw new NullPointerException();
         }
         document_ = value;
-        onChanged();
       } else {
         documentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -792,11 +806,11 @@ public Builder setDocument(
         com.google.cloud.dialogflow.v2beta1.Document.Builder builderForValue) {
       if (documentBuilder_ == null) {
         document_ = builderForValue.build();
-        onChanged();
       } else {
         documentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -812,19 +826,18 @@ public Builder setDocument(
      */
     public Builder mergeDocument(com.google.cloud.dialogflow.v2beta1.Document value) {
       if (documentBuilder_ == null) {
-        if (document_ != null) {
-          document_ =
-              com.google.cloud.dialogflow.v2beta1.Document.newBuilder(document_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && document_ != null
+            && document_ != com.google.cloud.dialogflow.v2beta1.Document.getDefaultInstance()) {
+          getDocumentBuilder().mergeFrom(value);
         } else {
           document_ = value;
         }
-        onChanged();
       } else {
         documentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -839,14 +852,13 @@ public Builder mergeDocument(com.google.cloud.dialogflow.v2beta1.Document value)
      * </code>
      */
     public Builder clearDocument() {
-      if (documentBuilder_ == null) {
-        document_ = null;
-        onChanged();
-      } else {
-        document_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      document_ = null;
+      if (documentBuilder_ != null) {
+        documentBuilder_.dispose();
         documentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -861,7 +873,7 @@ public Builder clearDocument() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Document.Builder getDocumentBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getDocumentFieldBuilder().getBuilder();
     }
@@ -946,6 +958,7 @@ public boolean getImportGcsCustomMetadata() {
     public Builder setImportGcsCustomMetadata(boolean value) {
 
       importGcsCustomMetadata_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -962,7 +975,7 @@ public Builder setImportGcsCustomMetadata(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearImportGcsCustomMetadata() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       importGcsCustomMetadata_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateEntityTypeRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateEntityTypeRequest.java
index de9c1c783f08..982576260e2b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateEntityTypeRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateEntityTypeRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -178,11 +180,15 @@ public com.google.cloud.dialogflow.v2beta1.EntityType getEntityType() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.EntityTypeOrBuilder getEntityTypeOrBuilder() {
-    return getEntityType();
+    return entityType_ == null
+        ? com.google.cloud.dialogflow.v2beta1.EntityType.getDefaultInstance()
+        : entityType_;
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -459,16 +465,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (entityTypeBuilder_ == null) {
-        entityType_ = null;
-      } else {
-        entityType_ = null;
+      entityType_ = null;
+      if (entityTypeBuilder_ != null) {
+        entityTypeBuilder_.dispose();
         entityTypeBuilder_ = null;
       }
       languageCode_ = "";
-
       return this;
     }
 
@@ -496,17 +500,26 @@ public com.google.cloud.dialogflow.v2beta1.CreateEntityTypeRequest build() {
     public com.google.cloud.dialogflow.v2beta1.CreateEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.CreateEntityTypeRequest result =
           new com.google.cloud.dialogflow.v2beta1.CreateEntityTypeRequest(this);
-      result.parent_ = parent_;
-      if (entityTypeBuilder_ == null) {
-        result.entityType_ = entityType_;
-      } else {
-        result.entityType_ = entityTypeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.languageCode_ = languageCode_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.CreateEntityTypeRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.entityType_ = entityTypeBuilder_ == null ? entityType_ : entityTypeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -555,6 +568,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.CreateEntityTypeReq
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasEntityType()) {
@@ -562,6 +576,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.CreateEntityTypeReq
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -593,19 +608,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getEntityTypeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -625,6 +640,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -701,8 +718,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -723,8 +740,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -750,8 +767,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -776,7 +793,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the entityType field is set.
      */
     public boolean hasEntityType() {
-      return entityTypeBuilder_ != null || entityType_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -817,11 +834,11 @@ public Builder setEntityType(com.google.cloud.dialogflow.v2beta1.EntityType valu
           throw new NullPointerException();
         }
         entityType_ = value;
-        onChanged();
       } else {
         entityTypeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -839,11 +856,11 @@ public Builder setEntityType(
         com.google.cloud.dialogflow.v2beta1.EntityType.Builder builderForValue) {
       if (entityTypeBuilder_ == null) {
         entityType_ = builderForValue.build();
-        onChanged();
       } else {
         entityTypeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -859,19 +876,18 @@ public Builder setEntityType(
      */
     public Builder mergeEntityType(com.google.cloud.dialogflow.v2beta1.EntityType value) {
       if (entityTypeBuilder_ == null) {
-        if (entityType_ != null) {
-          entityType_ =
-              com.google.cloud.dialogflow.v2beta1.EntityType.newBuilder(entityType_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && entityType_ != null
+            && entityType_ != com.google.cloud.dialogflow.v2beta1.EntityType.getDefaultInstance()) {
+          getEntityTypeBuilder().mergeFrom(value);
         } else {
           entityType_ = value;
         }
-        onChanged();
       } else {
         entityTypeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -886,14 +902,13 @@ public Builder mergeEntityType(com.google.cloud.dialogflow.v2beta1.EntityType va
      * </code>
      */
     public Builder clearEntityType() {
-      if (entityTypeBuilder_ == null) {
-        entityType_ = null;
-        onChanged();
-      } else {
-        entityType_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      entityType_ = null;
+      if (entityTypeBuilder_ != null) {
+        entityTypeBuilder_.dispose();
         entityTypeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -908,7 +923,7 @@ public Builder clearEntityType() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.EntityType.Builder getEntityTypeBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getEntityTypeFieldBuilder().getBuilder();
     }
@@ -1033,8 +1048,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1054,8 +1069,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1080,8 +1095,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateEnvironmentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateEnvironmentRequest.java
index 9d9fdb1bfe28..ea9c29f39055 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateEnvironmentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateEnvironmentRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -178,11 +180,15 @@ public com.google.cloud.dialogflow.v2beta1.Environment getEnvironment() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.EnvironmentOrBuilder getEnvironmentOrBuilder() {
-    return getEnvironment();
+    return environment_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Environment.getDefaultInstance()
+        : environment_;
   }
 
   public static final int ENVIRONMENT_ID_FIELD_NUMBER = 3;
-  private volatile java.lang.Object environmentId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object environmentId_ = "";
   /**
    *
    *
@@ -451,16 +457,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (environmentBuilder_ == null) {
-        environment_ = null;
-      } else {
-        environment_ = null;
+      environment_ = null;
+      if (environmentBuilder_ != null) {
+        environmentBuilder_.dispose();
         environmentBuilder_ = null;
       }
       environmentId_ = "";
-
       return this;
     }
 
@@ -489,17 +493,28 @@ public com.google.cloud.dialogflow.v2beta1.CreateEnvironmentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.CreateEnvironmentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.CreateEnvironmentRequest result =
           new com.google.cloud.dialogflow.v2beta1.CreateEnvironmentRequest(this);
-      result.parent_ = parent_;
-      if (environmentBuilder_ == null) {
-        result.environment_ = environment_;
-      } else {
-        result.environment_ = environmentBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.environmentId_ = environmentId_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.CreateEnvironmentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.environment_ =
+            environmentBuilder_ == null ? environment_ : environmentBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.environmentId_ = environmentId_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -549,6 +564,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.CreateEnvironmentRe
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasEnvironment()) {
@@ -556,6 +572,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.CreateEnvironmentRe
       }
       if (!other.getEnvironmentId().isEmpty()) {
         environmentId_ = other.environmentId_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -587,19 +604,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getEnvironmentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 environmentId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -619,6 +636,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -695,8 +714,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -717,8 +736,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -744,8 +763,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -770,7 +789,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the environment field is set.
      */
     public boolean hasEnvironment() {
-      return environmentBuilder_ != null || environment_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -811,11 +830,11 @@ public Builder setEnvironment(com.google.cloud.dialogflow.v2beta1.Environment va
           throw new NullPointerException();
         }
         environment_ = value;
-        onChanged();
       } else {
         environmentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -833,11 +852,11 @@ public Builder setEnvironment(
         com.google.cloud.dialogflow.v2beta1.Environment.Builder builderForValue) {
       if (environmentBuilder_ == null) {
         environment_ = builderForValue.build();
-        onChanged();
       } else {
         environmentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -853,19 +872,19 @@ public Builder setEnvironment(
      */
     public Builder mergeEnvironment(com.google.cloud.dialogflow.v2beta1.Environment value) {
       if (environmentBuilder_ == null) {
-        if (environment_ != null) {
-          environment_ =
-              com.google.cloud.dialogflow.v2beta1.Environment.newBuilder(environment_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && environment_ != null
+            && environment_
+                != com.google.cloud.dialogflow.v2beta1.Environment.getDefaultInstance()) {
+          getEnvironmentBuilder().mergeFrom(value);
         } else {
           environment_ = value;
         }
-        onChanged();
       } else {
         environmentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -880,14 +899,13 @@ public Builder mergeEnvironment(com.google.cloud.dialogflow.v2beta1.Environment
      * </code>
      */
     public Builder clearEnvironment() {
-      if (environmentBuilder_ == null) {
-        environment_ = null;
-        onChanged();
-      } else {
-        environment_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      environment_ = null;
+      if (environmentBuilder_ != null) {
+        environmentBuilder_.dispose();
         environmentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -902,7 +920,7 @@ public Builder clearEnvironment() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Environment.Builder getEnvironmentBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getEnvironmentFieldBuilder().getBuilder();
     }
@@ -1015,8 +1033,8 @@ public Builder setEnvironmentId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       environmentId_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1032,8 +1050,8 @@ public Builder setEnvironmentId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearEnvironmentId() {
-
       environmentId_ = getDefaultInstance().getEnvironmentId();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1054,8 +1072,8 @@ public Builder setEnvironmentIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       environmentId_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateIntentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateIntentRequest.java
index 4da05d6c8fe4..9f9cb42e3490 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateIntentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateIntentRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -179,11 +181,15 @@ public com.google.cloud.dialogflow.v2beta1.Intent getIntent() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.IntentOrBuilder getIntentOrBuilder() {
-    return getIntent();
+    return intent_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Intent.getDefaultInstance()
+        : intent_;
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -240,7 +246,7 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
   }
 
   public static final int INTENT_VIEW_FIELD_NUMBER = 4;
-  private int intentView_;
+  private int intentView_ = 0;
   /**
    *
    *
@@ -269,9 +275,8 @@ public int getIntentViewValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.IntentView getIntentView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.IntentView result =
-        com.google.cloud.dialogflow.v2beta1.IntentView.valueOf(intentView_);
+        com.google.cloud.dialogflow.v2beta1.IntentView.forNumber(intentView_);
     return result == null ? com.google.cloud.dialogflow.v2beta1.IntentView.UNRECOGNIZED : result;
   }
 
@@ -507,18 +512,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (intentBuilder_ == null) {
-        intent_ = null;
-      } else {
-        intent_ = null;
+      intent_ = null;
+      if (intentBuilder_ != null) {
+        intentBuilder_.dispose();
         intentBuilder_ = null;
       }
       languageCode_ = "";
-
       intentView_ = 0;
-
       return this;
     }
 
@@ -546,18 +548,29 @@ public com.google.cloud.dialogflow.v2beta1.CreateIntentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.CreateIntentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.CreateIntentRequest result =
           new com.google.cloud.dialogflow.v2beta1.CreateIntentRequest(this);
-      result.parent_ = parent_;
-      if (intentBuilder_ == null) {
-        result.intent_ = intent_;
-      } else {
-        result.intent_ = intentBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.languageCode_ = languageCode_;
-      result.intentView_ = intentView_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.CreateIntentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.intent_ = intentBuilder_ == null ? intent_ : intentBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.intentView_ = intentView_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -606,6 +619,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.CreateIntentRequest
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasIntent()) {
@@ -613,6 +627,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.CreateIntentRequest
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.intentView_ != 0) {
@@ -647,25 +662,25 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getIntentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 32:
               {
                 intentView_ = input.readEnum();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 32
             default:
@@ -685,6 +700,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -761,8 +778,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -783,8 +800,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -810,8 +827,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -836,7 +853,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the intent field is set.
      */
     public boolean hasIntent() {
-      return intentBuilder_ != null || intent_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -877,11 +894,11 @@ public Builder setIntent(com.google.cloud.dialogflow.v2beta1.Intent value) {
           throw new NullPointerException();
         }
         intent_ = value;
-        onChanged();
       } else {
         intentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -898,11 +915,11 @@ public Builder setIntent(com.google.cloud.dialogflow.v2beta1.Intent value) {
     public Builder setIntent(com.google.cloud.dialogflow.v2beta1.Intent.Builder builderForValue) {
       if (intentBuilder_ == null) {
         intent_ = builderForValue.build();
-        onChanged();
       } else {
         intentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -918,19 +935,18 @@ public Builder setIntent(com.google.cloud.dialogflow.v2beta1.Intent.Builder buil
      */
     public Builder mergeIntent(com.google.cloud.dialogflow.v2beta1.Intent value) {
       if (intentBuilder_ == null) {
-        if (intent_ != null) {
-          intent_ =
-              com.google.cloud.dialogflow.v2beta1.Intent.newBuilder(intent_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && intent_ != null
+            && intent_ != com.google.cloud.dialogflow.v2beta1.Intent.getDefaultInstance()) {
+          getIntentBuilder().mergeFrom(value);
         } else {
           intent_ = value;
         }
-        onChanged();
       } else {
         intentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -945,14 +961,13 @@ public Builder mergeIntent(com.google.cloud.dialogflow.v2beta1.Intent value) {
      * </code>
      */
     public Builder clearIntent() {
-      if (intentBuilder_ == null) {
-        intent_ = null;
-        onChanged();
-      } else {
-        intent_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      intent_ = null;
+      if (intentBuilder_ != null) {
+        intentBuilder_.dispose();
         intentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -967,7 +982,7 @@ public Builder clearIntent() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Intent.Builder getIntentBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getIntentFieldBuilder().getBuilder();
     }
@@ -1092,8 +1107,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1113,8 +1128,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1139,8 +1154,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1174,8 +1189,8 @@ public int getIntentViewValue() {
      * @return This builder for chaining.
      */
     public Builder setIntentViewValue(int value) {
-
       intentView_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1192,9 +1207,8 @@ public Builder setIntentViewValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.IntentView getIntentView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.IntentView result =
-          com.google.cloud.dialogflow.v2beta1.IntentView.valueOf(intentView_);
+          com.google.cloud.dialogflow.v2beta1.IntentView.forNumber(intentView_);
       return result == null ? com.google.cloud.dialogflow.v2beta1.IntentView.UNRECOGNIZED : result;
     }
     /**
@@ -1213,7 +1227,7 @@ public Builder setIntentView(com.google.cloud.dialogflow.v2beta1.IntentView valu
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000008;
       intentView_ = value.getNumber();
       onChanged();
       return this;
@@ -1230,7 +1244,7 @@ public Builder setIntentView(com.google.cloud.dialogflow.v2beta1.IntentView valu
      * @return This builder for chaining.
      */
     public Builder clearIntentView() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       intentView_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateKnowledgeBaseRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateKnowledgeBaseRequest.java
index 611644981145..f4029642e271 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateKnowledgeBaseRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateKnowledgeBaseRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -173,7 +175,9 @@ public com.google.cloud.dialogflow.v2beta1.KnowledgeBase getKnowledgeBase() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.KnowledgeBaseOrBuilder getKnowledgeBaseOrBuilder() {
-    return getKnowledgeBase();
+    return knowledgeBase_ == null
+        ? com.google.cloud.dialogflow.v2beta1.KnowledgeBase.getDefaultInstance()
+        : knowledgeBase_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -388,12 +392,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (knowledgeBaseBuilder_ == null) {
-        knowledgeBase_ = null;
-      } else {
-        knowledgeBase_ = null;
+      knowledgeBase_ = null;
+      if (knowledgeBaseBuilder_ != null) {
+        knowledgeBaseBuilder_.dispose();
         knowledgeBaseBuilder_ = null;
       }
       return this;
@@ -424,16 +427,25 @@ public com.google.cloud.dialogflow.v2beta1.CreateKnowledgeBaseRequest build() {
     public com.google.cloud.dialogflow.v2beta1.CreateKnowledgeBaseRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.CreateKnowledgeBaseRequest result =
           new com.google.cloud.dialogflow.v2beta1.CreateKnowledgeBaseRequest(this);
-      result.parent_ = parent_;
-      if (knowledgeBaseBuilder_ == null) {
-        result.knowledgeBase_ = knowledgeBase_;
-      } else {
-        result.knowledgeBase_ = knowledgeBaseBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.CreateKnowledgeBaseRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.knowledgeBase_ =
+            knowledgeBaseBuilder_ == null ? knowledgeBase_ : knowledgeBaseBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -483,6 +495,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.CreateKnowledgeBase
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasKnowledgeBase()) {
@@ -517,13 +530,13 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getKnowledgeBaseFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -543,6 +556,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -613,8 +628,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -633,8 +648,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -658,8 +673,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -684,7 +699,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the knowledgeBase field is set.
      */
     public boolean hasKnowledgeBase() {
-      return knowledgeBaseBuilder_ != null || knowledgeBase_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -725,11 +740,11 @@ public Builder setKnowledgeBase(com.google.cloud.dialogflow.v2beta1.KnowledgeBas
           throw new NullPointerException();
         }
         knowledgeBase_ = value;
-        onChanged();
       } else {
         knowledgeBaseBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -747,11 +762,11 @@ public Builder setKnowledgeBase(
         com.google.cloud.dialogflow.v2beta1.KnowledgeBase.Builder builderForValue) {
       if (knowledgeBaseBuilder_ == null) {
         knowledgeBase_ = builderForValue.build();
-        onChanged();
       } else {
         knowledgeBaseBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -767,19 +782,19 @@ public Builder setKnowledgeBase(
      */
     public Builder mergeKnowledgeBase(com.google.cloud.dialogflow.v2beta1.KnowledgeBase value) {
       if (knowledgeBaseBuilder_ == null) {
-        if (knowledgeBase_ != null) {
-          knowledgeBase_ =
-              com.google.cloud.dialogflow.v2beta1.KnowledgeBase.newBuilder(knowledgeBase_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && knowledgeBase_ != null
+            && knowledgeBase_
+                != com.google.cloud.dialogflow.v2beta1.KnowledgeBase.getDefaultInstance()) {
+          getKnowledgeBaseBuilder().mergeFrom(value);
         } else {
           knowledgeBase_ = value;
         }
-        onChanged();
       } else {
         knowledgeBaseBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -794,14 +809,13 @@ public Builder mergeKnowledgeBase(com.google.cloud.dialogflow.v2beta1.KnowledgeB
      * </code>
      */
     public Builder clearKnowledgeBase() {
-      if (knowledgeBaseBuilder_ == null) {
-        knowledgeBase_ = null;
-        onChanged();
-      } else {
-        knowledgeBase_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      knowledgeBase_ = null;
+      if (knowledgeBaseBuilder_ != null) {
+        knowledgeBaseBuilder_.dispose();
         knowledgeBaseBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -816,7 +830,7 @@ public Builder clearKnowledgeBase() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.KnowledgeBase.Builder getKnowledgeBaseBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getKnowledgeBaseFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateMessageRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateMessageRequest.java
index 4c74101fae04..c0abcb1a978b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateMessageRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateMessageRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -179,7 +181,9 @@ public com.google.cloud.dialogflow.v2beta1.Message getMessage() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.MessageOrBuilder getMessageOrBuilder() {
-    return getMessage();
+    return message_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Message.getDefaultInstance()
+        : message_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -395,12 +399,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (messageBuilder_ == null) {
-        message_ = null;
-      } else {
-        message_ = null;
+      message_ = null;
+      if (messageBuilder_ != null) {
+        messageBuilder_.dispose();
         messageBuilder_ = null;
       }
       return this;
@@ -430,16 +433,23 @@ public com.google.cloud.dialogflow.v2beta1.CreateMessageRequest build() {
     public com.google.cloud.dialogflow.v2beta1.CreateMessageRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.CreateMessageRequest result =
           new com.google.cloud.dialogflow.v2beta1.CreateMessageRequest(this);
-      result.parent_ = parent_;
-      if (messageBuilder_ == null) {
-        result.message_ = message_;
-      } else {
-        result.message_ = messageBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.CreateMessageRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.message_ = messageBuilder_ == null ? message_ : messageBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -488,6 +498,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.CreateMessageReques
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasMessage()) {
@@ -522,13 +533,13 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getMessageFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -548,6 +559,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -621,8 +634,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -642,8 +655,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -668,8 +681,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -695,7 +708,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the message field is set.
      */
     public boolean hasMessage() {
-      return messageBuilder_ != null || message_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -738,11 +751,11 @@ public Builder setMessage(com.google.cloud.dialogflow.v2beta1.Message value) {
           throw new NullPointerException();
         }
         message_ = value;
-        onChanged();
       } else {
         messageBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -760,11 +773,11 @@ public Builder setMessage(com.google.cloud.dialogflow.v2beta1.Message value) {
     public Builder setMessage(com.google.cloud.dialogflow.v2beta1.Message.Builder builderForValue) {
       if (messageBuilder_ == null) {
         message_ = builderForValue.build();
-        onChanged();
       } else {
         messageBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -781,19 +794,18 @@ public Builder setMessage(com.google.cloud.dialogflow.v2beta1.Message.Builder bu
      */
     public Builder mergeMessage(com.google.cloud.dialogflow.v2beta1.Message value) {
       if (messageBuilder_ == null) {
-        if (message_ != null) {
-          message_ =
-              com.google.cloud.dialogflow.v2beta1.Message.newBuilder(message_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && message_ != null
+            && message_ != com.google.cloud.dialogflow.v2beta1.Message.getDefaultInstance()) {
+          getMessageBuilder().mergeFrom(value);
         } else {
           message_ = value;
         }
-        onChanged();
       } else {
         messageBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -809,14 +821,13 @@ public Builder mergeMessage(com.google.cloud.dialogflow.v2beta1.Message value) {
      * </code>
      */
     public Builder clearMessage() {
-      if (messageBuilder_ == null) {
-        message_ = null;
-        onChanged();
-      } else {
-        message_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      message_ = null;
+      if (messageBuilder_ != null) {
+        messageBuilder_.dispose();
         messageBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -832,7 +843,7 @@ public Builder clearMessage() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Message.Builder getMessageBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getMessageFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateParticipantRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateParticipantRequest.java
index be42f8c6db5f..1faf0e59d017 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateParticipantRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateParticipantRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -175,7 +177,9 @@ public com.google.cloud.dialogflow.v2beta1.Participant getParticipant() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.ParticipantOrBuilder getParticipantOrBuilder() {
-    return getParticipant();
+    return participant_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Participant.getDefaultInstance()
+        : participant_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -390,12 +394,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (participantBuilder_ == null) {
-        participant_ = null;
-      } else {
-        participant_ = null;
+      participant_ = null;
+      if (participantBuilder_ != null) {
+        participantBuilder_.dispose();
         participantBuilder_ = null;
       }
       return this;
@@ -426,16 +429,25 @@ public com.google.cloud.dialogflow.v2beta1.CreateParticipantRequest build() {
     public com.google.cloud.dialogflow.v2beta1.CreateParticipantRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.CreateParticipantRequest result =
           new com.google.cloud.dialogflow.v2beta1.CreateParticipantRequest(this);
-      result.parent_ = parent_;
-      if (participantBuilder_ == null) {
-        result.participant_ = participant_;
-      } else {
-        result.participant_ = participantBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.CreateParticipantRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.participant_ =
+            participantBuilder_ == null ? participant_ : participantBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -485,6 +497,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.CreateParticipantRe
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasParticipant()) {
@@ -519,13 +532,13 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getParticipantFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -545,6 +558,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -618,8 +633,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -639,8 +654,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -665,8 +680,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -691,7 +706,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the participant field is set.
      */
     public boolean hasParticipant() {
-      return participantBuilder_ != null || participant_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -732,11 +747,11 @@ public Builder setParticipant(com.google.cloud.dialogflow.v2beta1.Participant va
           throw new NullPointerException();
         }
         participant_ = value;
-        onChanged();
       } else {
         participantBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -754,11 +769,11 @@ public Builder setParticipant(
         com.google.cloud.dialogflow.v2beta1.Participant.Builder builderForValue) {
       if (participantBuilder_ == null) {
         participant_ = builderForValue.build();
-        onChanged();
       } else {
         participantBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -774,19 +789,19 @@ public Builder setParticipant(
      */
     public Builder mergeParticipant(com.google.cloud.dialogflow.v2beta1.Participant value) {
       if (participantBuilder_ == null) {
-        if (participant_ != null) {
-          participant_ =
-              com.google.cloud.dialogflow.v2beta1.Participant.newBuilder(participant_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && participant_ != null
+            && participant_
+                != com.google.cloud.dialogflow.v2beta1.Participant.getDefaultInstance()) {
+          getParticipantBuilder().mergeFrom(value);
         } else {
           participant_ = value;
         }
-        onChanged();
       } else {
         participantBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -801,14 +816,13 @@ public Builder mergeParticipant(com.google.cloud.dialogflow.v2beta1.Participant
      * </code>
      */
     public Builder clearParticipant() {
-      if (participantBuilder_ == null) {
-        participant_ = null;
-        onChanged();
-      } else {
-        participant_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      participant_ = null;
+      if (participantBuilder_ != null) {
+        participantBuilder_.dispose();
         participantBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -823,7 +837,7 @@ public Builder clearParticipant() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Participant.Builder getParticipantBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getParticipantFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateSessionEntityTypeRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateSessionEntityTypeRequest.java
index bee64d27ee53..d91e139e7fca 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateSessionEntityTypeRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateSessionEntityTypeRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -197,7 +199,9 @@ public com.google.cloud.dialogflow.v2beta1.SessionEntityType getSessionEntityTyp
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.SessionEntityTypeOrBuilder
       getSessionEntityTypeOrBuilder() {
-    return getSessionEntityType();
+    return sessionEntityType_ == null
+        ? com.google.cloud.dialogflow.v2beta1.SessionEntityType.getDefaultInstance()
+        : sessionEntityType_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -414,12 +418,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (sessionEntityTypeBuilder_ == null) {
-        sessionEntityType_ = null;
-      } else {
-        sessionEntityType_ = null;
+      sessionEntityType_ = null;
+      if (sessionEntityTypeBuilder_ != null) {
+        sessionEntityTypeBuilder_.dispose();
         sessionEntityTypeBuilder_ = null;
       }
       return this;
@@ -451,16 +454,27 @@ public com.google.cloud.dialogflow.v2beta1.CreateSessionEntityTypeRequest build(
     public com.google.cloud.dialogflow.v2beta1.CreateSessionEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.CreateSessionEntityTypeRequest result =
           new com.google.cloud.dialogflow.v2beta1.CreateSessionEntityTypeRequest(this);
-      result.parent_ = parent_;
-      if (sessionEntityTypeBuilder_ == null) {
-        result.sessionEntityType_ = sessionEntityType_;
-      } else {
-        result.sessionEntityType_ = sessionEntityTypeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.CreateSessionEntityTypeRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.sessionEntityType_ =
+            sessionEntityTypeBuilder_ == null
+                ? sessionEntityType_
+                : sessionEntityTypeBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -512,6 +526,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasSessionEntityType()) {
@@ -546,14 +561,14 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(
                     getSessionEntityTypeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -573,6 +588,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -676,8 +693,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -707,8 +724,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -743,8 +760,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -769,7 +786,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the sessionEntityType field is set.
      */
     public boolean hasSessionEntityType() {
-      return sessionEntityTypeBuilder_ != null || sessionEntityType_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -811,11 +828,11 @@ public Builder setSessionEntityType(
           throw new NullPointerException();
         }
         sessionEntityType_ = value;
-        onChanged();
       } else {
         sessionEntityTypeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -833,11 +850,11 @@ public Builder setSessionEntityType(
         com.google.cloud.dialogflow.v2beta1.SessionEntityType.Builder builderForValue) {
       if (sessionEntityTypeBuilder_ == null) {
         sessionEntityType_ = builderForValue.build();
-        onChanged();
       } else {
         sessionEntityTypeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -854,19 +871,19 @@ public Builder setSessionEntityType(
     public Builder mergeSessionEntityType(
         com.google.cloud.dialogflow.v2beta1.SessionEntityType value) {
       if (sessionEntityTypeBuilder_ == null) {
-        if (sessionEntityType_ != null) {
-          sessionEntityType_ =
-              com.google.cloud.dialogflow.v2beta1.SessionEntityType.newBuilder(sessionEntityType_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && sessionEntityType_ != null
+            && sessionEntityType_
+                != com.google.cloud.dialogflow.v2beta1.SessionEntityType.getDefaultInstance()) {
+          getSessionEntityTypeBuilder().mergeFrom(value);
         } else {
           sessionEntityType_ = value;
         }
-        onChanged();
       } else {
         sessionEntityTypeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -881,14 +898,13 @@ public Builder mergeSessionEntityType(
      * </code>
      */
     public Builder clearSessionEntityType() {
-      if (sessionEntityTypeBuilder_ == null) {
-        sessionEntityType_ = null;
-        onChanged();
-      } else {
-        sessionEntityType_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      sessionEntityType_ = null;
+      if (sessionEntityTypeBuilder_ != null) {
+        sessionEntityTypeBuilder_.dispose();
         sessionEntityTypeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -904,7 +920,7 @@ public Builder clearSessionEntityType() {
      */
     public com.google.cloud.dialogflow.v2beta1.SessionEntityType.Builder
         getSessionEntityTypeBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getSessionEntityTypeFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateVersionRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateVersionRequest.java
index 6033e0b097d6..887beb2b7052 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateVersionRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateVersionRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -177,7 +179,9 @@ public com.google.cloud.dialogflow.v2beta1.Version getVersion() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.VersionOrBuilder getVersionOrBuilder() {
-    return getVersion();
+    return version_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Version.getDefaultInstance()
+        : version_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -392,12 +396,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (versionBuilder_ == null) {
-        version_ = null;
-      } else {
-        version_ = null;
+      version_ = null;
+      if (versionBuilder_ != null) {
+        versionBuilder_.dispose();
         versionBuilder_ = null;
       }
       return this;
@@ -427,16 +430,23 @@ public com.google.cloud.dialogflow.v2beta1.CreateVersionRequest build() {
     public com.google.cloud.dialogflow.v2beta1.CreateVersionRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.CreateVersionRequest result =
           new com.google.cloud.dialogflow.v2beta1.CreateVersionRequest(this);
-      result.parent_ = parent_;
-      if (versionBuilder_ == null) {
-        result.version_ = version_;
-      } else {
-        result.version_ = versionBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.CreateVersionRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.version_ = versionBuilder_ == null ? version_ : versionBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -485,6 +495,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.CreateVersionReques
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasVersion()) {
@@ -519,13 +530,13 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getVersionFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -545,6 +556,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -621,8 +634,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -643,8 +656,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -670,8 +683,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -696,7 +709,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the version field is set.
      */
     public boolean hasVersion() {
-      return versionBuilder_ != null || version_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -737,11 +750,11 @@ public Builder setVersion(com.google.cloud.dialogflow.v2beta1.Version value) {
           throw new NullPointerException();
         }
         version_ = value;
-        onChanged();
       } else {
         versionBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -758,11 +771,11 @@ public Builder setVersion(com.google.cloud.dialogflow.v2beta1.Version value) {
     public Builder setVersion(com.google.cloud.dialogflow.v2beta1.Version.Builder builderForValue) {
       if (versionBuilder_ == null) {
         version_ = builderForValue.build();
-        onChanged();
       } else {
         versionBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -778,19 +791,18 @@ public Builder setVersion(com.google.cloud.dialogflow.v2beta1.Version.Builder bu
      */
     public Builder mergeVersion(com.google.cloud.dialogflow.v2beta1.Version value) {
       if (versionBuilder_ == null) {
-        if (version_ != null) {
-          version_ =
-              com.google.cloud.dialogflow.v2beta1.Version.newBuilder(version_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && version_ != null
+            && version_ != com.google.cloud.dialogflow.v2beta1.Version.getDefaultInstance()) {
+          getVersionBuilder().mergeFrom(value);
         } else {
           version_ = value;
         }
-        onChanged();
       } else {
         versionBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -805,14 +817,13 @@ public Builder mergeVersion(com.google.cloud.dialogflow.v2beta1.Version value) {
      * </code>
      */
     public Builder clearVersion() {
-      if (versionBuilder_ == null) {
-        version_ = null;
-        onChanged();
-      } else {
-        version_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      version_ = null;
+      if (versionBuilder_ != null) {
+        versionBuilder_.dispose();
         versionBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -827,7 +838,7 @@ public Builder clearVersion() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Version.Builder getVersionBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getVersionFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteAgentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteAgentRequest.java
index 5cd6756c3985..cb05bf657fcb 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteAgentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteAgentRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -322,8 +324,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       return this;
     }
 
@@ -351,11 +353,20 @@ public com.google.cloud.dialogflow.v2beta1.DeleteAgentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.DeleteAgentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.DeleteAgentRequest result =
           new com.google.cloud.dialogflow.v2beta1.DeleteAgentRequest(this);
-      result.parent_ = parent_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.DeleteAgentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -404,6 +415,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.DeleteAgentRequest
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -435,7 +447,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -455,6 +467,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -528,8 +542,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -549,8 +563,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -575,8 +589,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteAllContextsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteAllContextsRequest.java
index 967c8edec5f4..1b1e5180e47b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteAllContextsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteAllContextsRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -340,8 +342,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       return this;
     }
 
@@ -370,11 +372,21 @@ public com.google.cloud.dialogflow.v2beta1.DeleteAllContextsRequest build() {
     public com.google.cloud.dialogflow.v2beta1.DeleteAllContextsRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.DeleteAllContextsRequest result =
           new com.google.cloud.dialogflow.v2beta1.DeleteAllContextsRequest(this);
-      result.parent_ = parent_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.DeleteAllContextsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -424,6 +436,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.DeleteAllContextsRe
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -455,7 +468,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -475,6 +488,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -575,8 +590,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -605,8 +620,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -640,8 +655,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteContextRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteContextRequest.java
index 5c15dea384aa..292e6a8625f1 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteContextRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteContextRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -342,8 +344,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -371,11 +373,20 @@ public com.google.cloud.dialogflow.v2beta1.DeleteContextRequest build() {
     public com.google.cloud.dialogflow.v2beta1.DeleteContextRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.DeleteContextRequest result =
           new com.google.cloud.dialogflow.v2beta1.DeleteContextRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.DeleteContextRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -424,6 +435,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.DeleteContextReques
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -455,7 +467,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -475,6 +487,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -578,8 +592,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -609,8 +623,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -645,8 +659,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteConversationProfileRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteConversationProfileRequest.java
index 75e19538731f..551a00478fc2 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteConversationProfileRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteConversationProfileRequest.java
@@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -329,8 +331,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -360,11 +362,21 @@ public com.google.cloud.dialogflow.v2beta1.DeleteConversationProfileRequest buil
     public com.google.cloud.dialogflow.v2beta1.DeleteConversationProfileRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.DeleteConversationProfileRequest result =
           new com.google.cloud.dialogflow.v2beta1.DeleteConversationProfileRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.DeleteConversationProfileRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -416,6 +428,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -447,7 +460,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -467,6 +480,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -540,8 +555,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -561,8 +576,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -587,8 +602,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteDocumentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteDocumentRequest.java
index d194d4b447ed..fe3f885f1d69 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteDocumentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteDocumentRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -322,8 +324,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -351,11 +353,20 @@ public com.google.cloud.dialogflow.v2beta1.DeleteDocumentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.DeleteDocumentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.DeleteDocumentRequest result =
           new com.google.cloud.dialogflow.v2beta1.DeleteDocumentRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.DeleteDocumentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -404,6 +415,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.DeleteDocumentReque
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -435,7 +447,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -455,6 +467,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -528,8 +542,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -549,8 +563,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -575,8 +589,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteEntityTypeRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteEntityTypeRequest.java
index c3449668c41f..a67feb94466a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteEntityTypeRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteEntityTypeRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -326,8 +328,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -355,11 +357,20 @@ public com.google.cloud.dialogflow.v2beta1.DeleteEntityTypeRequest build() {
     public com.google.cloud.dialogflow.v2beta1.DeleteEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.DeleteEntityTypeRequest result =
           new com.google.cloud.dialogflow.v2beta1.DeleteEntityTypeRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.DeleteEntityTypeRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -408,6 +419,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.DeleteEntityTypeReq
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -439,7 +451,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -459,6 +471,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -538,8 +552,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -561,8 +575,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -589,8 +603,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteEnvironmentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteEnvironmentRequest.java
index 054add8af283..922f65174d1c 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteEnvironmentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteEnvironmentRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -326,8 +328,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -356,11 +358,21 @@ public com.google.cloud.dialogflow.v2beta1.DeleteEnvironmentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.DeleteEnvironmentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.DeleteEnvironmentRequest result =
           new com.google.cloud.dialogflow.v2beta1.DeleteEnvironmentRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.DeleteEnvironmentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -410,6 +422,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.DeleteEnvironmentRe
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -441,7 +454,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -461,6 +474,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -540,8 +555,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -563,8 +578,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -591,8 +606,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteIntentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteIntentRequest.java
index 44af543c9344..f42957c04909 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteIntentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteIntentRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -326,8 +328,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -355,11 +357,20 @@ public com.google.cloud.dialogflow.v2beta1.DeleteIntentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.DeleteIntentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.DeleteIntentRequest result =
           new com.google.cloud.dialogflow.v2beta1.DeleteIntentRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.DeleteIntentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -408,6 +419,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.DeleteIntentRequest
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -439,7 +451,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -459,6 +471,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -538,8 +552,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -561,8 +575,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -589,8 +603,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteKnowledgeBaseRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteKnowledgeBaseRequest.java
index 04319604d1aa..17d9cdf4c0ac 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteKnowledgeBaseRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteKnowledgeBaseRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -125,7 +127,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int FORCE_FIELD_NUMBER = 2;
-  private boolean force_;
+  private boolean force_ = false;
   /**
    *
    *
@@ -350,10 +352,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       force_ = false;
-
       return this;
     }
 
@@ -382,12 +383,24 @@ public com.google.cloud.dialogflow.v2beta1.DeleteKnowledgeBaseRequest build() {
     public com.google.cloud.dialogflow.v2beta1.DeleteKnowledgeBaseRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.DeleteKnowledgeBaseRequest result =
           new com.google.cloud.dialogflow.v2beta1.DeleteKnowledgeBaseRequest(this);
-      result.name_ = name_;
-      result.force_ = force_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.DeleteKnowledgeBaseRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.force_ = force_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -437,6 +450,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.DeleteKnowledgeBase
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getForce() != false) {
@@ -471,13 +485,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 force_ = input.readBool();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             default:
@@ -497,6 +511,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -570,8 +586,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -591,8 +607,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -617,8 +633,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -656,6 +672,7 @@ public boolean getForce() {
     public Builder setForce(boolean value) {
 
       force_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -672,7 +689,7 @@ public Builder setForce(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearForce() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       force_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteSessionEntityTypeRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteSessionEntityTypeRequest.java
index a0af11bd1a17..ccc8f7a58239 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteSessionEntityTypeRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteSessionEntityTypeRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -347,8 +349,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -378,11 +380,21 @@ public com.google.cloud.dialogflow.v2beta1.DeleteSessionEntityTypeRequest build(
     public com.google.cloud.dialogflow.v2beta1.DeleteSessionEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.DeleteSessionEntityTypeRequest result =
           new com.google.cloud.dialogflow.v2beta1.DeleteSessionEntityTypeRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.DeleteSessionEntityTypeRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -434,6 +446,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -465,7 +478,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -485,6 +498,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -591,8 +606,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -623,8 +638,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -660,8 +675,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteVersionRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteVersionRequest.java
index 6d5fef4ac3cb..73fdf62cac4f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteVersionRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteVersionRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -326,8 +328,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -355,11 +357,20 @@ public com.google.cloud.dialogflow.v2beta1.DeleteVersionRequest build() {
     public com.google.cloud.dialogflow.v2beta1.DeleteVersionRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.DeleteVersionRequest result =
           new com.google.cloud.dialogflow.v2beta1.DeleteVersionRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.DeleteVersionRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -408,6 +419,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.DeleteVersionReques
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -439,7 +451,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -459,6 +471,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -538,8 +552,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -561,8 +575,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -589,8 +603,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequest.java
index 1ec3f50d283a..53694588d6a7 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SESSION_FIELD_NUMBER = 1;
-  private volatile java.lang.Object session_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object session_ = "";
   /**
    *
    *
@@ -206,7 +208,9 @@ public com.google.cloud.dialogflow.v2beta1.QueryParameters getQueryParams() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.QueryParametersOrBuilder getQueryParamsOrBuilder() {
-    return getQueryParams();
+    return queryParams_ == null
+        ? com.google.cloud.dialogflow.v2beta1.QueryParameters.getDefaultInstance()
+        : queryParams_;
   }
 
   public static final int QUERY_INPUT_FIELD_NUMBER = 3;
@@ -272,7 +276,9 @@ public com.google.cloud.dialogflow.v2beta1.QueryInput getQueryInput() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.QueryInputOrBuilder getQueryInputOrBuilder() {
-    return getQueryInput();
+    return queryInput_ == null
+        ? com.google.cloud.dialogflow.v2beta1.QueryInput.getDefaultInstance()
+        : queryInput_;
   }
 
   public static final int OUTPUT_AUDIO_CONFIG_FIELD_NUMBER = 4;
@@ -327,7 +333,9 @@ public com.google.cloud.dialogflow.v2beta1.OutputAudioConfig getOutputAudioConfi
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.OutputAudioConfigOrBuilder
       getOutputAudioConfigOrBuilder() {
-    return getOutputAudioConfig();
+    return outputAudioConfig_ == null
+        ? com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.getDefaultInstance()
+        : outputAudioConfig_;
   }
 
   public static final int OUTPUT_AUDIO_CONFIG_MASK_FIELD_NUMBER = 7;
@@ -387,11 +395,13 @@ public com.google.protobuf.FieldMask getOutputAudioConfigMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getOutputAudioConfigMaskOrBuilder() {
-    return getOutputAudioConfigMask();
+    return outputAudioConfigMask_ == null
+        ? com.google.protobuf.FieldMask.getDefaultInstance()
+        : outputAudioConfigMask_;
   }
 
   public static final int INPUT_AUDIO_FIELD_NUMBER = 5;
-  private com.google.protobuf.ByteString inputAudio_;
+  private com.google.protobuf.ByteString inputAudio_ = com.google.protobuf.ByteString.EMPTY;
   /**
    *
    *
@@ -674,34 +684,29 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       session_ = "";
-
-      if (queryParamsBuilder_ == null) {
-        queryParams_ = null;
-      } else {
-        queryParams_ = null;
+      queryParams_ = null;
+      if (queryParamsBuilder_ != null) {
+        queryParamsBuilder_.dispose();
         queryParamsBuilder_ = null;
       }
-      if (queryInputBuilder_ == null) {
-        queryInput_ = null;
-      } else {
-        queryInput_ = null;
+      queryInput_ = null;
+      if (queryInputBuilder_ != null) {
+        queryInputBuilder_.dispose();
         queryInputBuilder_ = null;
       }
-      if (outputAudioConfigBuilder_ == null) {
-        outputAudioConfig_ = null;
-      } else {
-        outputAudioConfig_ = null;
+      outputAudioConfig_ = null;
+      if (outputAudioConfigBuilder_ != null) {
+        outputAudioConfigBuilder_.dispose();
         outputAudioConfigBuilder_ = null;
       }
-      if (outputAudioConfigMaskBuilder_ == null) {
-        outputAudioConfigMask_ = null;
-      } else {
-        outputAudioConfigMask_ = null;
+      outputAudioConfigMask_ = null;
+      if (outputAudioConfigMaskBuilder_ != null) {
+        outputAudioConfigMaskBuilder_.dispose();
         outputAudioConfigMaskBuilder_ = null;
       }
       inputAudio_ = com.google.protobuf.ByteString.EMPTY;
-
       return this;
     }
 
@@ -729,30 +734,40 @@ public com.google.cloud.dialogflow.v2beta1.DetectIntentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.DetectIntentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.DetectIntentRequest result =
           new com.google.cloud.dialogflow.v2beta1.DetectIntentRequest(this);
-      result.session_ = session_;
-      if (queryParamsBuilder_ == null) {
-        result.queryParams_ = queryParams_;
-      } else {
-        result.queryParams_ = queryParamsBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (queryInputBuilder_ == null) {
-        result.queryInput_ = queryInput_;
-      } else {
-        result.queryInput_ = queryInputBuilder_.build();
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.DetectIntentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.session_ = session_;
       }
-      if (outputAudioConfigBuilder_ == null) {
-        result.outputAudioConfig_ = outputAudioConfig_;
-      } else {
-        result.outputAudioConfig_ = outputAudioConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.queryParams_ =
+            queryParamsBuilder_ == null ? queryParams_ : queryParamsBuilder_.build();
       }
-      if (outputAudioConfigMaskBuilder_ == null) {
-        result.outputAudioConfigMask_ = outputAudioConfigMask_;
-      } else {
-        result.outputAudioConfigMask_ = outputAudioConfigMaskBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.queryInput_ = queryInputBuilder_ == null ? queryInput_ : queryInputBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.outputAudioConfig_ =
+            outputAudioConfigBuilder_ == null
+                ? outputAudioConfig_
+                : outputAudioConfigBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.outputAudioConfigMask_ =
+            outputAudioConfigMaskBuilder_ == null
+                ? outputAudioConfigMask_
+                : outputAudioConfigMaskBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.inputAudio_ = inputAudio_;
       }
-      result.inputAudio_ = inputAudio_;
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -803,6 +818,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.DetectIntentRequest
         return this;
       if (!other.getSession().isEmpty()) {
         session_ = other.session_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasQueryParams()) {
@@ -849,39 +865,39 @@ public Builder mergeFrom(
             case 10:
               {
                 session_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getQueryParamsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getQueryInputFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(
                     getOutputAudioConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 42:
               {
                 inputAudio_ = input.readBytes();
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 42
             case 58:
               {
                 input.readMessage(
                     getOutputAudioConfigMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 58
             default:
@@ -901,6 +917,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object session_ = "";
     /**
      *
@@ -1028,8 +1046,8 @@ public Builder setSession(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       session_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1067,8 +1085,8 @@ public Builder setSession(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSession() {
-
       session_ = getDefaultInstance().getSession();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1111,8 +1129,8 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       session_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1135,7 +1153,7 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
      * @return Whether the queryParams field is set.
      */
     public boolean hasQueryParams() {
-      return queryParamsBuilder_ != null || queryParams_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -1172,11 +1190,11 @@ public Builder setQueryParams(com.google.cloud.dialogflow.v2beta1.QueryParameter
           throw new NullPointerException();
         }
         queryParams_ = value;
-        onChanged();
       } else {
         queryParamsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1192,11 +1210,11 @@ public Builder setQueryParams(
         com.google.cloud.dialogflow.v2beta1.QueryParameters.Builder builderForValue) {
       if (queryParamsBuilder_ == null) {
         queryParams_ = builderForValue.build();
-        onChanged();
       } else {
         queryParamsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1210,19 +1228,19 @@ public Builder setQueryParams(
      */
     public Builder mergeQueryParams(com.google.cloud.dialogflow.v2beta1.QueryParameters value) {
       if (queryParamsBuilder_ == null) {
-        if (queryParams_ != null) {
-          queryParams_ =
-              com.google.cloud.dialogflow.v2beta1.QueryParameters.newBuilder(queryParams_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && queryParams_ != null
+            && queryParams_
+                != com.google.cloud.dialogflow.v2beta1.QueryParameters.getDefaultInstance()) {
+          getQueryParamsBuilder().mergeFrom(value);
         } else {
           queryParams_ = value;
         }
-        onChanged();
       } else {
         queryParamsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1235,14 +1253,13 @@ public Builder mergeQueryParams(com.google.cloud.dialogflow.v2beta1.QueryParamet
      * <code>.google.cloud.dialogflow.v2beta1.QueryParameters query_params = 2;</code>
      */
     public Builder clearQueryParams() {
-      if (queryParamsBuilder_ == null) {
-        queryParams_ = null;
-        onChanged();
-      } else {
-        queryParams_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      queryParams_ = null;
+      if (queryParamsBuilder_ != null) {
+        queryParamsBuilder_.dispose();
         queryParamsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1255,7 +1272,7 @@ public Builder clearQueryParams() {
      * <code>.google.cloud.dialogflow.v2beta1.QueryParameters query_params = 2;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.QueryParameters.Builder getQueryParamsBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getQueryParamsFieldBuilder().getBuilder();
     }
@@ -1327,7 +1344,7 @@ public com.google.cloud.dialogflow.v2beta1.QueryParametersOrBuilder getQueryPara
      * @return Whether the queryInput field is set.
      */
     public boolean hasQueryInput() {
-      return queryInputBuilder_ != null || queryInput_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1376,11 +1393,11 @@ public Builder setQueryInput(com.google.cloud.dialogflow.v2beta1.QueryInput valu
           throw new NullPointerException();
         }
         queryInput_ = value;
-        onChanged();
       } else {
         queryInputBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1402,11 +1419,11 @@ public Builder setQueryInput(
         com.google.cloud.dialogflow.v2beta1.QueryInput.Builder builderForValue) {
       if (queryInputBuilder_ == null) {
         queryInput_ = builderForValue.build();
-        onChanged();
       } else {
         queryInputBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1426,19 +1443,18 @@ public Builder setQueryInput(
      */
     public Builder mergeQueryInput(com.google.cloud.dialogflow.v2beta1.QueryInput value) {
       if (queryInputBuilder_ == null) {
-        if (queryInput_ != null) {
-          queryInput_ =
-              com.google.cloud.dialogflow.v2beta1.QueryInput.newBuilder(queryInput_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && queryInput_ != null
+            && queryInput_ != com.google.cloud.dialogflow.v2beta1.QueryInput.getDefaultInstance()) {
+          getQueryInputBuilder().mergeFrom(value);
         } else {
           queryInput_ = value;
         }
-        onChanged();
       } else {
         queryInputBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1457,14 +1473,13 @@ public Builder mergeQueryInput(com.google.cloud.dialogflow.v2beta1.QueryInput va
      * </code>
      */
     public Builder clearQueryInput() {
-      if (queryInputBuilder_ == null) {
-        queryInput_ = null;
-        onChanged();
-      } else {
-        queryInput_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      queryInput_ = null;
+      if (queryInputBuilder_ != null) {
+        queryInputBuilder_.dispose();
         queryInputBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1483,7 +1498,7 @@ public Builder clearQueryInput() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.QueryInput.Builder getQueryInputBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getQueryInputFieldBuilder().getBuilder();
     }
@@ -1563,7 +1578,7 @@ public com.google.cloud.dialogflow.v2beta1.QueryInputOrBuilder getQueryInputOrBu
      * @return Whether the outputAudioConfig field is set.
      */
     public boolean hasOutputAudioConfig() {
-      return outputAudioConfigBuilder_ != null || outputAudioConfig_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1605,11 +1620,11 @@ public Builder setOutputAudioConfig(
           throw new NullPointerException();
         }
         outputAudioConfig_ = value;
-        onChanged();
       } else {
         outputAudioConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1627,11 +1642,11 @@ public Builder setOutputAudioConfig(
         com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.Builder builderForValue) {
       if (outputAudioConfigBuilder_ == null) {
         outputAudioConfig_ = builderForValue.build();
-        onChanged();
       } else {
         outputAudioConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1648,19 +1663,19 @@ public Builder setOutputAudioConfig(
     public Builder mergeOutputAudioConfig(
         com.google.cloud.dialogflow.v2beta1.OutputAudioConfig value) {
       if (outputAudioConfigBuilder_ == null) {
-        if (outputAudioConfig_ != null) {
-          outputAudioConfig_ =
-              com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.newBuilder(outputAudioConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && outputAudioConfig_ != null
+            && outputAudioConfig_
+                != com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.getDefaultInstance()) {
+          getOutputAudioConfigBuilder().mergeFrom(value);
         } else {
           outputAudioConfig_ = value;
         }
-        onChanged();
       } else {
         outputAudioConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1675,14 +1690,13 @@ public Builder mergeOutputAudioConfig(
      * <code>.google.cloud.dialogflow.v2beta1.OutputAudioConfig output_audio_config = 4;</code>
      */
     public Builder clearOutputAudioConfig() {
-      if (outputAudioConfigBuilder_ == null) {
-        outputAudioConfig_ = null;
-        onChanged();
-      } else {
-        outputAudioConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      outputAudioConfig_ = null;
+      if (outputAudioConfigBuilder_ != null) {
+        outputAudioConfigBuilder_.dispose();
         outputAudioConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1698,7 +1712,7 @@ public Builder clearOutputAudioConfig() {
      */
     public com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.Builder
         getOutputAudioConfigBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getOutputAudioConfigFieldBuilder().getBuilder();
     }
@@ -1773,7 +1787,7 @@ public Builder clearOutputAudioConfig() {
      * @return Whether the outputAudioConfigMask field is set.
      */
     public boolean hasOutputAudioConfigMask() {
-      return outputAudioConfigMaskBuilder_ != null || outputAudioConfigMask_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -1818,11 +1832,11 @@ public Builder setOutputAudioConfigMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         outputAudioConfigMask_ = value;
-        onChanged();
       } else {
         outputAudioConfigMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1841,11 +1855,11 @@ public Builder setOutputAudioConfigMask(com.google.protobuf.FieldMask value) {
     public Builder setOutputAudioConfigMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (outputAudioConfigMaskBuilder_ == null) {
         outputAudioConfigMask_ = builderForValue.build();
-        onChanged();
       } else {
         outputAudioConfigMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1863,19 +1877,18 @@ public Builder setOutputAudioConfigMask(com.google.protobuf.FieldMask.Builder bu
      */
     public Builder mergeOutputAudioConfigMask(com.google.protobuf.FieldMask value) {
       if (outputAudioConfigMaskBuilder_ == null) {
-        if (outputAudioConfigMask_ != null) {
-          outputAudioConfigMask_ =
-              com.google.protobuf.FieldMask.newBuilder(outputAudioConfigMask_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && outputAudioConfigMask_ != null
+            && outputAudioConfigMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getOutputAudioConfigMaskBuilder().mergeFrom(value);
         } else {
           outputAudioConfigMask_ = value;
         }
-        onChanged();
       } else {
         outputAudioConfigMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1892,14 +1905,13 @@ public Builder mergeOutputAudioConfigMask(com.google.protobuf.FieldMask value) {
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
      */
     public Builder clearOutputAudioConfigMask() {
-      if (outputAudioConfigMaskBuilder_ == null) {
-        outputAudioConfigMask_ = null;
-        onChanged();
-      } else {
-        outputAudioConfigMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      outputAudioConfigMask_ = null;
+      if (outputAudioConfigMaskBuilder_ != null) {
+        outputAudioConfigMaskBuilder_.dispose();
         outputAudioConfigMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1916,7 +1928,7 @@ public Builder clearOutputAudioConfigMask() {
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
      */
     public com.google.protobuf.FieldMask.Builder getOutputAudioConfigMaskBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getOutputAudioConfigMaskFieldBuilder().getBuilder();
     }
@@ -2008,8 +2020,8 @@ public Builder setInputAudio(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       inputAudio_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2027,7 +2039,7 @@ public Builder setInputAudio(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearInputAudio() {
-
+      bitField0_ = (bitField0_ & ~0x00000020);
       inputAudio_ = getDefaultInstance().getInputAudio();
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentResponse.java
index cad90f76006f..dc2fd5a4ab96 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentResponse.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RESPONSE_ID_FIELD_NUMBER = 1;
-  private volatile java.lang.Object responseId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object responseId_ = "";
   /**
    *
    *
@@ -168,10 +170,14 @@ public com.google.cloud.dialogflow.v2beta1.QueryResult getQueryResult() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.QueryResultOrBuilder getQueryResultOrBuilder() {
-    return getQueryResult();
+    return queryResult_ == null
+        ? com.google.cloud.dialogflow.v2beta1.QueryResult.getDefaultInstance()
+        : queryResult_;
   }
 
   public static final int ALTERNATIVE_QUERY_RESULTS_FIELD_NUMBER = 5;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.QueryResult> alternativeQueryResults_;
   /**
    *
@@ -325,11 +331,11 @@ public com.google.rpc.Status getWebhookStatus() {
    */
   @java.lang.Override
   public com.google.rpc.StatusOrBuilder getWebhookStatusOrBuilder() {
-    return getWebhookStatus();
+    return webhookStatus_ == null ? com.google.rpc.Status.getDefaultInstance() : webhookStatus_;
   }
 
   public static final int OUTPUT_AUDIO_FIELD_NUMBER = 4;
-  private com.google.protobuf.ByteString outputAudio_;
+  private com.google.protobuf.ByteString outputAudio_ = com.google.protobuf.ByteString.EMPTY;
   /**
    *
    *
@@ -400,7 +406,9 @@ public com.google.cloud.dialogflow.v2beta1.OutputAudioConfig getOutputAudioConfi
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.OutputAudioConfigOrBuilder
       getOutputAudioConfigOrBuilder() {
-    return getOutputAudioConfig();
+    return outputAudioConfig_ == null
+        ? com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.getDefaultInstance()
+        : outputAudioConfig_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -666,12 +674,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       responseId_ = "";
-
-      if (queryResultBuilder_ == null) {
-        queryResult_ = null;
-      } else {
-        queryResult_ = null;
+      queryResult_ = null;
+      if (queryResultBuilder_ != null) {
+        queryResultBuilder_.dispose();
         queryResultBuilder_ = null;
       }
       if (alternativeQueryResultsBuilder_ == null) {
@@ -680,19 +687,16 @@ public Builder clear() {
         alternativeQueryResults_ = null;
         alternativeQueryResultsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
-      if (webhookStatusBuilder_ == null) {
-        webhookStatus_ = null;
-      } else {
-        webhookStatus_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      webhookStatus_ = null;
+      if (webhookStatusBuilder_ != null) {
+        webhookStatusBuilder_.dispose();
         webhookStatusBuilder_ = null;
       }
       outputAudio_ = com.google.protobuf.ByteString.EMPTY;
-
-      if (outputAudioConfigBuilder_ == null) {
-        outputAudioConfig_ = null;
-      } else {
-        outputAudioConfig_ = null;
+      outputAudioConfig_ = null;
+      if (outputAudioConfigBuilder_ != null) {
+        outputAudioConfigBuilder_.dispose();
         outputAudioConfigBuilder_ = null;
       }
       return this;
@@ -722,36 +726,50 @@ public com.google.cloud.dialogflow.v2beta1.DetectIntentResponse build() {
     public com.google.cloud.dialogflow.v2beta1.DetectIntentResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.DetectIntentResponse result =
           new com.google.cloud.dialogflow.v2beta1.DetectIntentResponse(this);
-      int from_bitField0_ = bitField0_;
-      result.responseId_ = responseId_;
-      if (queryResultBuilder_ == null) {
-        result.queryResult_ = queryResult_;
-      } else {
-        result.queryResult_ = queryResultBuilder_.build();
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.DetectIntentResponse result) {
       if (alternativeQueryResultsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000004) != 0)) {
           alternativeQueryResults_ =
               java.util.Collections.unmodifiableList(alternativeQueryResults_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.alternativeQueryResults_ = alternativeQueryResults_;
       } else {
         result.alternativeQueryResults_ = alternativeQueryResultsBuilder_.build();
       }
-      if (webhookStatusBuilder_ == null) {
-        result.webhookStatus_ = webhookStatus_;
-      } else {
-        result.webhookStatus_ = webhookStatusBuilder_.build();
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.DetectIntentResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.responseId_ = responseId_;
       }
-      result.outputAudio_ = outputAudio_;
-      if (outputAudioConfigBuilder_ == null) {
-        result.outputAudioConfig_ = outputAudioConfig_;
-      } else {
-        result.outputAudioConfig_ = outputAudioConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.queryResult_ =
+            queryResultBuilder_ == null ? queryResult_ : queryResultBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.webhookStatus_ =
+            webhookStatusBuilder_ == null ? webhookStatus_ : webhookStatusBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.outputAudio_ = outputAudio_;
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.outputAudioConfig_ =
+            outputAudioConfigBuilder_ == null
+                ? outputAudioConfig_
+                : outputAudioConfigBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -802,6 +820,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.DetectIntentRespons
         return this;
       if (!other.getResponseId().isEmpty()) {
         responseId_ = other.responseId_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasQueryResult()) {
@@ -811,7 +830,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.DetectIntentRespons
         if (!other.alternativeQueryResults_.isEmpty()) {
           if (alternativeQueryResults_.isEmpty()) {
             alternativeQueryResults_ = other.alternativeQueryResults_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureAlternativeQueryResultsIsMutable();
             alternativeQueryResults_.addAll(other.alternativeQueryResults_);
@@ -824,7 +843,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.DetectIntentRespons
             alternativeQueryResultsBuilder_.dispose();
             alternativeQueryResultsBuilder_ = null;
             alternativeQueryResults_ = other.alternativeQueryResults_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
             alternativeQueryResultsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getAlternativeQueryResultsFieldBuilder()
@@ -872,25 +891,25 @@ public Builder mergeFrom(
             case 10:
               {
                 responseId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getQueryResultFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getWebhookStatusFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 26
             case 34:
               {
                 outputAudio_ = input.readBytes();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 34
             case 42:
@@ -911,7 +930,7 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getOutputAudioConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 50
             default:
@@ -997,8 +1016,8 @@ public Builder setResponseId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       responseId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1015,8 +1034,8 @@ public Builder setResponseId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearResponseId() {
-
       responseId_ = getDefaultInstance().getResponseId();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1038,8 +1057,8 @@ public Builder setResponseIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       responseId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1063,7 +1082,7 @@ public Builder setResponseIdBytes(com.google.protobuf.ByteString value) {
      * @return Whether the queryResult field is set.
      */
     public boolean hasQueryResult() {
-      return queryResultBuilder_ != null || queryResult_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -1102,11 +1121,11 @@ public Builder setQueryResult(com.google.cloud.dialogflow.v2beta1.QueryResult va
           throw new NullPointerException();
         }
         queryResult_ = value;
-        onChanged();
       } else {
         queryResultBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1123,11 +1142,11 @@ public Builder setQueryResult(
         com.google.cloud.dialogflow.v2beta1.QueryResult.Builder builderForValue) {
       if (queryResultBuilder_ == null) {
         queryResult_ = builderForValue.build();
-        onChanged();
       } else {
         queryResultBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1142,19 +1161,19 @@ public Builder setQueryResult(
      */
     public Builder mergeQueryResult(com.google.cloud.dialogflow.v2beta1.QueryResult value) {
       if (queryResultBuilder_ == null) {
-        if (queryResult_ != null) {
-          queryResult_ =
-              com.google.cloud.dialogflow.v2beta1.QueryResult.newBuilder(queryResult_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && queryResult_ != null
+            && queryResult_
+                != com.google.cloud.dialogflow.v2beta1.QueryResult.getDefaultInstance()) {
+          getQueryResultBuilder().mergeFrom(value);
         } else {
           queryResult_ = value;
         }
-        onChanged();
       } else {
         queryResultBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1168,14 +1187,13 @@ public Builder mergeQueryResult(com.google.cloud.dialogflow.v2beta1.QueryResult
      * <code>.google.cloud.dialogflow.v2beta1.QueryResult query_result = 2;</code>
      */
     public Builder clearQueryResult() {
-      if (queryResultBuilder_ == null) {
-        queryResult_ = null;
-        onChanged();
-      } else {
-        queryResult_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      queryResult_ = null;
+      if (queryResultBuilder_ != null) {
+        queryResultBuilder_.dispose();
         queryResultBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1189,7 +1207,7 @@ public Builder clearQueryResult() {
      * <code>.google.cloud.dialogflow.v2beta1.QueryResult query_result = 2;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.QueryResult.Builder getQueryResultBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getQueryResultFieldBuilder().getBuilder();
     }
@@ -1243,11 +1261,11 @@ public com.google.cloud.dialogflow.v2beta1.QueryResultOrBuilder getQueryResultOr
         alternativeQueryResults_ = java.util.Collections.emptyList();
 
     private void ensureAlternativeQueryResultsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         alternativeQueryResults_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.QueryResult>(
                 alternativeQueryResults_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000004;
       }
     }
 
@@ -1555,7 +1573,7 @@ public Builder addAllAlternativeQueryResults(
     public Builder clearAlternativeQueryResults() {
       if (alternativeQueryResultsBuilder_ == null) {
         alternativeQueryResults_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
       } else {
         alternativeQueryResultsBuilder_.clear();
@@ -1738,7 +1756,7 @@ public Builder removeAlternativeQueryResults(int index) {
                 com.google.cloud.dialogflow.v2beta1.QueryResult.Builder,
                 com.google.cloud.dialogflow.v2beta1.QueryResultOrBuilder>(
                 alternativeQueryResults_,
-                ((bitField0_ & 0x00000001) != 0),
+                ((bitField0_ & 0x00000004) != 0),
                 getParentForChildren(),
                 isClean());
         alternativeQueryResults_ = null;
@@ -1762,7 +1780,7 @@ public Builder removeAlternativeQueryResults(int index) {
      * @return Whether the webhookStatus field is set.
      */
     public boolean hasWebhookStatus() {
-      return webhookStatusBuilder_ != null || webhookStatus_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1797,11 +1815,11 @@ public Builder setWebhookStatus(com.google.rpc.Status value) {
           throw new NullPointerException();
         }
         webhookStatus_ = value;
-        onChanged();
       } else {
         webhookStatusBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1816,11 +1834,11 @@ public Builder setWebhookStatus(com.google.rpc.Status value) {
     public Builder setWebhookStatus(com.google.rpc.Status.Builder builderForValue) {
       if (webhookStatusBuilder_ == null) {
         webhookStatus_ = builderForValue.build();
-        onChanged();
       } else {
         webhookStatusBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1834,17 +1852,18 @@ public Builder setWebhookStatus(com.google.rpc.Status.Builder builderForValue) {
      */
     public Builder mergeWebhookStatus(com.google.rpc.Status value) {
       if (webhookStatusBuilder_ == null) {
-        if (webhookStatus_ != null) {
-          webhookStatus_ =
-              com.google.rpc.Status.newBuilder(webhookStatus_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && webhookStatus_ != null
+            && webhookStatus_ != com.google.rpc.Status.getDefaultInstance()) {
+          getWebhookStatusBuilder().mergeFrom(value);
         } else {
           webhookStatus_ = value;
         }
-        onChanged();
       } else {
         webhookStatusBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1857,14 +1876,13 @@ public Builder mergeWebhookStatus(com.google.rpc.Status value) {
      * <code>.google.rpc.Status webhook_status = 3;</code>
      */
     public Builder clearWebhookStatus() {
-      if (webhookStatusBuilder_ == null) {
-        webhookStatus_ = null;
-        onChanged();
-      } else {
-        webhookStatus_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      webhookStatus_ = null;
+      if (webhookStatusBuilder_ != null) {
+        webhookStatusBuilder_.dispose();
         webhookStatusBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1877,7 +1895,7 @@ public Builder clearWebhookStatus() {
      * <code>.google.rpc.Status webhook_status = 3;</code>
      */
     public com.google.rpc.Status.Builder getWebhookStatusBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getWebhookStatusFieldBuilder().getBuilder();
     }
@@ -1969,8 +1987,8 @@ public Builder setOutputAudio(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       outputAudio_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1994,7 +2012,7 @@ public Builder setOutputAudio(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearOutputAudio() {
-
+      bitField0_ = (bitField0_ & ~0x00000010);
       outputAudio_ = getDefaultInstance().getOutputAudio();
       onChanged();
       return this;
@@ -2018,7 +2036,7 @@ public Builder clearOutputAudio() {
      * @return Whether the outputAudioConfig field is set.
      */
     public boolean hasOutputAudioConfig() {
-      return outputAudioConfigBuilder_ != null || outputAudioConfig_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -2056,11 +2074,11 @@ public Builder setOutputAudioConfig(
           throw new NullPointerException();
         }
         outputAudioConfig_ = value;
-        onChanged();
       } else {
         outputAudioConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2076,11 +2094,11 @@ public Builder setOutputAudioConfig(
         com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.Builder builderForValue) {
       if (outputAudioConfigBuilder_ == null) {
         outputAudioConfig_ = builderForValue.build();
-        onChanged();
       } else {
         outputAudioConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2095,19 +2113,19 @@ public Builder setOutputAudioConfig(
     public Builder mergeOutputAudioConfig(
         com.google.cloud.dialogflow.v2beta1.OutputAudioConfig value) {
       if (outputAudioConfigBuilder_ == null) {
-        if (outputAudioConfig_ != null) {
-          outputAudioConfig_ =
-              com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.newBuilder(outputAudioConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && outputAudioConfig_ != null
+            && outputAudioConfig_
+                != com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.getDefaultInstance()) {
+          getOutputAudioConfigBuilder().mergeFrom(value);
         } else {
           outputAudioConfig_ = value;
         }
-        onChanged();
       } else {
         outputAudioConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2120,14 +2138,13 @@ public Builder mergeOutputAudioConfig(
      * <code>.google.cloud.dialogflow.v2beta1.OutputAudioConfig output_audio_config = 6;</code>
      */
     public Builder clearOutputAudioConfig() {
-      if (outputAudioConfigBuilder_ == null) {
-        outputAudioConfig_ = null;
-        onChanged();
-      } else {
-        outputAudioConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      outputAudioConfig_ = null;
+      if (outputAudioConfigBuilder_ != null) {
+        outputAudioConfigBuilder_.dispose();
         outputAudioConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2141,7 +2158,7 @@ public Builder clearOutputAudioConfig() {
      */
     public com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.Builder
         getOutputAudioConfigBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getOutputAudioConfigFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Document.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Document.java
index ba370225f15c..760208803255 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Document.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Document.java
@@ -732,7 +732,7 @@ public com.google.protobuf.Timestamp getTime() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getTimeOrBuilder() {
-      return getTime();
+      return time_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : time_;
     }
 
     public static final int STATUS_FIELD_NUMBER = 2;
@@ -778,7 +778,7 @@ public com.google.rpc.Status getStatus() {
      */
     @java.lang.Override
     public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
-      return getStatus();
+      return status_ == null ? com.google.rpc.Status.getDefaultInstance() : status_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -1000,16 +1000,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (timeBuilder_ == null) {
-          time_ = null;
-        } else {
-          time_ = null;
+        bitField0_ = 0;
+        time_ = null;
+        if (timeBuilder_ != null) {
+          timeBuilder_.dispose();
           timeBuilder_ = null;
         }
-        if (statusBuilder_ == null) {
-          status_ = null;
-        } else {
-          status_ = null;
+        status_ = null;
+        if (statusBuilder_ != null) {
+          statusBuilder_.dispose();
           statusBuilder_ = null;
         }
         return this;
@@ -1039,20 +1038,23 @@ public com.google.cloud.dialogflow.v2beta1.Document.ReloadStatus build() {
       public com.google.cloud.dialogflow.v2beta1.Document.ReloadStatus buildPartial() {
         com.google.cloud.dialogflow.v2beta1.Document.ReloadStatus result =
             new com.google.cloud.dialogflow.v2beta1.Document.ReloadStatus(this);
-        if (timeBuilder_ == null) {
-          result.time_ = time_;
-        } else {
-          result.time_ = timeBuilder_.build();
-        }
-        if (statusBuilder_ == null) {
-          result.status_ = status_;
-        } else {
-          result.status_ = statusBuilder_.build();
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(com.google.cloud.dialogflow.v2beta1.Document.ReloadStatus result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.time_ = timeBuilder_ == null ? time_ : timeBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.status_ = statusBuilder_ == null ? status_ : statusBuilder_.build();
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1136,13 +1138,13 @@ public Builder mergeFrom(
               case 10:
                 {
                   input.readMessage(getTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
                 {
                   input.readMessage(getStatusFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 18
               default:
@@ -1162,6 +1164,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private com.google.protobuf.Timestamp time_;
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.protobuf.Timestamp,
@@ -1182,7 +1186,7 @@ public Builder mergeFrom(
        * @return Whether the time field is set.
        */
       public boolean hasTime() {
-        return timeBuilder_ != null || time_ != null;
+        return ((bitField0_ & 0x00000001) != 0);
       }
       /**
        *
@@ -1221,11 +1225,11 @@ public Builder setTime(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           time_ = value;
-          onChanged();
         } else {
           timeBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1242,11 +1246,11 @@ public Builder setTime(com.google.protobuf.Timestamp value) {
       public Builder setTime(com.google.protobuf.Timestamp.Builder builderForValue) {
         if (timeBuilder_ == null) {
           time_ = builderForValue.build();
-          onChanged();
         } else {
           timeBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1262,16 +1266,18 @@ public Builder setTime(com.google.protobuf.Timestamp.Builder builderForValue) {
        */
       public Builder mergeTime(com.google.protobuf.Timestamp value) {
         if (timeBuilder_ == null) {
-          if (time_ != null) {
-            time_ = com.google.protobuf.Timestamp.newBuilder(time_).mergeFrom(value).buildPartial();
+          if (((bitField0_ & 0x00000001) != 0)
+              && time_ != null
+              && time_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+            getTimeBuilder().mergeFrom(value);
           } else {
             time_ = value;
           }
-          onChanged();
         } else {
           timeBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1286,14 +1292,13 @@ public Builder mergeTime(com.google.protobuf.Timestamp value) {
        * <code>.google.protobuf.Timestamp time = 1;</code>
        */
       public Builder clearTime() {
-        if (timeBuilder_ == null) {
-          time_ = null;
-          onChanged();
-        } else {
-          time_ = null;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        time_ = null;
+        if (timeBuilder_ != null) {
+          timeBuilder_.dispose();
           timeBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -1308,7 +1313,7 @@ public Builder clearTime() {
        * <code>.google.protobuf.Timestamp time = 1;</code>
        */
       public com.google.protobuf.Timestamp.Builder getTimeBuilder() {
-
+        bitField0_ |= 0x00000001;
         onChanged();
         return getTimeFieldBuilder().getBuilder();
       }
@@ -1374,7 +1379,7 @@ public com.google.protobuf.TimestampOrBuilder getTimeOrBuilder() {
        * @return Whether the status field is set.
        */
       public boolean hasStatus() {
-        return statusBuilder_ != null || status_ != null;
+        return ((bitField0_ & 0x00000002) != 0);
       }
       /**
        *
@@ -1409,11 +1414,11 @@ public Builder setStatus(com.google.rpc.Status value) {
             throw new NullPointerException();
           }
           status_ = value;
-          onChanged();
         } else {
           statusBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -1428,11 +1433,11 @@ public Builder setStatus(com.google.rpc.Status value) {
       public Builder setStatus(com.google.rpc.Status.Builder builderForValue) {
         if (statusBuilder_ == null) {
           status_ = builderForValue.build();
-          onChanged();
         } else {
           statusBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -1446,16 +1451,18 @@ public Builder setStatus(com.google.rpc.Status.Builder builderForValue) {
        */
       public Builder mergeStatus(com.google.rpc.Status value) {
         if (statusBuilder_ == null) {
-          if (status_ != null) {
-            status_ = com.google.rpc.Status.newBuilder(status_).mergeFrom(value).buildPartial();
+          if (((bitField0_ & 0x00000002) != 0)
+              && status_ != null
+              && status_ != com.google.rpc.Status.getDefaultInstance()) {
+            getStatusBuilder().mergeFrom(value);
           } else {
             status_ = value;
           }
-          onChanged();
         } else {
           statusBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -1468,14 +1475,13 @@ public Builder mergeStatus(com.google.rpc.Status value) {
        * <code>.google.rpc.Status status = 2;</code>
        */
       public Builder clearStatus() {
-        if (statusBuilder_ == null) {
-          status_ = null;
-          onChanged();
-        } else {
-          status_ = null;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        status_ = null;
+        if (statusBuilder_ != null) {
+          statusBuilder_.dispose();
           statusBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -1488,7 +1494,7 @@ public Builder clearStatus() {
        * <code>.google.rpc.Status status = 2;</code>
        */
       public com.google.rpc.Status.Builder getStatusBuilder() {
-
+        bitField0_ |= 0x00000002;
         onChanged();
         return getStatusFieldBuilder().getBuilder();
       }
@@ -1647,7 +1653,9 @@ public SourceCase getSourceCase() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -1702,7 +1710,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
@@ -1753,7 +1763,9 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
   }
 
   public static final int MIME_TYPE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object mimeType_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object mimeType_ = "";
   /**
    *
    *
@@ -1802,7 +1814,10 @@ public com.google.protobuf.ByteString getMimeTypeBytes() {
   }
 
   public static final int KNOWLEDGE_TYPES_FIELD_NUMBER = 4;
+
+  @SuppressWarnings("serial")
   private java.util.List<java.lang.Integer> knowledgeTypes_;
+
   private static final com.google.protobuf.Internal.ListAdapter.Converter<
           java.lang.Integer, com.google.cloud.dialogflow.v2beta1.Document.KnowledgeType>
       knowledgeTypes_converter_ =
@@ -1810,9 +1825,8 @@ public com.google.protobuf.ByteString getMimeTypeBytes() {
               java.lang.Integer, com.google.cloud.dialogflow.v2beta1.Document.KnowledgeType>() {
             public com.google.cloud.dialogflow.v2beta1.Document.KnowledgeType convert(
                 java.lang.Integer from) {
-              @SuppressWarnings("deprecation")
               com.google.cloud.dialogflow.v2beta1.Document.KnowledgeType result =
-                  com.google.cloud.dialogflow.v2beta1.Document.KnowledgeType.valueOf(from);
+                  com.google.cloud.dialogflow.v2beta1.Document.KnowledgeType.forNumber(from);
               return result == null
                   ? com.google.cloud.dialogflow.v2beta1.Document.KnowledgeType.UNRECOGNIZED
                   : result;
@@ -2125,7 +2139,7 @@ public com.google.protobuf.ByteString getRawContent() {
   }
 
   public static final int ENABLE_AUTO_RELOAD_FIELD_NUMBER = 11;
-  private boolean enableAutoReload_;
+  private boolean enableAutoReload_ = false;
   /**
    *
    *
@@ -2212,7 +2226,9 @@ public com.google.cloud.dialogflow.v2beta1.Document.ReloadStatus getLatestReload
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.Document.ReloadStatusOrBuilder
       getLatestReloadStatusOrBuilder() {
-    return getLatestReloadStatus();
+    return latestReloadStatus_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Document.ReloadStatus.getDefaultInstance()
+        : latestReloadStatus_;
   }
 
   public static final int METADATA_FIELD_NUMBER = 7;
@@ -2228,6 +2244,7 @@ private static final class MetadataDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> metadata_;
 
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> internalGetMetadata() {
@@ -2294,8 +2311,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
    * <code>map&lt;string, string&gt; metadata = 7 [(.google.api.field_behavior) = OPTIONAL];</code>
    */
   @java.lang.Override
-  public java.lang.String getMetadataOrDefault(
-      java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getMetadataOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -2327,7 +2346,7 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
   }
 
   public static final int STATE_FIELD_NUMBER = 13;
-  private int state_;
+  private int state_ = 0;
   /**
    *
    *
@@ -2360,9 +2379,8 @@ public int getStateValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.Document.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.Document.State result =
-        com.google.cloud.dialogflow.v2beta1.Document.State.valueOf(state_);
+        com.google.cloud.dialogflow.v2beta1.Document.State.forNumber(state_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.Document.State.UNRECOGNIZED
         : result;
@@ -2734,25 +2752,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       displayName_ = "";
-
       mimeType_ = "";
-
       knowledgeTypes_ = java.util.Collections.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000008);
       enableAutoReload_ = false;
-
-      if (latestReloadStatusBuilder_ == null) {
-        latestReloadStatus_ = null;
-      } else {
-        latestReloadStatus_ = null;
+      latestReloadStatus_ = null;
+      if (latestReloadStatusBuilder_ != null) {
+        latestReloadStatusBuilder_.dispose();
         latestReloadStatusBuilder_ = null;
       }
       internalGetMutableMetadata().clear();
       state_ = 0;
-
       sourceCase_ = 0;
       source_ = null;
       return this;
@@ -2782,36 +2795,55 @@ public com.google.cloud.dialogflow.v2beta1.Document build() {
     public com.google.cloud.dialogflow.v2beta1.Document buildPartial() {
       com.google.cloud.dialogflow.v2beta1.Document result =
           new com.google.cloud.dialogflow.v2beta1.Document(this);
-      int from_bitField0_ = bitField0_;
-      result.name_ = name_;
-      result.displayName_ = displayName_;
-      result.mimeType_ = mimeType_;
-      if (((bitField0_ & 0x00000001) != 0)) {
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.cloud.dialogflow.v2beta1.Document result) {
+      if (((bitField0_ & 0x00000008) != 0)) {
         knowledgeTypes_ = java.util.Collections.unmodifiableList(knowledgeTypes_);
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000008);
       }
       result.knowledgeTypes_ = knowledgeTypes_;
-      if (sourceCase_ == 5) {
-        result.source_ = source_;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.Document result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
       }
-      if (sourceCase_ == 6) {
-        result.source_ = source_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.displayName_ = displayName_;
       }
-      if (sourceCase_ == 9) {
-        result.source_ = source_;
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.mimeType_ = mimeType_;
       }
-      result.enableAutoReload_ = enableAutoReload_;
-      if (latestReloadStatusBuilder_ == null) {
-        result.latestReloadStatus_ = latestReloadStatus_;
-      } else {
-        result.latestReloadStatus_ = latestReloadStatusBuilder_.build();
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.enableAutoReload_ = enableAutoReload_;
       }
-      result.metadata_ = internalGetMetadata();
-      result.metadata_.makeImmutable();
-      result.state_ = state_;
+      if (((from_bitField0_ & 0x00000100) != 0)) {
+        result.latestReloadStatus_ =
+            latestReloadStatusBuilder_ == null
+                ? latestReloadStatus_
+                : latestReloadStatusBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000200) != 0)) {
+        result.metadata_ = internalGetMetadata();
+        result.metadata_.makeImmutable();
+      }
+      if (((from_bitField0_ & 0x00000400) != 0)) {
+        result.state_ = state_;
+      }
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2beta1.Document result) {
       result.sourceCase_ = sourceCase_;
-      onBuilt();
-      return result;
+      result.source_ = this.source_;
     }
 
     @java.lang.Override
@@ -2861,20 +2893,23 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Document other) {
       if (other == com.google.cloud.dialogflow.v2beta1.Document.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getMimeType().isEmpty()) {
         mimeType_ = other.mimeType_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.knowledgeTypes_.isEmpty()) {
         if (knowledgeTypes_.isEmpty()) {
           knowledgeTypes_ = other.knowledgeTypes_;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000008);
         } else {
           ensureKnowledgeTypesIsMutable();
           knowledgeTypes_.addAll(other.knowledgeTypes_);
@@ -2888,6 +2923,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Document other) {
         mergeLatestReloadStatus(other.getLatestReloadStatus());
       }
       internalGetMutableMetadata().mergeFrom(other.internalGetMetadata());
+      bitField0_ |= 0x00000200;
       if (other.state_ != 0) {
         setStateValue(other.getStateValue());
       }
@@ -2945,19 +2981,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 displayName_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 mimeType_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 32:
@@ -3002,6 +3038,7 @@ public Builder mergeFrom(
                 internalGetMutableMetadata()
                     .getMutableMap()
                     .put(metadata__.getKey(), metadata__.getValue());
+                bitField0_ |= 0x00000200;
                 break;
               } // case 58
             case 74:
@@ -3013,20 +3050,20 @@ public Builder mergeFrom(
             case 88:
               {
                 enableAutoReload_ = input.readBool();
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 88
             case 98:
               {
                 input.readMessage(
                     getLatestReloadStatusFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000100;
                 break;
               } // case 98
             case 104:
               {
                 state_ = input.readEnum();
-
+                bitField0_ |= 0x00000400;
                 break;
               } // case 104
             default:
@@ -3132,8 +3169,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -3152,8 +3189,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -3177,8 +3214,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -3247,8 +3284,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -3265,8 +3302,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
-
       displayName_ = getDefaultInstance().getDisplayName();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -3288,8 +3325,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -3355,8 +3392,8 @@ public Builder setMimeType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       mimeType_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -3372,8 +3409,8 @@ public Builder setMimeType(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearMimeType() {
-
       mimeType_ = getDefaultInstance().getMimeType();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -3394,8 +3431,8 @@ public Builder setMimeTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       mimeType_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -3403,9 +3440,9 @@ public Builder setMimeTypeBytes(com.google.protobuf.ByteString value) {
     private java.util.List<java.lang.Integer> knowledgeTypes_ = java.util.Collections.emptyList();
 
     private void ensureKnowledgeTypesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         knowledgeTypes_ = new java.util.ArrayList<java.lang.Integer>(knowledgeTypes_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000008;
       }
     }
     /**
@@ -3548,7 +3585,7 @@ public Builder addAllKnowledgeTypes(
      */
     public Builder clearKnowledgeTypes() {
       knowledgeTypes_ = java.util.Collections.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -4120,6 +4157,7 @@ public boolean getEnableAutoReload() {
     public Builder setEnableAutoReload(boolean value) {
 
       enableAutoReload_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -4147,7 +4185,7 @@ public Builder setEnableAutoReload(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearEnableAutoReload() {
-
+      bitField0_ = (bitField0_ & ~0x00000080);
       enableAutoReload_ = false;
       onChanged();
       return this;
@@ -4175,7 +4213,7 @@ public Builder clearEnableAutoReload() {
      * @return Whether the latestReloadStatus field is set.
      */
     public boolean hasLatestReloadStatus() {
-      return latestReloadStatusBuilder_ != null || latestReloadStatus_ != null;
+      return ((bitField0_ & 0x00000100) != 0);
     }
     /**
      *
@@ -4221,11 +4259,11 @@ public Builder setLatestReloadStatus(
           throw new NullPointerException();
         }
         latestReloadStatus_ = value;
-        onChanged();
       } else {
         latestReloadStatusBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -4245,11 +4283,11 @@ public Builder setLatestReloadStatus(
         com.google.cloud.dialogflow.v2beta1.Document.ReloadStatus.Builder builderForValue) {
       if (latestReloadStatusBuilder_ == null) {
         latestReloadStatus_ = builderForValue.build();
-        onChanged();
       } else {
         latestReloadStatusBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -4268,20 +4306,19 @@ public Builder setLatestReloadStatus(
     public Builder mergeLatestReloadStatus(
         com.google.cloud.dialogflow.v2beta1.Document.ReloadStatus value) {
       if (latestReloadStatusBuilder_ == null) {
-        if (latestReloadStatus_ != null) {
-          latestReloadStatus_ =
-              com.google.cloud.dialogflow.v2beta1.Document.ReloadStatus.newBuilder(
-                      latestReloadStatus_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000100) != 0)
+            && latestReloadStatus_ != null
+            && latestReloadStatus_
+                != com.google.cloud.dialogflow.v2beta1.Document.ReloadStatus.getDefaultInstance()) {
+          getLatestReloadStatusBuilder().mergeFrom(value);
         } else {
           latestReloadStatus_ = value;
         }
-        onChanged();
       } else {
         latestReloadStatusBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -4298,14 +4335,13 @@ public Builder mergeLatestReloadStatus(
      * </code>
      */
     public Builder clearLatestReloadStatus() {
-      if (latestReloadStatusBuilder_ == null) {
-        latestReloadStatus_ = null;
-        onChanged();
-      } else {
-        latestReloadStatus_ = null;
+      bitField0_ = (bitField0_ & ~0x00000100);
+      latestReloadStatus_ = null;
+      if (latestReloadStatusBuilder_ != null) {
+        latestReloadStatusBuilder_.dispose();
         latestReloadStatusBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -4323,7 +4359,7 @@ public Builder clearLatestReloadStatus() {
      */
     public com.google.cloud.dialogflow.v2beta1.Document.ReloadStatus.Builder
         getLatestReloadStatusBuilder() {
-
+      bitField0_ |= 0x00000100;
       onChanged();
       return getLatestReloadStatusFieldBuilder().getBuilder();
     }
@@ -4391,8 +4427,6 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
         internalGetMutableMetadata() {
-      onChanged();
-      ;
       if (metadata_ == null) {
         metadata_ =
             com.google.protobuf.MapField.newMapField(MetadataDefaultEntryHolder.defaultEntry);
@@ -4400,6 +4434,8 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
       if (!metadata_.isMutable()) {
         metadata_ = metadata_.copy();
       }
+      bitField0_ |= 0x00000200;
+      onChanged();
       return metadata_;
     }
 
@@ -4463,8 +4499,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
      * </code>
      */
     @java.lang.Override
-    public java.lang.String getMetadataOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getMetadataOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -4497,6 +4535,7 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
     }
 
     public Builder clearMetadata() {
+      bitField0_ = (bitField0_ & ~0x00000200);
       internalGetMutableMetadata().getMutableMap().clear();
       return this;
     }
@@ -4523,6 +4562,7 @@ public Builder removeMetadata(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMutableMetadata() {
+      bitField0_ |= 0x00000200;
       return internalGetMutableMetadata().getMutableMap();
     }
     /**
@@ -4545,8 +4585,8 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableMetadata().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000200;
       return this;
     }
     /**
@@ -4564,6 +4604,7 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllMetadata(java.util.Map<java.lang.String, java.lang.String> values) {
       internalGetMutableMetadata().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000200;
       return this;
     }
 
@@ -4600,8 +4641,8 @@ public int getStateValue() {
      * @return This builder for chaining.
      */
     public Builder setStateValue(int value) {
-
       state_ = value;
+      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -4620,9 +4661,8 @@ public Builder setStateValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.Document.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.Document.State result =
-          com.google.cloud.dialogflow.v2beta1.Document.State.valueOf(state_);
+          com.google.cloud.dialogflow.v2beta1.Document.State.forNumber(state_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.Document.State.UNRECOGNIZED
           : result;
@@ -4645,7 +4685,7 @@ public Builder setState(com.google.cloud.dialogflow.v2beta1.Document.State value
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000400;
       state_ = value.getNumber();
       onChanged();
       return this;
@@ -4664,7 +4704,7 @@ public Builder setState(com.google.cloud.dialogflow.v2beta1.Document.State value
      * @return This builder for chaining.
      */
     public Builder clearState() {
-
+      bitField0_ = (bitField0_ & ~0x00000400);
       state_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DocumentOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DocumentOrBuilder.java
index 2c644c9f0659..a46839379143 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DocumentOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DocumentOrBuilder.java
@@ -444,7 +444,6 @@ public interface DocumentOrBuilder
    *
    * <code>map&lt;string, string&gt; metadata = 7 [(.google.api.field_behavior) = OPTIONAL];</code>
    */
-
   /* nullable */
   java.lang.String getMetadataOrDefault(
       java.lang.String key,
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DtmfParameters.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DtmfParameters.java
index 8e82e07c8afe..ffa8a39eeb82 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DtmfParameters.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DtmfParameters.java
@@ -66,7 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ACCEPTS_DTMF_INPUT_FIELD_NUMBER = 1;
-  private boolean acceptsDtmfInput_;
+  private boolean acceptsDtmfInput_ = false;
   /**
    *
    *
@@ -280,8 +280,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       acceptsDtmfInput_ = false;
-
       return this;
     }
 
@@ -309,11 +309,20 @@ public com.google.cloud.dialogflow.v2beta1.DtmfParameters build() {
     public com.google.cloud.dialogflow.v2beta1.DtmfParameters buildPartial() {
       com.google.cloud.dialogflow.v2beta1.DtmfParameters result =
           new com.google.cloud.dialogflow.v2beta1.DtmfParameters(this);
-      result.acceptsDtmfInput_ = acceptsDtmfInput_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.DtmfParameters result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.acceptsDtmfInput_ = acceptsDtmfInput_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -392,7 +401,7 @@ public Builder mergeFrom(
             case 8:
               {
                 acceptsDtmfInput_ = input.readBool();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             default:
@@ -412,6 +421,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private boolean acceptsDtmfInput_;
     /**
      *
@@ -443,6 +454,7 @@ public boolean getAcceptsDtmfInput() {
     public Builder setAcceptsDtmfInput(boolean value) {
 
       acceptsDtmfInput_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -458,7 +470,7 @@ public Builder setAcceptsDtmfInput(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearAcceptsDtmfInput() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       acceptsDtmfInput_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityType.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityType.java
index 2b1cc428f44e..abbb033f2b92 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityType.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityType.java
@@ -571,7 +571,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int VALUE_FIELD_NUMBER = 1;
-    private volatile java.lang.Object value_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object value_ = "";
     /**
      *
      *
@@ -634,6 +636,8 @@ public com.google.protobuf.ByteString getValueBytes() {
     }
 
     public static final int SYNONYMS_FIELD_NUMBER = 2;
+
+    @SuppressWarnings("serial")
     private com.google.protobuf.LazyStringList synonyms_;
     /**
      *
@@ -926,10 +930,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         value_ = "";
-
         synonyms_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -957,17 +961,30 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity build() {
       public com.google.cloud.dialogflow.v2beta1.EntityType.Entity buildPartial() {
         com.google.cloud.dialogflow.v2beta1.EntityType.Entity result =
             new com.google.cloud.dialogflow.v2beta1.EntityType.Entity(this);
-        int from_bitField0_ = bitField0_;
-        result.value_ = value_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          synonyms_ = synonyms_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000001);
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
-        result.synonyms_ = synonyms_;
         onBuilt();
         return result;
       }
 
+      private void buildPartialRepeatedFields(
+          com.google.cloud.dialogflow.v2beta1.EntityType.Entity result) {
+        if (((bitField0_ & 0x00000002) != 0)) {
+          synonyms_ = synonyms_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.synonyms_ = synonyms_;
+      }
+
+      private void buildPartial0(com.google.cloud.dialogflow.v2beta1.EntityType.Entity result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.value_ = value_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1018,12 +1035,13 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.EntityType.Entity o
           return this;
         if (!other.getValue().isEmpty()) {
           value_ = other.value_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.synonyms_.isEmpty()) {
           if (synonyms_.isEmpty()) {
             synonyms_ = other.synonyms_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureSynonymsIsMutable();
             synonyms_.addAll(other.synonyms_);
@@ -1059,7 +1077,7 @@ public Builder mergeFrom(
               case 10:
                 {
                   value_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
@@ -1170,8 +1188,8 @@ public Builder setValue(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         value_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1194,8 +1212,8 @@ public Builder setValue(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearValue() {
-
         value_ = getDefaultInstance().getValue();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1223,8 +1241,8 @@ public Builder setValueBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         value_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1233,9 +1251,9 @@ public Builder setValueBytes(com.google.protobuf.ByteString value) {
           com.google.protobuf.LazyStringArrayList.EMPTY;
 
       private void ensureSynonymsIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
           synonyms_ = new com.google.protobuf.LazyStringArrayList(synonyms_);
-          bitField0_ |= 0x00000001;
+          bitField0_ |= 0x00000002;
         }
       }
       /**
@@ -1402,7 +1420,7 @@ public Builder addAllSynonyms(java.lang.Iterable<java.lang.String> values) {
        */
       public Builder clearSynonyms() {
         synonyms_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1498,7 +1516,9 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity getDefaultInstanceF
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -1559,7 +1579,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
@@ -1608,7 +1630,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
   }
 
   public static final int KIND_FIELD_NUMBER = 3;
-  private int kind_;
+  private int kind_ = 0;
   /**
    *
    *
@@ -1641,16 +1663,15 @@ public int getKindValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.EntityType.Kind getKind() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.EntityType.Kind result =
-        com.google.cloud.dialogflow.v2beta1.EntityType.Kind.valueOf(kind_);
+        com.google.cloud.dialogflow.v2beta1.EntityType.Kind.forNumber(kind_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.EntityType.Kind.UNRECOGNIZED
         : result;
   }
 
   public static final int AUTO_EXPANSION_MODE_FIELD_NUMBER = 4;
-  private int autoExpansionMode_;
+  private int autoExpansionMode_ = 0;
   /**
    *
    *
@@ -1685,9 +1706,8 @@ public int getAutoExpansionModeValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.EntityType.AutoExpansionMode getAutoExpansionMode() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.EntityType.AutoExpansionMode result =
-        com.google.cloud.dialogflow.v2beta1.EntityType.AutoExpansionMode.valueOf(
+        com.google.cloud.dialogflow.v2beta1.EntityType.AutoExpansionMode.forNumber(
             autoExpansionMode_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.EntityType.AutoExpansionMode.UNRECOGNIZED
@@ -1695,6 +1715,8 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.AutoExpansionMode getAutoE
   }
 
   public static final int ENTITIES_FIELD_NUMBER = 6;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.EntityType.Entity> entities_;
   /**
    *
@@ -1775,7 +1797,7 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder getEntitie
   }
 
   public static final int ENABLE_FUZZY_EXTRACTION_FIELD_NUMBER = 7;
-  private boolean enableFuzzyExtraction_;
+  private boolean enableFuzzyExtraction_ = false;
   /**
    *
    *
@@ -2051,23 +2073,19 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       displayName_ = "";
-
       kind_ = 0;
-
       autoExpansionMode_ = 0;
-
       if (entitiesBuilder_ == null) {
         entities_ = java.util.Collections.emptyList();
       } else {
         entities_ = null;
         entitiesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000010);
       enableFuzzyExtraction_ = false;
-
       return this;
     }
 
@@ -2095,23 +2113,43 @@ public com.google.cloud.dialogflow.v2beta1.EntityType build() {
     public com.google.cloud.dialogflow.v2beta1.EntityType buildPartial() {
       com.google.cloud.dialogflow.v2beta1.EntityType result =
           new com.google.cloud.dialogflow.v2beta1.EntityType(this);
-      int from_bitField0_ = bitField0_;
-      result.name_ = name_;
-      result.displayName_ = displayName_;
-      result.kind_ = kind_;
-      result.autoExpansionMode_ = autoExpansionMode_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.cloud.dialogflow.v2beta1.EntityType result) {
       if (entitiesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000010) != 0)) {
           entities_ = java.util.Collections.unmodifiableList(entities_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000010);
         }
         result.entities_ = entities_;
       } else {
         result.entities_ = entitiesBuilder_.build();
       }
-      result.enableFuzzyExtraction_ = enableFuzzyExtraction_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.EntityType result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.displayName_ = displayName_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.kind_ = kind_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.autoExpansionMode_ = autoExpansionMode_;
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.enableFuzzyExtraction_ = enableFuzzyExtraction_;
+      }
     }
 
     @java.lang.Override
@@ -2161,10 +2199,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.EntityType other) {
       if (other == com.google.cloud.dialogflow.v2beta1.EntityType.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.kind_ != 0) {
@@ -2177,7 +2217,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.EntityType other) {
         if (!other.entities_.isEmpty()) {
           if (entities_.isEmpty()) {
             entities_ = other.entities_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
             ensureEntitiesIsMutable();
             entities_.addAll(other.entities_);
@@ -2190,7 +2230,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.EntityType other) {
             entitiesBuilder_.dispose();
             entitiesBuilder_ = null;
             entities_ = other.entities_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
             entitiesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getEntitiesFieldBuilder()
@@ -2232,25 +2272,25 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 displayName_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 kind_ = input.readEnum();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 32:
               {
                 autoExpansionMode_ = input.readEnum();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 32
             case 50:
@@ -2270,7 +2310,7 @@ public Builder mergeFrom(
             case 56:
               {
                 enableFuzzyExtraction_ = input.readBool();
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 56
             default:
@@ -2371,8 +2411,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2394,8 +2434,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -2422,8 +2462,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2489,8 +2529,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -2506,8 +2546,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
-
       displayName_ = getDefaultInstance().getDisplayName();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -2528,8 +2568,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -2567,8 +2607,8 @@ public int getKindValue() {
      * @return This builder for chaining.
      */
     public Builder setKindValue(int value) {
-
       kind_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2587,9 +2627,8 @@ public Builder setKindValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.EntityType.Kind getKind() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.EntityType.Kind result =
-          com.google.cloud.dialogflow.v2beta1.EntityType.Kind.valueOf(kind_);
+          com.google.cloud.dialogflow.v2beta1.EntityType.Kind.forNumber(kind_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.EntityType.Kind.UNRECOGNIZED
           : result;
@@ -2612,7 +2651,7 @@ public Builder setKind(com.google.cloud.dialogflow.v2beta1.EntityType.Kind value
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000004;
       kind_ = value.getNumber();
       onChanged();
       return this;
@@ -2631,7 +2670,7 @@ public Builder setKind(com.google.cloud.dialogflow.v2beta1.EntityType.Kind value
      * @return This builder for chaining.
      */
     public Builder clearKind() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       kind_ = 0;
       onChanged();
       return this;
@@ -2672,8 +2711,8 @@ public int getAutoExpansionModeValue() {
      * @return This builder for chaining.
      */
     public Builder setAutoExpansionModeValue(int value) {
-
       autoExpansionMode_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2693,9 +2732,8 @@ public Builder setAutoExpansionModeValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.EntityType.AutoExpansionMode getAutoExpansionMode() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.EntityType.AutoExpansionMode result =
-          com.google.cloud.dialogflow.v2beta1.EntityType.AutoExpansionMode.valueOf(
+          com.google.cloud.dialogflow.v2beta1.EntityType.AutoExpansionMode.forNumber(
               autoExpansionMode_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.EntityType.AutoExpansionMode.UNRECOGNIZED
@@ -2721,7 +2759,7 @@ public Builder setAutoExpansionMode(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000008;
       autoExpansionMode_ = value.getNumber();
       onChanged();
       return this;
@@ -2741,7 +2779,7 @@ public Builder setAutoExpansionMode(
      * @return This builder for chaining.
      */
     public Builder clearAutoExpansionMode() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       autoExpansionMode_ = 0;
       onChanged();
       return this;
@@ -2751,11 +2789,11 @@ public Builder clearAutoExpansionMode() {
         java.util.Collections.emptyList();
 
     private void ensureEntitiesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         entities_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.EntityType.Entity>(
                 entities_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000010;
       }
     }
 
@@ -2996,7 +3034,7 @@ public Builder addAllEntities(
     public Builder clearEntities() {
       if (entitiesBuilder_ == null) {
         entities_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
       } else {
         entitiesBuilder_.clear();
@@ -3136,7 +3174,7 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder addEntities
                 com.google.cloud.dialogflow.v2beta1.EntityType.Entity,
                 com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder,
                 com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder>(
-                entities_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                entities_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
         entities_ = null;
       }
       return entitiesBuilder_;
@@ -3173,6 +3211,7 @@ public boolean getEnableFuzzyExtraction() {
     public Builder setEnableFuzzyExtraction(boolean value) {
 
       enableFuzzyExtraction_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -3188,7 +3227,7 @@ public Builder setEnableFuzzyExtraction(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearEnableFuzzyExtraction() {
-
+      bitField0_ = (bitField0_ & ~0x00000020);
       enableFuzzyExtraction_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeBatch.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeBatch.java
index 2b2936c4e6f8..cdcad218c6b4 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeBatch.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeBatch.java
@@ -68,6 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ENTITY_TYPES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.EntityType> entityTypes_;
   /**
    *
@@ -336,6 +338,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (entityTypesBuilder_ == null) {
         entityTypes_ = java.util.Collections.emptyList();
       } else {
@@ -370,7 +373,16 @@ public com.google.cloud.dialogflow.v2beta1.EntityTypeBatch build() {
     public com.google.cloud.dialogflow.v2beta1.EntityTypeBatch buildPartial() {
       com.google.cloud.dialogflow.v2beta1.EntityTypeBatch result =
           new com.google.cloud.dialogflow.v2beta1.EntityTypeBatch(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.EntityTypeBatch result) {
       if (entityTypesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           entityTypes_ = java.util.Collections.unmodifiableList(entityTypes_);
@@ -380,8 +392,10 @@ public com.google.cloud.dialogflow.v2beta1.EntityTypeBatch buildPartial() {
       } else {
         result.entityTypes_ = entityTypesBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.EntityTypeBatch result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Environment.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Environment.java
index 0596803f9cc3..46ab2e1c7e00 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Environment.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Environment.java
@@ -267,7 +267,9 @@ private State(int value) {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -324,7 +326,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 2;
-  private volatile java.lang.Object description_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object description_ = "";
   /**
    *
    *
@@ -375,7 +379,9 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
   }
 
   public static final int AGENT_VERSION_FIELD_NUMBER = 3;
-  private volatile java.lang.Object agentVersion_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object agentVersion_ = "";
   /**
    *
    *
@@ -436,7 +442,7 @@ public com.google.protobuf.ByteString getAgentVersionBytes() {
   }
 
   public static final int STATE_FIELD_NUMBER = 4;
-  private int state_;
+  private int state_ = 0;
   /**
    *
    *
@@ -471,9 +477,8 @@ public int getStateValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.Environment.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.Environment.State result =
-        com.google.cloud.dialogflow.v2beta1.Environment.State.valueOf(state_);
+        com.google.cloud.dialogflow.v2beta1.Environment.State.forNumber(state_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.Environment.State.UNRECOGNIZED
         : result;
@@ -528,7 +533,7 @@ public com.google.protobuf.Timestamp getUpdateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
-    return getUpdateTime();
+    return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
   }
 
   public static final int TEXT_TO_SPEECH_SETTINGS_FIELD_NUMBER = 7;
@@ -583,7 +588,9 @@ public com.google.cloud.dialogflow.v2beta1.TextToSpeechSettings getTextToSpeechS
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.TextToSpeechSettingsOrBuilder
       getTextToSpeechSettingsOrBuilder() {
-    return getTextToSpeechSettings();
+    return textToSpeechSettings_ == null
+        ? com.google.cloud.dialogflow.v2beta1.TextToSpeechSettings.getDefaultInstance()
+        : textToSpeechSettings_;
   }
 
   public static final int FULFILLMENT_FIELD_NUMBER = 8;
@@ -637,7 +644,9 @@ public com.google.cloud.dialogflow.v2beta1.Fulfillment getFulfillment() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.FulfillmentOrBuilder getFulfillmentOrBuilder() {
-    return getFulfillment();
+    return fulfillment_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Fulfillment.getDefaultInstance()
+        : fulfillment_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -922,30 +931,24 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       description_ = "";
-
       agentVersion_ = "";
-
       state_ = 0;
-
-      if (updateTimeBuilder_ == null) {
-        updateTime_ = null;
-      } else {
-        updateTime_ = null;
+      updateTime_ = null;
+      if (updateTimeBuilder_ != null) {
+        updateTimeBuilder_.dispose();
         updateTimeBuilder_ = null;
       }
-      if (textToSpeechSettingsBuilder_ == null) {
-        textToSpeechSettings_ = null;
-      } else {
-        textToSpeechSettings_ = null;
+      textToSpeechSettings_ = null;
+      if (textToSpeechSettingsBuilder_ != null) {
+        textToSpeechSettingsBuilder_.dispose();
         textToSpeechSettingsBuilder_ = null;
       }
-      if (fulfillmentBuilder_ == null) {
-        fulfillment_ = null;
-      } else {
-        fulfillment_ = null;
+      fulfillment_ = null;
+      if (fulfillmentBuilder_ != null) {
+        fulfillmentBuilder_.dispose();
         fulfillmentBuilder_ = null;
       }
       return this;
@@ -975,29 +978,42 @@ public com.google.cloud.dialogflow.v2beta1.Environment build() {
     public com.google.cloud.dialogflow.v2beta1.Environment buildPartial() {
       com.google.cloud.dialogflow.v2beta1.Environment result =
           new com.google.cloud.dialogflow.v2beta1.Environment(this);
-      result.name_ = name_;
-      result.description_ = description_;
-      result.agentVersion_ = agentVersion_;
-      result.state_ = state_;
-      if (updateTimeBuilder_ == null) {
-        result.updateTime_ = updateTime_;
-      } else {
-        result.updateTime_ = updateTimeBuilder_.build();
-      }
-      if (textToSpeechSettingsBuilder_ == null) {
-        result.textToSpeechSettings_ = textToSpeechSettings_;
-      } else {
-        result.textToSpeechSettings_ = textToSpeechSettingsBuilder_.build();
-      }
-      if (fulfillmentBuilder_ == null) {
-        result.fulfillment_ = fulfillment_;
-      } else {
-        result.fulfillment_ = fulfillmentBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.Environment result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.description_ = description_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.agentVersion_ = agentVersion_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.state_ = state_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.textToSpeechSettings_ =
+            textToSpeechSettingsBuilder_ == null
+                ? textToSpeechSettings_
+                : textToSpeechSettingsBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.fulfillment_ =
+            fulfillmentBuilder_ == null ? fulfillment_ : fulfillmentBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -1046,14 +1062,17 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Environment other)
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getAgentVersion().isEmpty()) {
         agentVersion_ = other.agentVersion_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.state_ != 0) {
@@ -1097,44 +1116,44 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 description_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 agentVersion_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 32:
               {
                 state_ = input.readEnum();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 32
             case 42:
               {
                 input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             case 58:
               {
                 input.readMessage(
                     getTextToSpeechSettingsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 58
             case 66:
               {
                 input.readMessage(getFulfillmentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 66
             default:
@@ -1154,6 +1173,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -1227,8 +1248,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1248,8 +1269,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1274,8 +1295,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1344,8 +1365,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       description_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1362,8 +1383,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
-
       description_ = getDefaultInstance().getDescription();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1385,8 +1406,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       description_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1470,8 +1491,8 @@ public Builder setAgentVersion(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       agentVersion_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1493,8 +1514,8 @@ public Builder setAgentVersion(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAgentVersion() {
-
       agentVersion_ = getDefaultInstance().getAgentVersion();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1521,8 +1542,8 @@ public Builder setAgentVersionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       agentVersion_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1562,8 +1583,8 @@ public int getStateValue() {
      * @return This builder for chaining.
      */
     public Builder setStateValue(int value) {
-
       state_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1583,9 +1604,8 @@ public Builder setStateValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.Environment.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.Environment.State result =
-          com.google.cloud.dialogflow.v2beta1.Environment.State.valueOf(state_);
+          com.google.cloud.dialogflow.v2beta1.Environment.State.forNumber(state_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.Environment.State.UNRECOGNIZED
           : result;
@@ -1609,7 +1629,7 @@ public Builder setState(com.google.cloud.dialogflow.v2beta1.Environment.State va
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000008;
       state_ = value.getNumber();
       onChanged();
       return this;
@@ -1629,7 +1649,7 @@ public Builder setState(com.google.cloud.dialogflow.v2beta1.Environment.State va
      * @return This builder for chaining.
      */
     public Builder clearState() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       state_ = 0;
       onChanged();
       return this;
@@ -1656,7 +1676,7 @@ public Builder clearState() {
      * @return Whether the updateTime field is set.
      */
     public boolean hasUpdateTime() {
-      return updateTimeBuilder_ != null || updateTime_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -1699,11 +1719,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         updateTime_ = value;
-        onChanged();
       } else {
         updateTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1721,11 +1741,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
     public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (updateTimeBuilder_ == null) {
         updateTime_ = builderForValue.build();
-        onChanged();
       } else {
         updateTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1742,17 +1762,18 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       if (updateTimeBuilder_ == null) {
-        if (updateTime_ != null) {
-          updateTime_ =
-              com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && updateTime_ != null
+            && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getUpdateTimeBuilder().mergeFrom(value);
         } else {
           updateTime_ = value;
         }
-        onChanged();
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1768,14 +1789,13 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
      * </code>
      */
     public Builder clearUpdateTime() {
-      if (updateTimeBuilder_ == null) {
-        updateTime_ = null;
-        onChanged();
-      } else {
-        updateTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      updateTime_ = null;
+      if (updateTimeBuilder_ != null) {
+        updateTimeBuilder_.dispose();
         updateTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1791,7 +1811,7 @@ public Builder clearUpdateTime() {
      * </code>
      */
     public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getUpdateTimeFieldBuilder().getBuilder();
     }
@@ -1865,7 +1885,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
      * @return Whether the textToSpeechSettings field is set.
      */
     public boolean hasTextToSpeechSettings() {
-      return textToSpeechSettingsBuilder_ != null || textToSpeechSettings_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -1907,11 +1927,11 @@ public Builder setTextToSpeechSettings(
           throw new NullPointerException();
         }
         textToSpeechSettings_ = value;
-        onChanged();
       } else {
         textToSpeechSettingsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1929,11 +1949,11 @@ public Builder setTextToSpeechSettings(
         com.google.cloud.dialogflow.v2beta1.TextToSpeechSettings.Builder builderForValue) {
       if (textToSpeechSettingsBuilder_ == null) {
         textToSpeechSettings_ = builderForValue.build();
-        onChanged();
       } else {
         textToSpeechSettingsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1950,20 +1970,19 @@ public Builder setTextToSpeechSettings(
     public Builder mergeTextToSpeechSettings(
         com.google.cloud.dialogflow.v2beta1.TextToSpeechSettings value) {
       if (textToSpeechSettingsBuilder_ == null) {
-        if (textToSpeechSettings_ != null) {
-          textToSpeechSettings_ =
-              com.google.cloud.dialogflow.v2beta1.TextToSpeechSettings.newBuilder(
-                      textToSpeechSettings_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && textToSpeechSettings_ != null
+            && textToSpeechSettings_
+                != com.google.cloud.dialogflow.v2beta1.TextToSpeechSettings.getDefaultInstance()) {
+          getTextToSpeechSettingsBuilder().mergeFrom(value);
         } else {
           textToSpeechSettings_ = value;
         }
-        onChanged();
       } else {
         textToSpeechSettingsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1978,14 +1997,13 @@ public Builder mergeTextToSpeechSettings(
      * </code>
      */
     public Builder clearTextToSpeechSettings() {
-      if (textToSpeechSettingsBuilder_ == null) {
-        textToSpeechSettings_ = null;
-        onChanged();
-      } else {
-        textToSpeechSettings_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      textToSpeechSettings_ = null;
+      if (textToSpeechSettingsBuilder_ != null) {
+        textToSpeechSettingsBuilder_.dispose();
         textToSpeechSettingsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2001,7 +2019,7 @@ public Builder clearTextToSpeechSettings() {
      */
     public com.google.cloud.dialogflow.v2beta1.TextToSpeechSettings.Builder
         getTextToSpeechSettingsBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getTextToSpeechSettingsFieldBuilder().getBuilder();
     }
@@ -2074,7 +2092,7 @@ public Builder clearTextToSpeechSettings() {
      * @return Whether the fulfillment field is set.
      */
     public boolean hasFulfillment() {
-      return fulfillmentBuilder_ != null || fulfillment_ != null;
+      return ((bitField0_ & 0x00000040) != 0);
     }
     /**
      *
@@ -2115,11 +2133,11 @@ public Builder setFulfillment(com.google.cloud.dialogflow.v2beta1.Fulfillment va
           throw new NullPointerException();
         }
         fulfillment_ = value;
-        onChanged();
       } else {
         fulfillmentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2137,11 +2155,11 @@ public Builder setFulfillment(
         com.google.cloud.dialogflow.v2beta1.Fulfillment.Builder builderForValue) {
       if (fulfillmentBuilder_ == null) {
         fulfillment_ = builderForValue.build();
-        onChanged();
       } else {
         fulfillmentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2157,19 +2175,19 @@ public Builder setFulfillment(
      */
     public Builder mergeFulfillment(com.google.cloud.dialogflow.v2beta1.Fulfillment value) {
       if (fulfillmentBuilder_ == null) {
-        if (fulfillment_ != null) {
-          fulfillment_ =
-              com.google.cloud.dialogflow.v2beta1.Fulfillment.newBuilder(fulfillment_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000040) != 0)
+            && fulfillment_ != null
+            && fulfillment_
+                != com.google.cloud.dialogflow.v2beta1.Fulfillment.getDefaultInstance()) {
+          getFulfillmentBuilder().mergeFrom(value);
         } else {
           fulfillment_ = value;
         }
-        onChanged();
       } else {
         fulfillmentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2184,14 +2202,13 @@ public Builder mergeFulfillment(com.google.cloud.dialogflow.v2beta1.Fulfillment
      * </code>
      */
     public Builder clearFulfillment() {
-      if (fulfillmentBuilder_ == null) {
-        fulfillment_ = null;
-        onChanged();
-      } else {
-        fulfillment_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      fulfillment_ = null;
+      if (fulfillmentBuilder_ != null) {
+        fulfillmentBuilder_.dispose();
         fulfillmentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2206,7 +2223,7 @@ public Builder clearFulfillment() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Fulfillment.Builder getFulfillmentBuilder() {
-
+      bitField0_ |= 0x00000040;
       onChanged();
       return getFulfillmentFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentHistory.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentHistory.java
index a425b2331bd2..830c514e1c95 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentHistory.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentHistory.java
@@ -210,7 +210,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int AGENT_VERSION_FIELD_NUMBER = 1;
-    private volatile java.lang.Object agentVersion_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object agentVersion_ = "";
     /**
      *
      *
@@ -259,7 +261,9 @@ public com.google.protobuf.ByteString getAgentVersionBytes() {
     }
 
     public static final int DESCRIPTION_FIELD_NUMBER = 2;
-    private volatile java.lang.Object description_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object description_ = "";
     /**
      *
      *
@@ -350,7 +354,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-      return getCreateTime();
+      return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -576,14 +580,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         agentVersion_ = "";
-
         description_ = "";
-
-        if (createTimeBuilder_ == null) {
-          createTime_ = null;
-        } else {
-          createTime_ = null;
+        createTime_ = null;
+        if (createTimeBuilder_ != null) {
+          createTimeBuilder_.dispose();
           createTimeBuilder_ = null;
         }
         return this;
@@ -614,17 +616,28 @@ public com.google.cloud.dialogflow.v2beta1.EnvironmentHistory.Entry build() {
       public com.google.cloud.dialogflow.v2beta1.EnvironmentHistory.Entry buildPartial() {
         com.google.cloud.dialogflow.v2beta1.EnvironmentHistory.Entry result =
             new com.google.cloud.dialogflow.v2beta1.EnvironmentHistory.Entry(this);
-        result.agentVersion_ = agentVersion_;
-        result.description_ = description_;
-        if (createTimeBuilder_ == null) {
-          result.createTime_ = createTime_;
-        } else {
-          result.createTime_ = createTimeBuilder_.build();
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2beta1.EnvironmentHistory.Entry result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.agentVersion_ = agentVersion_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.description_ = description_;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.createTime_ =
+              createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -676,10 +689,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.EnvironmentHistory.
           return this;
         if (!other.getAgentVersion().isEmpty()) {
           agentVersion_ = other.agentVersion_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getDescription().isEmpty()) {
           description_ = other.description_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasCreateTime()) {
@@ -714,19 +729,19 @@ public Builder mergeFrom(
               case 10:
                 {
                   agentVersion_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
                 {
                   description_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 18
               case 26:
                 {
                   input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000004;
                   break;
                 } // case 26
               default:
@@ -746,6 +761,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object agentVersion_ = "";
       /**
        *
@@ -807,8 +824,8 @@ public Builder setAgentVersion(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         agentVersion_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -824,8 +841,8 @@ public Builder setAgentVersion(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearAgentVersion() {
-
         agentVersion_ = getDefaultInstance().getAgentVersion();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -846,8 +863,8 @@ public Builder setAgentVersionBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         agentVersion_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -913,8 +930,8 @@ public Builder setDescription(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         description_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -930,8 +947,8 @@ public Builder setDescription(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearDescription() {
-
         description_ = getDefaultInstance().getDescription();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -952,8 +969,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         description_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -976,7 +993,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
        * @return Whether the createTime field is set.
        */
       public boolean hasCreateTime() {
-        return createTimeBuilder_ != null || createTime_ != null;
+        return ((bitField0_ & 0x00000004) != 0);
       }
       /**
        *
@@ -1013,11 +1030,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           createTime_ = value;
-          onChanged();
         } else {
           createTimeBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -1032,11 +1049,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
       public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
         if (createTimeBuilder_ == null) {
           createTime_ = builderForValue.build();
-          onChanged();
         } else {
           createTimeBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -1050,19 +1067,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
        */
       public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
         if (createTimeBuilder_ == null) {
-          if (createTime_ != null) {
-            createTime_ =
-                com.google.protobuf.Timestamp.newBuilder(createTime_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000004) != 0)
+              && createTime_ != null
+              && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+            getCreateTimeBuilder().mergeFrom(value);
           } else {
             createTime_ = value;
           }
-          onChanged();
         } else {
           createTimeBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -1075,14 +1091,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
        * <code>.google.protobuf.Timestamp create_time = 3;</code>
        */
       public Builder clearCreateTime() {
-        if (createTimeBuilder_ == null) {
-          createTime_ = null;
-          onChanged();
-        } else {
-          createTime_ = null;
+        bitField0_ = (bitField0_ & ~0x00000004);
+        createTime_ = null;
+        if (createTimeBuilder_ != null) {
+          createTimeBuilder_.dispose();
           createTimeBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -1095,7 +1110,7 @@ public Builder clearCreateTime() {
        * <code>.google.protobuf.Timestamp create_time = 3;</code>
        */
       public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+        bitField0_ |= 0x00000004;
         onChanged();
         return getCreateTimeFieldBuilder().getBuilder();
       }
@@ -1211,7 +1226,9 @@ public com.google.protobuf.Parser<Entry> getParserForType() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -1268,6 +1285,8 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int ENTRIES_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.EnvironmentHistory.Entry> entries_;
   /**
    *
@@ -1355,7 +1374,9 @@ public com.google.cloud.dialogflow.v2beta1.EnvironmentHistory.EntryOrBuilder get
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -1623,17 +1644,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       if (entriesBuilder_ == null) {
         entries_ = java.util.Collections.emptyList();
       } else {
         entries_ = null;
         entriesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -1661,20 +1681,35 @@ public com.google.cloud.dialogflow.v2beta1.EnvironmentHistory build() {
     public com.google.cloud.dialogflow.v2beta1.EnvironmentHistory buildPartial() {
       com.google.cloud.dialogflow.v2beta1.EnvironmentHistory result =
           new com.google.cloud.dialogflow.v2beta1.EnvironmentHistory(this);
-      int from_bitField0_ = bitField0_;
-      result.parent_ = parent_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.EnvironmentHistory result) {
       if (entriesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           entries_ = java.util.Collections.unmodifiableList(entries_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.entries_ = entries_;
       } else {
         result.entries_ = entriesBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.EnvironmentHistory result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -1725,13 +1760,14 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.EnvironmentHistory
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (entriesBuilder_ == null) {
         if (!other.entries_.isEmpty()) {
           if (entries_.isEmpty()) {
             entries_ = other.entries_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureEntriesIsMutable();
             entries_.addAll(other.entries_);
@@ -1744,7 +1780,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.EnvironmentHistory
             entriesBuilder_.dispose();
             entriesBuilder_ = null;
             entries_ = other.entries_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             entriesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getEntriesFieldBuilder()
@@ -1756,6 +1792,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.EnvironmentHistory
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -1787,7 +1824,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -1807,7 +1844,7 @@ public Builder mergeFrom(
             case 26:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -1902,8 +1939,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1923,8 +1960,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1949,8 +1986,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1959,11 +1996,11 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureEntriesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         entries_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.EnvironmentHistory.Entry>(
                 entries_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -2218,7 +2255,7 @@ public Builder addAllEntries(
     public Builder clearEntries() {
       if (entriesBuilder_ == null) {
         entries_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         entriesBuilder_.clear();
@@ -2369,7 +2406,7 @@ public com.google.cloud.dialogflow.v2beta1.EnvironmentHistory.Entry.Builder addE
                 com.google.cloud.dialogflow.v2beta1.EnvironmentHistory.Entry,
                 com.google.cloud.dialogflow.v2beta1.EnvironmentHistory.Entry.Builder,
                 com.google.cloud.dialogflow.v2beta1.EnvironmentHistory.EntryOrBuilder>(
-                entries_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                entries_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         entries_ = null;
       }
       return entriesBuilder_;
@@ -2439,8 +2476,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2457,8 +2494,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -2480,8 +2517,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EventInput.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EventInput.java
index 776b2aa132cc..5b3c9a157d23 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EventInput.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EventInput.java
@@ -73,7 +73,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -203,11 +205,13 @@ public com.google.protobuf.Struct getParameters() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getParametersOrBuilder() {
-    return getParameters();
+    return parameters_ == null ? com.google.protobuf.Struct.getDefaultInstance() : parameters_;
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -493,16 +497,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
-      if (parametersBuilder_ == null) {
-        parameters_ = null;
-      } else {
-        parameters_ = null;
+      parameters_ = null;
+      if (parametersBuilder_ != null) {
+        parametersBuilder_.dispose();
         parametersBuilder_ = null;
       }
       languageCode_ = "";
-
       return this;
     }
 
@@ -530,17 +532,26 @@ public com.google.cloud.dialogflow.v2beta1.EventInput build() {
     public com.google.cloud.dialogflow.v2beta1.EventInput buildPartial() {
       com.google.cloud.dialogflow.v2beta1.EventInput result =
           new com.google.cloud.dialogflow.v2beta1.EventInput(this);
-      result.name_ = name_;
-      if (parametersBuilder_ == null) {
-        result.parameters_ = parameters_;
-      } else {
-        result.parameters_ = parametersBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.languageCode_ = languageCode_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.EventInput result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.parameters_ = parametersBuilder_ == null ? parameters_ : parametersBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -588,6 +599,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.EventInput other) {
       if (other == com.google.cloud.dialogflow.v2beta1.EventInput.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasParameters()) {
@@ -595,6 +607,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.EventInput other) {
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -626,19 +639,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getParametersFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -658,6 +671,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -719,8 +734,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -736,8 +751,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -758,8 +773,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -795,7 +810,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      * @return Whether the parameters field is set.
      */
     public boolean hasParameters() {
-      return parametersBuilder_ != null || parameters_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -856,11 +871,11 @@ public Builder setParameters(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         parameters_ = value;
-        onChanged();
       } else {
         parametersBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -888,11 +903,11 @@ public Builder setParameters(com.google.protobuf.Struct value) {
     public Builder setParameters(com.google.protobuf.Struct.Builder builderForValue) {
       if (parametersBuilder_ == null) {
         parameters_ = builderForValue.build();
-        onChanged();
       } else {
         parametersBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -919,17 +934,18 @@ public Builder setParameters(com.google.protobuf.Struct.Builder builderForValue)
      */
     public Builder mergeParameters(com.google.protobuf.Struct value) {
       if (parametersBuilder_ == null) {
-        if (parameters_ != null) {
-          parameters_ =
-              com.google.protobuf.Struct.newBuilder(parameters_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && parameters_ != null
+            && parameters_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getParametersBuilder().mergeFrom(value);
         } else {
           parameters_ = value;
         }
-        onChanged();
       } else {
         parametersBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -955,14 +971,13 @@ public Builder mergeParameters(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct parameters = 2;</code>
      */
     public Builder clearParameters() {
-      if (parametersBuilder_ == null) {
-        parameters_ = null;
-        onChanged();
-      } else {
-        parameters_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      parameters_ = null;
+      if (parametersBuilder_ != null) {
+        parametersBuilder_.dispose();
         parametersBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -988,7 +1003,7 @@ public Builder clearParameters() {
      * <code>.google.protobuf.Struct parameters = 2;</code>
      */
     public com.google.protobuf.Struct.Builder getParametersBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getParametersFieldBuilder().getBuilder();
     }
@@ -1142,8 +1157,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1166,8 +1181,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1195,8 +1210,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentRequest.java
index 43908cfc6675..d119627a2f8c 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -126,7 +128,9 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int AGENT_URI_FIELD_NUMBER = 2;
-  private volatile java.lang.Object agentUri_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object agentUri_ = "";
   /**
    *
    *
@@ -399,10 +403,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       agentUri_ = "";
-
       return this;
     }
 
@@ -430,12 +433,23 @@ public com.google.cloud.dialogflow.v2beta1.ExportAgentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.ExportAgentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ExportAgentRequest result =
           new com.google.cloud.dialogflow.v2beta1.ExportAgentRequest(this);
-      result.parent_ = parent_;
-      result.agentUri_ = agentUri_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ExportAgentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.agentUri_ = agentUri_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -484,10 +498,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ExportAgentRequest
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getAgentUri().isEmpty()) {
         agentUri_ = other.agentUri_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -519,13 +535,13 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 agentUri_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -545,6 +561,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -618,8 +636,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -639,8 +657,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -665,8 +683,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -759,8 +777,8 @@ public Builder setAgentUri(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       agentUri_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -785,8 +803,8 @@ public Builder setAgentUri(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAgentUri() {
-
       agentUri_ = getDefaultInstance().getAgentUri();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -816,8 +834,8 @@ public Builder setAgentUriBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       agentUri_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentResponse.java
index a2814a382854..5eccced6785f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentResponse.java
@@ -446,6 +446,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       agentCase_ = 0;
       agent_ = null;
       return this;
@@ -475,17 +476,24 @@ public com.google.cloud.dialogflow.v2beta1.ExportAgentResponse build() {
     public com.google.cloud.dialogflow.v2beta1.ExportAgentResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ExportAgentResponse result =
           new com.google.cloud.dialogflow.v2beta1.ExportAgentResponse(this);
-      if (agentCase_ == 1) {
-        result.agent_ = agent_;
-      }
-      if (agentCase_ == 2) {
-        result.agent_ = agent_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.agentCase_ = agentCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ExportAgentResponse result) {
+      int from_bitField0_ = bitField0_;
+    }
+
+    private void buildPartialOneofs(
+        com.google.cloud.dialogflow.v2beta1.ExportAgentResponse result) {
+      result.agentCase_ = agentCase_;
+      result.agent_ = this.agent_;
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -620,6 +628,8 @@ public Builder clearAgent() {
       return this;
     }
 
+    private int bitField0_;
+
     /**
      *
      *
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportOperationMetadata.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportOperationMetadata.java
index 0b471f506e1e..9eb96c5531e9 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportOperationMetadata.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportOperationMetadata.java
@@ -111,7 +111,9 @@ public com.google.cloud.dialogflow.v2beta1.GcsDestination getExportedGcsDestinat
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.GcsDestinationOrBuilder
       getExportedGcsDestinationOrBuilder() {
-    return getExportedGcsDestination();
+    return exportedGcsDestination_ == null
+        ? com.google.cloud.dialogflow.v2beta1.GcsDestination.getDefaultInstance()
+        : exportedGcsDestination_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -318,10 +320,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (exportedGcsDestinationBuilder_ == null) {
-        exportedGcsDestination_ = null;
-      } else {
-        exportedGcsDestination_ = null;
+      bitField0_ = 0;
+      exportedGcsDestination_ = null;
+      if (exportedGcsDestinationBuilder_ != null) {
+        exportedGcsDestinationBuilder_.dispose();
         exportedGcsDestinationBuilder_ = null;
       }
       return this;
@@ -351,15 +353,23 @@ public com.google.cloud.dialogflow.v2beta1.ExportOperationMetadata build() {
     public com.google.cloud.dialogflow.v2beta1.ExportOperationMetadata buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ExportOperationMetadata result =
           new com.google.cloud.dialogflow.v2beta1.ExportOperationMetadata(this);
-      if (exportedGcsDestinationBuilder_ == null) {
-        result.exportedGcsDestination_ = exportedGcsDestination_;
-      } else {
-        result.exportedGcsDestination_ = exportedGcsDestinationBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ExportOperationMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.exportedGcsDestination_ =
+            exportedGcsDestinationBuilder_ == null
+                ? exportedGcsDestination_
+                : exportedGcsDestinationBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -439,7 +449,7 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getExportedGcsDestinationFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -459,6 +469,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2beta1.GcsDestination exportedGcsDestination_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.GcsDestination,
@@ -477,7 +489,7 @@ public Builder mergeFrom(
      * @return Whether the exportedGcsDestination field is set.
      */
     public boolean hasExportedGcsDestination() {
-      return exportedGcsDestinationBuilder_ != null || exportedGcsDestination_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -515,11 +527,11 @@ public Builder setExportedGcsDestination(
           throw new NullPointerException();
         }
         exportedGcsDestination_ = value;
-        onChanged();
       } else {
         exportedGcsDestinationBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -535,11 +547,11 @@ public Builder setExportedGcsDestination(
         com.google.cloud.dialogflow.v2beta1.GcsDestination.Builder builderForValue) {
       if (exportedGcsDestinationBuilder_ == null) {
         exportedGcsDestination_ = builderForValue.build();
-        onChanged();
       } else {
         exportedGcsDestinationBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -554,19 +566,19 @@ public Builder setExportedGcsDestination(
     public Builder mergeExportedGcsDestination(
         com.google.cloud.dialogflow.v2beta1.GcsDestination value) {
       if (exportedGcsDestinationBuilder_ == null) {
-        if (exportedGcsDestination_ != null) {
-          exportedGcsDestination_ =
-              com.google.cloud.dialogflow.v2beta1.GcsDestination.newBuilder(exportedGcsDestination_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && exportedGcsDestination_ != null
+            && exportedGcsDestination_
+                != com.google.cloud.dialogflow.v2beta1.GcsDestination.getDefaultInstance()) {
+          getExportedGcsDestinationBuilder().mergeFrom(value);
         } else {
           exportedGcsDestination_ = value;
         }
-        onChanged();
       } else {
         exportedGcsDestinationBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -579,14 +591,13 @@ public Builder mergeExportedGcsDestination(
      * <code>.google.cloud.dialogflow.v2beta1.GcsDestination exported_gcs_destination = 1;</code>
      */
     public Builder clearExportedGcsDestination() {
-      if (exportedGcsDestinationBuilder_ == null) {
-        exportedGcsDestination_ = null;
-        onChanged();
-      } else {
-        exportedGcsDestination_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      exportedGcsDestination_ = null;
+      if (exportedGcsDestinationBuilder_ != null) {
+        exportedGcsDestinationBuilder_.dispose();
         exportedGcsDestinationBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -600,7 +611,7 @@ public Builder clearExportedGcsDestination() {
      */
     public com.google.cloud.dialogflow.v2beta1.GcsDestination.Builder
         getExportedGcsDestinationBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getExportedGcsDestinationFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/FaqAnswer.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/FaqAnswer.java
index 95444ffc22bb..4d2eba4749f3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/FaqAnswer.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/FaqAnswer.java
@@ -82,7 +82,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   }
 
   public static final int ANSWER_FIELD_NUMBER = 1;
-  private volatile java.lang.Object answer_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object answer_ = "";
   /**
    *
    *
@@ -131,7 +133,7 @@ public com.google.protobuf.ByteString getAnswerBytes() {
   }
 
   public static final int CONFIDENCE_FIELD_NUMBER = 2;
-  private float confidence_;
+  private float confidence_ = 0F;
   /**
    *
    *
@@ -151,7 +153,9 @@ public float getConfidence() {
   }
 
   public static final int QUESTION_FIELD_NUMBER = 3;
-  private volatile java.lang.Object question_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object question_ = "";
   /**
    *
    *
@@ -200,7 +204,9 @@ public com.google.protobuf.ByteString getQuestionBytes() {
   }
 
   public static final int SOURCE_FIELD_NUMBER = 4;
-  private volatile java.lang.Object source_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object source_ = "";
   /**
    *
    *
@@ -267,6 +273,7 @@ private static final class MetadataDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> metadata_;
 
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> internalGetMetadata() {
@@ -327,8 +334,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
    * <code>map&lt;string, string&gt; metadata = 5;</code>
    */
   @java.lang.Override
-  public java.lang.String getMetadataOrDefault(
-      java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getMetadataOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -358,7 +367,9 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
   }
 
   public static final int ANSWER_RECORD_FIELD_NUMBER = 6;
-  private volatile java.lang.Object answerRecord_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object answerRecord_ = "";
   /**
    *
    *
@@ -681,17 +692,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       answer_ = "";
-
       confidence_ = 0F;
-
       question_ = "";
-
       source_ = "";
-
       internalGetMutableMetadata().clear();
       answerRecord_ = "";
-
       return this;
     }
 
@@ -719,18 +726,36 @@ public com.google.cloud.dialogflow.v2beta1.FaqAnswer build() {
     public com.google.cloud.dialogflow.v2beta1.FaqAnswer buildPartial() {
       com.google.cloud.dialogflow.v2beta1.FaqAnswer result =
           new com.google.cloud.dialogflow.v2beta1.FaqAnswer(this);
-      int from_bitField0_ = bitField0_;
-      result.answer_ = answer_;
-      result.confidence_ = confidence_;
-      result.question_ = question_;
-      result.source_ = source_;
-      result.metadata_ = internalGetMetadata();
-      result.metadata_.makeImmutable();
-      result.answerRecord_ = answerRecord_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.FaqAnswer result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.answer_ = answer_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.confidence_ = confidence_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.question_ = question_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.source_ = source_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.metadata_ = internalGetMetadata();
+        result.metadata_.makeImmutable();
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.answerRecord_ = answerRecord_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -778,6 +803,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.FaqAnswer other) {
       if (other == com.google.cloud.dialogflow.v2beta1.FaqAnswer.getDefaultInstance()) return this;
       if (!other.getAnswer().isEmpty()) {
         answer_ = other.answer_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getConfidence() != 0F) {
@@ -785,15 +811,19 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.FaqAnswer other) {
       }
       if (!other.getQuestion().isEmpty()) {
         question_ = other.question_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getSource().isEmpty()) {
         source_ = other.source_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       internalGetMutableMetadata().mergeFrom(other.internalGetMetadata());
+      bitField0_ |= 0x00000010;
       if (!other.getAnswerRecord().isEmpty()) {
         answerRecord_ = other.answerRecord_;
+        bitField0_ |= 0x00000020;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -825,25 +855,25 @@ public Builder mergeFrom(
             case 10:
               {
                 answer_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 21:
               {
                 confidence_ = input.readFloat();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 21
             case 26:
               {
                 question_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 source_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 42:
@@ -855,12 +885,13 @@ public Builder mergeFrom(
                 internalGetMutableMetadata()
                     .getMutableMap()
                     .put(metadata__.getKey(), metadata__.getValue());
+                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             case 50:
               {
                 answerRecord_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 50
             default:
@@ -943,8 +974,8 @@ public Builder setAnswer(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       answer_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -960,8 +991,8 @@ public Builder setAnswer(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAnswer() {
-
       answer_ = getDefaultInstance().getAnswer();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -982,8 +1013,8 @@ public Builder setAnswerBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       answer_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1023,6 +1054,7 @@ public float getConfidence() {
     public Builder setConfidence(float value) {
 
       confidence_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1040,7 +1072,7 @@ public Builder setConfidence(float value) {
      * @return This builder for chaining.
      */
     public Builder clearConfidence() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       confidence_ = 0F;
       onChanged();
       return this;
@@ -1107,8 +1139,8 @@ public Builder setQuestion(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       question_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1124,8 +1156,8 @@ public Builder setQuestion(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearQuestion() {
-
       question_ = getDefaultInstance().getQuestion();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1146,8 +1178,8 @@ public Builder setQuestionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       question_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1222,8 +1254,8 @@ public Builder setSource(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       source_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1242,8 +1274,8 @@ public Builder setSource(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSource() {
-
       source_ = getDefaultInstance().getSource();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1267,8 +1299,8 @@ public Builder setSourceBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       source_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1284,8 +1316,6 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
         internalGetMutableMetadata() {
-      onChanged();
-      ;
       if (metadata_ == null) {
         metadata_ =
             com.google.protobuf.MapField.newMapField(MetadataDefaultEntryHolder.defaultEntry);
@@ -1293,6 +1323,8 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
       if (!metadata_.isMutable()) {
         metadata_ = metadata_.copy();
       }
+      bitField0_ |= 0x00000010;
+      onChanged();
       return metadata_;
     }
 
@@ -1347,8 +1379,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
      * <code>map&lt;string, string&gt; metadata = 5;</code>
      */
     @java.lang.Override
-    public java.lang.String getMetadataOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getMetadataOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1378,6 +1412,7 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
     }
 
     public Builder clearMetadata() {
+      bitField0_ = (bitField0_ & ~0x00000010);
       internalGetMutableMetadata().getMutableMap().clear();
       return this;
     }
@@ -1401,6 +1436,7 @@ public Builder removeMetadata(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMutableMetadata() {
+      bitField0_ |= 0x00000010;
       return internalGetMutableMetadata().getMutableMap();
     }
     /**
@@ -1420,8 +1456,8 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableMetadata().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000010;
       return this;
     }
     /**
@@ -1436,6 +1472,7 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllMetadata(java.util.Map<java.lang.String, java.lang.String> values) {
       internalGetMutableMetadata().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000010;
       return this;
     }
 
@@ -1506,8 +1543,8 @@ public Builder setAnswerRecord(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       answerRecord_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1525,8 +1562,8 @@ public Builder setAnswerRecord(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAnswerRecord() {
-
       answerRecord_ = getDefaultInstance().getAnswerRecord();
+      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -1549,8 +1586,8 @@ public Builder setAnswerRecordBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       answerRecord_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/FaqAnswerOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/FaqAnswerOrBuilder.java
index 63102ed82806..bef84380edc9 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/FaqAnswerOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/FaqAnswerOrBuilder.java
@@ -165,7 +165,6 @@ public interface FaqAnswerOrBuilder
    *
    * <code>map&lt;string, string&gt; metadata = 5;</code>
    */
-
   /* nullable */
   java.lang.String getMetadataOrDefault(
       java.lang.String key,
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Fulfillment.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Fulfillment.java
index f071358236b0..f65f3bf01174 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Fulfillment.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Fulfillment.java
@@ -201,7 +201,6 @@ public interface GenericWebServiceOrBuilder
      *
      * <code>map&lt;string, string&gt; request_headers = 4;</code>
      */
-
     /* nullable */
     java.lang.String getRequestHeadersOrDefault(
         java.lang.String key,
@@ -307,7 +306,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
     }
 
     public static final int URI_FIELD_NUMBER = 1;
-    private volatile java.lang.Object uri_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object uri_ = "";
     /**
      *
      *
@@ -358,7 +359,9 @@ public com.google.protobuf.ByteString getUriBytes() {
     }
 
     public static final int USERNAME_FIELD_NUMBER = 2;
-    private volatile java.lang.Object username_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object username_ = "";
     /**
      *
      *
@@ -407,7 +410,9 @@ public com.google.protobuf.ByteString getUsernameBytes() {
     }
 
     public static final int PASSWORD_FIELD_NUMBER = 3;
-    private volatile java.lang.Object password_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object password_ = "";
     /**
      *
      *
@@ -468,6 +473,7 @@ private static final class RequestHeadersDefaultEntryHolder {
               "");
     }
 
+    @SuppressWarnings("serial")
     private com.google.protobuf.MapField<java.lang.String, java.lang.String> requestHeaders_;
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
@@ -527,8 +533,10 @@ public java.util.Map<java.lang.String, java.lang.String> getRequestHeadersMap()
      * <code>map&lt;string, string&gt; request_headers = 4;</code>
      */
     @java.lang.Override
-    public java.lang.String getRequestHeadersOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getRequestHeadersOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -557,7 +565,7 @@ public java.lang.String getRequestHeadersOrThrow(java.lang.String key) {
     }
 
     public static final int IS_CLOUD_FUNCTION_FIELD_NUMBER = 5;
-    private boolean isCloudFunction_;
+    private boolean isCloudFunction_ = false;
     /**
      *
      *
@@ -853,15 +861,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         uri_ = "";
-
         username_ = "";
-
         password_ = "";
-
         internalGetMutableRequestHeaders().clear();
         isCloudFunction_ = false;
-
         return this;
       }
 
@@ -891,17 +896,34 @@ public com.google.cloud.dialogflow.v2beta1.Fulfillment.GenericWebService build()
       public com.google.cloud.dialogflow.v2beta1.Fulfillment.GenericWebService buildPartial() {
         com.google.cloud.dialogflow.v2beta1.Fulfillment.GenericWebService result =
             new com.google.cloud.dialogflow.v2beta1.Fulfillment.GenericWebService(this);
-        int from_bitField0_ = bitField0_;
-        result.uri_ = uri_;
-        result.username_ = username_;
-        result.password_ = password_;
-        result.requestHeaders_ = internalGetRequestHeaders();
-        result.requestHeaders_.makeImmutable();
-        result.isCloudFunction_ = isCloudFunction_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2beta1.Fulfillment.GenericWebService result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.uri_ = uri_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.username_ = username_;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.password_ = password_;
+        }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.requestHeaders_ = internalGetRequestHeaders();
+          result.requestHeaders_.makeImmutable();
+        }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.isCloudFunction_ = isCloudFunction_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -955,17 +977,21 @@ public Builder mergeFrom(
                 .getDefaultInstance()) return this;
         if (!other.getUri().isEmpty()) {
           uri_ = other.uri_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getUsername().isEmpty()) {
           username_ = other.username_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (!other.getPassword().isEmpty()) {
           password_ = other.password_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
         internalGetMutableRequestHeaders().mergeFrom(other.internalGetRequestHeaders());
+        bitField0_ |= 0x00000008;
         if (other.getIsCloudFunction() != false) {
           setIsCloudFunction(other.getIsCloudFunction());
         }
@@ -998,19 +1024,19 @@ public Builder mergeFrom(
               case 10:
                 {
                   uri_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
                 {
                   username_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 18
               case 26:
                 {
                   password_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000004;
                   break;
                 } // case 26
               case 34:
@@ -1023,12 +1049,13 @@ public Builder mergeFrom(
                   internalGetMutableRequestHeaders()
                       .getMutableMap()
                       .put(requestHeaders__.getKey(), requestHeaders__.getValue());
+                  bitField0_ |= 0x00000008;
                   break;
                 } // case 34
               case 40:
                 {
                   isCloudFunction_ = input.readBool();
-
+                  bitField0_ |= 0x00000010;
                   break;
                 } // case 40
               default:
@@ -1114,8 +1141,8 @@ public Builder setUri(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         uri_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1132,8 +1159,8 @@ public Builder setUri(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearUri() {
-
         uri_ = getDefaultInstance().getUri();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1155,8 +1182,8 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         uri_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1222,8 +1249,8 @@ public Builder setUsername(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         username_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1239,8 +1266,8 @@ public Builder setUsername(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearUsername() {
-
         username_ = getDefaultInstance().getUsername();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1261,8 +1288,8 @@ public Builder setUsernameBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         username_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1328,8 +1355,8 @@ public Builder setPassword(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         password_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1345,8 +1372,8 @@ public Builder setPassword(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearPassword() {
-
         password_ = getDefaultInstance().getPassword();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -1367,8 +1394,8 @@ public Builder setPasswordBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         password_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1386,8 +1413,6 @@ public Builder setPasswordBytes(com.google.protobuf.ByteString value) {
 
       private com.google.protobuf.MapField<java.lang.String, java.lang.String>
           internalGetMutableRequestHeaders() {
-        onChanged();
-        ;
         if (requestHeaders_ == null) {
           requestHeaders_ =
               com.google.protobuf.MapField.newMapField(
@@ -1396,6 +1421,8 @@ public Builder setPasswordBytes(com.google.protobuf.ByteString value) {
         if (!requestHeaders_.isMutable()) {
           requestHeaders_ = requestHeaders_.copy();
         }
+        bitField0_ |= 0x00000008;
+        onChanged();
         return requestHeaders_;
       }
 
@@ -1447,8 +1474,10 @@ public java.util.Map<java.lang.String, java.lang.String> getRequestHeadersMap()
        * <code>map&lt;string, string&gt; request_headers = 4;</code>
        */
       @java.lang.Override
-      public java.lang.String getRequestHeadersOrDefault(
-          java.lang.String key, java.lang.String defaultValue) {
+      public /* nullable */ java.lang.String getRequestHeadersOrDefault(
+          java.lang.String key,
+          /* nullable */
+          java.lang.String defaultValue) {
         if (key == null) {
           throw new NullPointerException("map key");
         }
@@ -1479,6 +1508,7 @@ public java.lang.String getRequestHeadersOrThrow(java.lang.String key) {
       }
 
       public Builder clearRequestHeaders() {
+        bitField0_ = (bitField0_ & ~0x00000008);
         internalGetMutableRequestHeaders().getMutableMap().clear();
         return this;
       }
@@ -1501,6 +1531,7 @@ public Builder removeRequestHeaders(java.lang.String key) {
       /** Use alternate mutation accessors instead. */
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, java.lang.String> getMutableRequestHeaders() {
+        bitField0_ |= 0x00000008;
         return internalGetMutableRequestHeaders().getMutableMap();
       }
       /**
@@ -1519,8 +1550,8 @@ public Builder putRequestHeaders(java.lang.String key, java.lang.String value) {
         if (value == null) {
           throw new NullPointerException("map value");
         }
-
         internalGetMutableRequestHeaders().getMutableMap().put(key, value);
+        bitField0_ |= 0x00000008;
         return this;
       }
       /**
@@ -1535,6 +1566,7 @@ public Builder putRequestHeaders(java.lang.String key, java.lang.String value) {
       public Builder putAllRequestHeaders(
           java.util.Map<java.lang.String, java.lang.String> values) {
         internalGetMutableRequestHeaders().getMutableMap().putAll(values);
+        bitField0_ |= 0x00000008;
         return this;
       }
 
@@ -1585,6 +1617,7 @@ public boolean getIsCloudFunction() {
       public Builder setIsCloudFunction(boolean value) {
 
         isCloudFunction_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1608,7 +1641,7 @@ public Builder setIsCloudFunction(boolean value) {
        */
       @java.lang.Deprecated
       public Builder clearIsCloudFunction() {
-
+        bitField0_ = (bitField0_ & ~0x00000010);
         isCloudFunction_ = false;
         onChanged();
         return this;
@@ -1898,7 +1931,7 @@ private Type(int value) {
     }
 
     public static final int TYPE_FIELD_NUMBER = 1;
-    private int type_;
+    private int type_ = 0;
     /**
      *
      *
@@ -1927,9 +1960,8 @@ public int getTypeValue() {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature.Type result =
-          com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature.Type.valueOf(type_);
+          com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature.Type.forNumber(type_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature.Type.UNRECOGNIZED
           : result;
@@ -2139,8 +2171,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         type_ = 0;
-
         return this;
       }
 
@@ -2168,11 +2200,20 @@ public com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature build() {
       public com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature buildPartial() {
         com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature result =
             new com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature(this);
-        result.type_ = type_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.type_ = type_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -2253,7 +2294,7 @@ public Builder mergeFrom(
               case 8:
                 {
                   type_ = input.readEnum();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 8
               default:
@@ -2273,6 +2314,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private int type_ = 0;
       /**
        *
@@ -2302,8 +2345,8 @@ public int getTypeValue() {
        * @return This builder for chaining.
        */
       public Builder setTypeValue(int value) {
-
         type_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2320,9 +2363,8 @@ public Builder setTypeValue(int value) {
        */
       @java.lang.Override
       public com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature.Type getType() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature.Type result =
-            com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature.Type.valueOf(type_);
+            com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature.Type.forNumber(type_);
         return result == null
             ? com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature.Type.UNRECOGNIZED
             : result;
@@ -2343,7 +2385,7 @@ public Builder setType(com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature.T
         if (value == null) {
           throw new NullPointerException();
         }
-
+        bitField0_ |= 0x00000001;
         type_ = value.getNumber();
         onChanged();
         return this;
@@ -2360,7 +2402,7 @@ public Builder setType(com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature.T
        * @return This builder for chaining.
        */
       public Builder clearType() {
-
+        bitField0_ = (bitField0_ & ~0x00000001);
         type_ = 0;
         onChanged();
         return this;
@@ -2475,7 +2517,9 @@ public FulfillmentCase getFulfillmentCase() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -2532,7 +2576,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
@@ -2638,7 +2684,7 @@ public com.google.cloud.dialogflow.v2beta1.Fulfillment.GenericWebService getGene
   }
 
   public static final int ENABLED_FIELD_NUMBER = 4;
-  private boolean enabled_;
+  private boolean enabled_ = false;
   /**
    *
    *
@@ -2656,6 +2702,8 @@ public boolean getEnabled() {
   }
 
   public static final int FEATURES_FIELD_NUMBER = 5;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature> features_;
   /**
    *
@@ -2984,22 +3032,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       displayName_ = "";
-
       if (genericWebServiceBuilder_ != null) {
         genericWebServiceBuilder_.clear();
       }
       enabled_ = false;
-
       if (featuresBuilder_ == null) {
         features_ = java.util.Collections.emptyList();
       } else {
         features_ = null;
         featuresBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000010);
       fulfillmentCase_ = 0;
       fulfillment_ = null;
       return this;
@@ -3029,29 +3075,47 @@ public com.google.cloud.dialogflow.v2beta1.Fulfillment build() {
     public com.google.cloud.dialogflow.v2beta1.Fulfillment buildPartial() {
       com.google.cloud.dialogflow.v2beta1.Fulfillment result =
           new com.google.cloud.dialogflow.v2beta1.Fulfillment(this);
-      int from_bitField0_ = bitField0_;
-      result.name_ = name_;
-      result.displayName_ = displayName_;
-      if (fulfillmentCase_ == 3) {
-        if (genericWebServiceBuilder_ == null) {
-          result.fulfillment_ = fulfillment_;
-        } else {
-          result.fulfillment_ = genericWebServiceBuilder_.build();
-        }
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.enabled_ = enabled_;
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.Fulfillment result) {
       if (featuresBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000010) != 0)) {
           features_ = java.util.Collections.unmodifiableList(features_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000010);
         }
         result.features_ = features_;
       } else {
         result.features_ = featuresBuilder_.build();
       }
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.Fulfillment result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.displayName_ = displayName_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.enabled_ = enabled_;
+      }
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2beta1.Fulfillment result) {
       result.fulfillmentCase_ = fulfillmentCase_;
-      onBuilt();
-      return result;
+      result.fulfillment_ = this.fulfillment_;
+      if (fulfillmentCase_ == 3 && genericWebServiceBuilder_ != null) {
+        result.fulfillment_ = genericWebServiceBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -3102,10 +3166,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Fulfillment other)
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getEnabled() != false) {
@@ -3115,7 +3181,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Fulfillment other)
         if (!other.features_.isEmpty()) {
           if (features_.isEmpty()) {
             features_ = other.features_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
             ensureFeaturesIsMutable();
             features_.addAll(other.features_);
@@ -3128,7 +3194,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Fulfillment other)
             featuresBuilder_.dispose();
             featuresBuilder_ = null;
             features_ = other.features_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
             featuresBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getFeaturesFieldBuilder()
@@ -3178,13 +3244,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 displayName_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
@@ -3197,7 +3263,7 @@ public Builder mergeFrom(
             case 32:
               {
                 enabled_ = input.readBool();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 32
             case 42:
@@ -3320,8 +3386,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -3341,8 +3407,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -3367,8 +3433,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -3437,8 +3503,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -3455,8 +3521,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
-
       displayName_ = getDefaultInstance().getDisplayName();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -3478,8 +3544,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -3712,7 +3778,6 @@ public Builder clearGenericWebService() {
       }
       fulfillmentCase_ = 3;
       onChanged();
-      ;
       return genericWebServiceBuilder_;
     }
 
@@ -3747,6 +3812,7 @@ public boolean getEnabled() {
     public Builder setEnabled(boolean value) {
 
       enabled_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -3762,7 +3828,7 @@ public Builder setEnabled(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearEnabled() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       enabled_ = false;
       onChanged();
       return this;
@@ -3772,11 +3838,11 @@ public Builder clearEnabled() {
         java.util.Collections.emptyList();
 
     private void ensureFeaturesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         features_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature>(
                 features_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000010;
       }
     }
 
@@ -3998,7 +4064,7 @@ public Builder addAllFeatures(
     public Builder clearFeatures() {
       if (featuresBuilder_ == null) {
         features_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
       } else {
         featuresBuilder_.clear();
@@ -4125,7 +4191,7 @@ public com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature.Builder addFeatur
                 com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature,
                 com.google.cloud.dialogflow.v2beta1.Fulfillment.Feature.Builder,
                 com.google.cloud.dialogflow.v2beta1.Fulfillment.FeatureOrBuilder>(
-                features_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                features_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
         features_ = null;
       }
       return featuresBuilder_;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GcsDestination.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GcsDestination.java
index ee580f8f1078..9fd693f19a35 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GcsDestination.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GcsDestination.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int URI_FIELD_NUMBER = 1;
-  private volatile java.lang.Object uri_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object uri_ = "";
   /**
    *
    *
@@ -321,8 +323,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       uri_ = "";
-
       return this;
     }
 
@@ -350,11 +352,20 @@ public com.google.cloud.dialogflow.v2beta1.GcsDestination build() {
     public com.google.cloud.dialogflow.v2beta1.GcsDestination buildPartial() {
       com.google.cloud.dialogflow.v2beta1.GcsDestination result =
           new com.google.cloud.dialogflow.v2beta1.GcsDestination(this);
-      result.uri_ = uri_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.GcsDestination result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.uri_ = uri_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -403,6 +414,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.GcsDestination othe
         return this;
       if (!other.getUri().isEmpty()) {
         uri_ = other.uri_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -434,7 +446,7 @@ public Builder mergeFrom(
             case 10:
               {
                 uri_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -454,6 +466,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object uri_ = "";
     /**
      *
@@ -527,8 +541,8 @@ public Builder setUri(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       uri_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -548,8 +562,8 @@ public Builder setUri(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearUri() {
-
       uri_ = getDefaultInstance().getUri();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -574,8 +588,8 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       uri_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GcsSource.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GcsSource.java
index a5f546d60ce1..ef3a2ceab33a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GcsSource.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GcsSource.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int URI_FIELD_NUMBER = 1;
-  private volatile java.lang.Object uri_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object uri_ = "";
   /**
    *
    *
@@ -319,8 +321,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       uri_ = "";
-
       return this;
     }
 
@@ -348,11 +350,20 @@ public com.google.cloud.dialogflow.v2beta1.GcsSource build() {
     public com.google.cloud.dialogflow.v2beta1.GcsSource buildPartial() {
       com.google.cloud.dialogflow.v2beta1.GcsSource result =
           new com.google.cloud.dialogflow.v2beta1.GcsSource(this);
-      result.uri_ = uri_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.GcsSource result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.uri_ = uri_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -400,6 +411,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.GcsSource other) {
       if (other == com.google.cloud.dialogflow.v2beta1.GcsSource.getDefaultInstance()) return this;
       if (!other.getUri().isEmpty()) {
         uri_ = other.uri_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -431,7 +443,7 @@ public Builder mergeFrom(
             case 10:
               {
                 uri_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -451,6 +463,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object uri_ = "";
     /**
      *
@@ -521,8 +535,8 @@ public Builder setUri(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       uri_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -541,8 +555,8 @@ public Builder setUri(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearUri() {
-
       uri_ = getDefaultInstance().getUri();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -566,8 +580,8 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       uri_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GcsSources.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GcsSources.java
index a969110b1fad..aecced022b28 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GcsSources.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GcsSources.java
@@ -68,6 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int URIS_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList uris_;
   /**
    *
@@ -344,6 +346,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       uris_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000001);
       return this;
@@ -373,14 +376,24 @@ public com.google.cloud.dialogflow.v2beta1.GcsSources build() {
     public com.google.cloud.dialogflow.v2beta1.GcsSources buildPartial() {
       com.google.cloud.dialogflow.v2beta1.GcsSources result =
           new com.google.cloud.dialogflow.v2beta1.GcsSources(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.cloud.dialogflow.v2beta1.GcsSources result) {
       if (((bitField0_ & 0x00000001) != 0)) {
         uris_ = uris_.getUnmodifiableView();
         bitField0_ = (bitField0_ & ~0x00000001);
       }
       result.uris_ = uris_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.GcsSources result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetAgentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetAgentRequest.java
index 09ec28007c9f..c31415c70c6a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetAgentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetAgentRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -321,8 +323,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       return this;
     }
 
@@ -350,11 +352,20 @@ public com.google.cloud.dialogflow.v2beta1.GetAgentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.GetAgentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.GetAgentRequest result =
           new com.google.cloud.dialogflow.v2beta1.GetAgentRequest(this);
-      result.parent_ = parent_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.GetAgentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -403,6 +414,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.GetAgentRequest oth
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -434,7 +446,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -454,6 +466,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -527,8 +541,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -548,8 +562,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -574,8 +588,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetAnswerRecordRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetAnswerRecordRequest.java
index 823e4798b761..0498e7b50467 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetAnswerRecordRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetAnswerRecordRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -318,8 +320,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -347,11 +349,20 @@ public com.google.cloud.dialogflow.v2beta1.GetAnswerRecordRequest build() {
     public com.google.cloud.dialogflow.v2beta1.GetAnswerRecordRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.GetAnswerRecordRequest result =
           new com.google.cloud.dialogflow.v2beta1.GetAnswerRecordRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.GetAnswerRecordRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -400,6 +411,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.GetAnswerRecordRequ
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -431,7 +443,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -451,6 +463,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -518,8 +532,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -537,8 +551,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -561,8 +575,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetContextRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetContextRequest.java
index 6c7df494de4a..2448145bb531 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetContextRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetContextRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -342,8 +344,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -371,11 +373,20 @@ public com.google.cloud.dialogflow.v2beta1.GetContextRequest build() {
     public com.google.cloud.dialogflow.v2beta1.GetContextRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.GetContextRequest result =
           new com.google.cloud.dialogflow.v2beta1.GetContextRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.GetContextRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -424,6 +435,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.GetContextRequest o
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -455,7 +467,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -475,6 +487,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -578,8 +592,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -609,8 +623,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -645,8 +659,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetConversationProfileRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetConversationProfileRequest.java
index 92c76106ee6e..23caee313417 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetConversationProfileRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetConversationProfileRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -324,8 +326,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -354,11 +356,21 @@ public com.google.cloud.dialogflow.v2beta1.GetConversationProfileRequest build()
     public com.google.cloud.dialogflow.v2beta1.GetConversationProfileRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.GetConversationProfileRequest result =
           new com.google.cloud.dialogflow.v2beta1.GetConversationProfileRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.GetConversationProfileRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -409,6 +421,7 @@ public Builder mergeFrom(
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -440,7 +453,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -460,6 +473,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -533,8 +548,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -554,8 +569,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -580,8 +595,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetConversationRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetConversationRequest.java
index c3f8c5fa211d..b033556ce98b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetConversationRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetConversationRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -322,8 +324,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -351,11 +353,20 @@ public com.google.cloud.dialogflow.v2beta1.GetConversationRequest build() {
     public com.google.cloud.dialogflow.v2beta1.GetConversationRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.GetConversationRequest result =
           new com.google.cloud.dialogflow.v2beta1.GetConversationRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.GetConversationRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -404,6 +415,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.GetConversationRequ
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -435,7 +447,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -455,6 +467,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -528,8 +542,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -549,8 +563,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -575,8 +589,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetDocumentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetDocumentRequest.java
index 162ffa2b6446..6d1651d11a0c 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetDocumentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetDocumentRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -322,8 +324,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -351,11 +353,20 @@ public com.google.cloud.dialogflow.v2beta1.GetDocumentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.GetDocumentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.GetDocumentRequest result =
           new com.google.cloud.dialogflow.v2beta1.GetDocumentRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.GetDocumentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -404,6 +415,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.GetDocumentRequest
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -435,7 +447,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -455,6 +467,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -528,8 +542,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -549,8 +563,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -575,8 +589,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetEntityTypeRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetEntityTypeRequest.java
index 3e7e6e16c0f9..bc66f29c4145 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetEntityTypeRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetEntityTypeRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -130,7 +132,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -393,10 +397,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       languageCode_ = "";
-
       return this;
     }
 
@@ -424,12 +427,23 @@ public com.google.cloud.dialogflow.v2beta1.GetEntityTypeRequest build() {
     public com.google.cloud.dialogflow.v2beta1.GetEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.GetEntityTypeRequest result =
           new com.google.cloud.dialogflow.v2beta1.GetEntityTypeRequest(this);
-      result.name_ = name_;
-      result.languageCode_ = languageCode_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.GetEntityTypeRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -478,10 +492,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.GetEntityTypeReques
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -513,13 +529,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -539,6 +555,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -618,8 +636,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -641,8 +659,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -669,8 +687,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -748,8 +766,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -769,8 +787,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -795,8 +813,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetEnvironmentHistoryRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetEnvironmentHistoryRequest.java
index bd919827b98b..4dc38833e421 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetEnvironmentHistoryRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetEnvironmentHistoryRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -130,7 +132,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -149,7 +151,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -413,12 +417,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -447,13 +449,27 @@ public com.google.cloud.dialogflow.v2beta1.GetEnvironmentHistoryRequest build()
     public com.google.cloud.dialogflow.v2beta1.GetEnvironmentHistoryRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.GetEnvironmentHistoryRequest result =
           new com.google.cloud.dialogflow.v2beta1.GetEnvironmentHistoryRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.GetEnvironmentHistoryRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -504,6 +520,7 @@ public Builder mergeFrom(
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -511,6 +528,7 @@ public Builder mergeFrom(
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -542,19 +560,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -574,6 +592,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -653,8 +673,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -676,8 +696,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -704,8 +724,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -743,6 +763,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -759,7 +780,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -826,8 +847,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -843,8 +864,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -865,8 +886,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetEnvironmentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetEnvironmentRequest.java
index 67754488cb1d..360397bd4d06 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetEnvironmentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetEnvironmentRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -326,8 +328,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -355,11 +357,20 @@ public com.google.cloud.dialogflow.v2beta1.GetEnvironmentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.GetEnvironmentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.GetEnvironmentRequest result =
           new com.google.cloud.dialogflow.v2beta1.GetEnvironmentRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.GetEnvironmentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -408,6 +419,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.GetEnvironmentReque
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -439,7 +451,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -459,6 +471,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -538,8 +552,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -561,8 +575,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -589,8 +603,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetFulfillmentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetFulfillmentRequest.java
index 9eaafdec347e..39312e0d3bc1 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetFulfillmentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetFulfillmentRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -324,8 +326,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -353,11 +355,20 @@ public com.google.cloud.dialogflow.v2beta1.GetFulfillmentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.GetFulfillmentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.GetFulfillmentRequest result =
           new com.google.cloud.dialogflow.v2beta1.GetFulfillmentRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.GetFulfillmentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -406,6 +417,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.GetFulfillmentReque
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -437,7 +449,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -457,6 +469,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -533,8 +547,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -555,8 +569,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -582,8 +596,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetIntentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetIntentRequest.java
index d9f7f341ceae..46401bf94ed9 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetIntentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetIntentRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -129,7 +131,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -186,7 +190,7 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
   }
 
   public static final int INTENT_VIEW_FIELD_NUMBER = 3;
-  private int intentView_;
+  private int intentView_ = 0;
   /**
    *
    *
@@ -215,9 +219,8 @@ public int getIntentViewValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.IntentView getIntentView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.IntentView result =
-        com.google.cloud.dialogflow.v2beta1.IntentView.valueOf(intentView_);
+        com.google.cloud.dialogflow.v2beta1.IntentView.forNumber(intentView_);
     return result == null ? com.google.cloud.dialogflow.v2beta1.IntentView.UNRECOGNIZED : result;
   }
 
@@ -438,12 +441,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       languageCode_ = "";
-
       intentView_ = 0;
-
       return this;
     }
 
@@ -471,13 +472,26 @@ public com.google.cloud.dialogflow.v2beta1.GetIntentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.GetIntentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.GetIntentRequest result =
           new com.google.cloud.dialogflow.v2beta1.GetIntentRequest(this);
-      result.name_ = name_;
-      result.languageCode_ = languageCode_;
-      result.intentView_ = intentView_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.GetIntentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.intentView_ = intentView_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -526,10 +540,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.GetIntentRequest ot
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.intentView_ != 0) {
@@ -564,19 +580,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 intentView_ = input.readEnum();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             default:
@@ -596,6 +612,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -672,8 +690,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -694,8 +712,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -721,8 +739,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -800,8 +818,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -821,8 +839,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -847,8 +865,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -882,8 +900,8 @@ public int getIntentViewValue() {
      * @return This builder for chaining.
      */
     public Builder setIntentViewValue(int value) {
-
       intentView_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -900,9 +918,8 @@ public Builder setIntentViewValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.IntentView getIntentView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.IntentView result =
-          com.google.cloud.dialogflow.v2beta1.IntentView.valueOf(intentView_);
+          com.google.cloud.dialogflow.v2beta1.IntentView.forNumber(intentView_);
       return result == null ? com.google.cloud.dialogflow.v2beta1.IntentView.UNRECOGNIZED : result;
     }
     /**
@@ -921,7 +938,7 @@ public Builder setIntentView(com.google.cloud.dialogflow.v2beta1.IntentView valu
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000004;
       intentView_ = value.getNumber();
       onChanged();
       return this;
@@ -938,7 +955,7 @@ public Builder setIntentView(com.google.cloud.dialogflow.v2beta1.IntentView valu
      * @return This builder for chaining.
      */
     public Builder clearIntentView() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       intentView_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetKnowledgeBaseRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetKnowledgeBaseRequest.java
index 7b3c8802d17b..099873aed98a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetKnowledgeBaseRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetKnowledgeBaseRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -322,8 +324,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -351,11 +353,20 @@ public com.google.cloud.dialogflow.v2beta1.GetKnowledgeBaseRequest build() {
     public com.google.cloud.dialogflow.v2beta1.GetKnowledgeBaseRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.GetKnowledgeBaseRequest result =
           new com.google.cloud.dialogflow.v2beta1.GetKnowledgeBaseRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.GetKnowledgeBaseRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -404,6 +415,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.GetKnowledgeBaseReq
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -435,7 +447,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -455,6 +467,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -528,8 +542,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -549,8 +563,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -575,8 +589,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetParticipantRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetParticipantRequest.java
index a2f461931302..45e569215f80 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetParticipantRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetParticipantRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -322,8 +324,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -351,11 +353,20 @@ public com.google.cloud.dialogflow.v2beta1.GetParticipantRequest build() {
     public com.google.cloud.dialogflow.v2beta1.GetParticipantRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.GetParticipantRequest result =
           new com.google.cloud.dialogflow.v2beta1.GetParticipantRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.GetParticipantRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -404,6 +415,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.GetParticipantReque
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -435,7 +447,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -455,6 +467,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -528,8 +542,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -549,8 +563,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -575,8 +589,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetSessionEntityTypeRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetSessionEntityTypeRequest.java
index 26c6b0bf047d..3a46024e04ff 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetSessionEntityTypeRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetSessionEntityTypeRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -342,8 +344,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -372,11 +374,21 @@ public com.google.cloud.dialogflow.v2beta1.GetSessionEntityTypeRequest build() {
     public com.google.cloud.dialogflow.v2beta1.GetSessionEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.GetSessionEntityTypeRequest result =
           new com.google.cloud.dialogflow.v2beta1.GetSessionEntityTypeRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.GetSessionEntityTypeRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -427,6 +439,7 @@ public Builder mergeFrom(
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -458,7 +471,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -478,6 +491,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -581,8 +596,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -612,8 +627,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -648,8 +663,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetValidationResultRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetValidationResultRequest.java
index e8cd3f2693e2..1387677be4d2 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetValidationResultRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetValidationResultRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -126,7 +128,9 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -389,10 +393,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       languageCode_ = "";
-
       return this;
     }
 
@@ -421,12 +424,24 @@ public com.google.cloud.dialogflow.v2beta1.GetValidationResultRequest build() {
     public com.google.cloud.dialogflow.v2beta1.GetValidationResultRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.GetValidationResultRequest result =
           new com.google.cloud.dialogflow.v2beta1.GetValidationResultRequest(this);
-      result.parent_ = parent_;
-      result.languageCode_ = languageCode_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.GetValidationResultRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -476,10 +491,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.GetValidationResult
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -511,13 +528,13 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 26:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 26
             default:
@@ -537,6 +554,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -610,8 +629,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -631,8 +650,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -657,8 +676,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -736,8 +755,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -757,8 +776,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -783,8 +802,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetVersionRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetVersionRequest.java
index 74bffa2f1f7e..0dc68b85caad 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetVersionRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetVersionRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -326,8 +328,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -355,11 +357,20 @@ public com.google.cloud.dialogflow.v2beta1.GetVersionRequest build() {
     public com.google.cloud.dialogflow.v2beta1.GetVersionRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.GetVersionRequest result =
           new com.google.cloud.dialogflow.v2beta1.GetVersionRequest(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.GetVersionRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -408,6 +419,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.GetVersionRequest o
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -439,7 +451,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -459,6 +471,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -538,8 +552,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -561,8 +575,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -589,8 +603,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/HumanAgentAssistantConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/HumanAgentAssistantConfig.java
index 18b0b54a0785..65ed6ed7eda6 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/HumanAgentAssistantConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/HumanAgentAssistantConfig.java
@@ -148,7 +148,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int NO_SMALL_TALK_FIELD_NUMBER = 1;
-    private boolean noSmallTalk_;
+    private boolean noSmallTalk_ = false;
     /**
      *
      *
@@ -166,7 +166,7 @@ public boolean getNoSmallTalk() {
     }
 
     public static final int ONLY_END_USER_FIELD_NUMBER = 2;
-    private boolean onlyEndUser_;
+    private boolean onlyEndUser_ = false;
     /**
      *
      *
@@ -423,10 +423,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         noSmallTalk_ = false;
-
         onlyEndUser_ = false;
-
         return this;
       }
 
@@ -461,12 +460,25 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
             result =
                 new com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
                     .SuggestionTriggerSettings(this);
-        result.noSmallTalk_ = noSmallTalk_;
-        result.onlyEndUser_ = onlyEndUser_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionTriggerSettings
+              result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.noSmallTalk_ = noSmallTalk_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.onlyEndUser_ = onlyEndUser_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -559,13 +571,13 @@ public Builder mergeFrom(
               case 8:
                 {
                   noSmallTalk_ = input.readBool();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 8
               case 16:
                 {
                   onlyEndUser_ = input.readBool();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 16
               default:
@@ -585,6 +597,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private boolean noSmallTalk_;
       /**
        *
@@ -616,6 +630,7 @@ public boolean getNoSmallTalk() {
       public Builder setNoSmallTalk(boolean value) {
 
         noSmallTalk_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -631,7 +646,7 @@ public Builder setNoSmallTalk(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearNoSmallTalk() {
-
+        bitField0_ = (bitField0_ & ~0x00000001);
         noSmallTalk_ = false;
         onChanged();
         return this;
@@ -670,6 +685,7 @@ public boolean getOnlyEndUser() {
       public Builder setOnlyEndUser(boolean value) {
 
         onlyEndUser_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -686,7 +702,7 @@ public Builder setOnlyEndUser(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearOnlyEndUser() {
-
+        bitField0_ = (bitField0_ & ~0x00000002);
         onlyEndUser_ = false;
         onChanged();
         return this;
@@ -1092,11 +1108,13 @@ public com.google.cloud.dialogflow.v2beta1.SuggestionFeature getSuggestionFeatur
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.SuggestionFeatureOrBuilder
         getSuggestionFeatureOrBuilder() {
-      return getSuggestionFeature();
+      return suggestionFeature_ == null
+          ? com.google.cloud.dialogflow.v2beta1.SuggestionFeature.getDefaultInstance()
+          : suggestionFeature_;
     }
 
     public static final int ENABLE_EVENT_BASED_SUGGESTION_FIELD_NUMBER = 3;
-    private boolean enableEventBasedSuggestion_;
+    private boolean enableEventBasedSuggestion_ = false;
     /**
      *
      *
@@ -1177,7 +1195,10 @@ public boolean hasSuggestionTriggerSettings() {
     public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
             .SuggestionTriggerSettingsOrBuilder
         getSuggestionTriggerSettingsOrBuilder() {
-      return getSuggestionTriggerSettings();
+      return suggestionTriggerSettings_ == null
+          ? com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionTriggerSettings
+              .getDefaultInstance()
+          : suggestionTriggerSettings_;
     }
 
     public static final int QUERY_CONFIG_FIELD_NUMBER = 6;
@@ -1236,7 +1257,10 @@ public boolean hasQueryConfig() {
     public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
             .SuggestionQueryConfigOrBuilder
         getQueryConfigOrBuilder() {
-      return getQueryConfig();
+      return queryConfig_ == null
+          ? com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionQueryConfig
+              .getDefaultInstance()
+          : queryConfig_;
     }
 
     public static final int CONVERSATION_MODEL_CONFIG_FIELD_NUMBER = 7;
@@ -1295,7 +1319,10 @@ public boolean hasConversationModelConfig() {
     public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
             .ConversationModelConfigOrBuilder
         getConversationModelConfigOrBuilder() {
-      return getConversationModelConfig();
+      return conversationModelConfig_ == null
+          ? com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.ConversationModelConfig
+              .getDefaultInstance()
+          : conversationModelConfig_;
     }
 
     public static final int CONVERSATION_PROCESS_CONFIG_FIELD_NUMBER = 8;
@@ -1354,7 +1381,10 @@ public boolean hasConversationProcessConfig() {
     public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
             .ConversationProcessConfigOrBuilder
         getConversationProcessConfigOrBuilder() {
-      return getConversationProcessConfig();
+      return conversationProcessConfig_ == null
+          ? com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.ConversationProcessConfig
+              .getDefaultInstance()
+          : conversationProcessConfig_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -1664,36 +1694,31 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (suggestionFeatureBuilder_ == null) {
-          suggestionFeature_ = null;
-        } else {
-          suggestionFeature_ = null;
+        bitField0_ = 0;
+        suggestionFeature_ = null;
+        if (suggestionFeatureBuilder_ != null) {
+          suggestionFeatureBuilder_.dispose();
           suggestionFeatureBuilder_ = null;
         }
         enableEventBasedSuggestion_ = false;
-
-        if (suggestionTriggerSettingsBuilder_ == null) {
-          suggestionTriggerSettings_ = null;
-        } else {
-          suggestionTriggerSettings_ = null;
+        suggestionTriggerSettings_ = null;
+        if (suggestionTriggerSettingsBuilder_ != null) {
+          suggestionTriggerSettingsBuilder_.dispose();
           suggestionTriggerSettingsBuilder_ = null;
         }
-        if (queryConfigBuilder_ == null) {
-          queryConfig_ = null;
-        } else {
-          queryConfig_ = null;
+        queryConfig_ = null;
+        if (queryConfigBuilder_ != null) {
+          queryConfigBuilder_.dispose();
           queryConfigBuilder_ = null;
         }
-        if (conversationModelConfigBuilder_ == null) {
-          conversationModelConfig_ = null;
-        } else {
-          conversationModelConfig_ = null;
+        conversationModelConfig_ = null;
+        if (conversationModelConfigBuilder_ != null) {
+          conversationModelConfigBuilder_.dispose();
           conversationModelConfigBuilder_ = null;
         }
-        if (conversationProcessConfigBuilder_ == null) {
-          conversationProcessConfig_ = null;
-        } else {
-          conversationProcessConfig_ = null;
+        conversationProcessConfig_ = null;
+        if (conversationProcessConfigBuilder_ != null) {
+          conversationProcessConfigBuilder_.dispose();
           conversationProcessConfigBuilder_ = null;
         }
         return this;
@@ -1730,34 +1755,48 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
             result =
                 new com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
                     .SuggestionFeatureConfig(this);
-        if (suggestionFeatureBuilder_ == null) {
-          result.suggestionFeature_ = suggestionFeature_;
-        } else {
-          result.suggestionFeature_ = suggestionFeatureBuilder_.build();
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
-        result.enableEventBasedSuggestion_ = enableEventBasedSuggestion_;
-        if (suggestionTriggerSettingsBuilder_ == null) {
-          result.suggestionTriggerSettings_ = suggestionTriggerSettings_;
-        } else {
-          result.suggestionTriggerSettings_ = suggestionTriggerSettingsBuilder_.build();
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionFeatureConfig
+              result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.suggestionFeature_ =
+              suggestionFeatureBuilder_ == null
+                  ? suggestionFeature_
+                  : suggestionFeatureBuilder_.build();
         }
-        if (queryConfigBuilder_ == null) {
-          result.queryConfig_ = queryConfig_;
-        } else {
-          result.queryConfig_ = queryConfigBuilder_.build();
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.enableEventBasedSuggestion_ = enableEventBasedSuggestion_;
         }
-        if (conversationModelConfigBuilder_ == null) {
-          result.conversationModelConfig_ = conversationModelConfig_;
-        } else {
-          result.conversationModelConfig_ = conversationModelConfigBuilder_.build();
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.suggestionTriggerSettings_ =
+              suggestionTriggerSettingsBuilder_ == null
+                  ? suggestionTriggerSettings_
+                  : suggestionTriggerSettingsBuilder_.build();
         }
-        if (conversationProcessConfigBuilder_ == null) {
-          result.conversationProcessConfig_ = conversationProcessConfig_;
-        } else {
-          result.conversationProcessConfig_ = conversationProcessConfigBuilder_.build();
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.queryConfig_ =
+              queryConfigBuilder_ == null ? queryConfig_ : queryConfigBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.conversationModelConfig_ =
+              conversationModelConfigBuilder_ == null
+                  ? conversationModelConfig_
+                  : conversationModelConfigBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000020) != 0)) {
+          result.conversationProcessConfig_ =
+              conversationProcessConfigBuilder_ == null
+                  ? conversationProcessConfig_
+                  : conversationProcessConfigBuilder_.build();
         }
-        onBuilt();
-        return result;
       }
 
       @java.lang.Override
@@ -1863,41 +1902,41 @@ public Builder mergeFrom(
               case 24:
                 {
                   enableEventBasedSuggestion_ = input.readBool();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 24
               case 42:
                 {
                   input.readMessage(
                       getSuggestionFeatureFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 42
               case 50:
                 {
                   input.readMessage(getQueryConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000008;
                   break;
                 } // case 50
               case 58:
                 {
                   input.readMessage(
                       getConversationModelConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000010;
                   break;
                 } // case 58
               case 66:
                 {
                   input.readMessage(
                       getConversationProcessConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000020;
                   break;
                 } // case 66
               case 82:
                 {
                   input.readMessage(
                       getSuggestionTriggerSettingsFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000004;
                   break;
                 } // case 82
               default:
@@ -1917,6 +1956,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private com.google.cloud.dialogflow.v2beta1.SuggestionFeature suggestionFeature_;
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.cloud.dialogflow.v2beta1.SuggestionFeature,
@@ -1935,7 +1976,7 @@ public Builder mergeFrom(
        * @return Whether the suggestionFeature field is set.
        */
       public boolean hasSuggestionFeature() {
-        return suggestionFeatureBuilder_ != null || suggestionFeature_ != null;
+        return ((bitField0_ & 0x00000001) != 0);
       }
       /**
        *
@@ -1973,11 +2014,11 @@ public Builder setSuggestionFeature(
             throw new NullPointerException();
           }
           suggestionFeature_ = value;
-          onChanged();
         } else {
           suggestionFeatureBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1993,11 +2034,11 @@ public Builder setSuggestionFeature(
           com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Builder builderForValue) {
         if (suggestionFeatureBuilder_ == null) {
           suggestionFeature_ = builderForValue.build();
-          onChanged();
         } else {
           suggestionFeatureBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -2012,19 +2053,19 @@ public Builder setSuggestionFeature(
       public Builder mergeSuggestionFeature(
           com.google.cloud.dialogflow.v2beta1.SuggestionFeature value) {
         if (suggestionFeatureBuilder_ == null) {
-          if (suggestionFeature_ != null) {
-            suggestionFeature_ =
-                com.google.cloud.dialogflow.v2beta1.SuggestionFeature.newBuilder(suggestionFeature_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000001) != 0)
+              && suggestionFeature_ != null
+              && suggestionFeature_
+                  != com.google.cloud.dialogflow.v2beta1.SuggestionFeature.getDefaultInstance()) {
+            getSuggestionFeatureBuilder().mergeFrom(value);
           } else {
             suggestionFeature_ = value;
           }
-          onChanged();
         } else {
           suggestionFeatureBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -2037,14 +2078,13 @@ public Builder mergeSuggestionFeature(
        * <code>.google.cloud.dialogflow.v2beta1.SuggestionFeature suggestion_feature = 5;</code>
        */
       public Builder clearSuggestionFeature() {
-        if (suggestionFeatureBuilder_ == null) {
-          suggestionFeature_ = null;
-          onChanged();
-        } else {
-          suggestionFeature_ = null;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        suggestionFeature_ = null;
+        if (suggestionFeatureBuilder_ != null) {
+          suggestionFeatureBuilder_.dispose();
           suggestionFeatureBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -2058,7 +2098,7 @@ public Builder clearSuggestionFeature() {
        */
       public com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Builder
           getSuggestionFeatureBuilder() {
-
+        bitField0_ |= 0x00000001;
         onChanged();
         return getSuggestionFeatureFieldBuilder().getBuilder();
       }
@@ -2142,6 +2182,7 @@ public boolean getEnableEventBasedSuggestion() {
       public Builder setEnableEventBasedSuggestion(boolean value) {
 
         enableEventBasedSuggestion_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2159,7 +2200,7 @@ public Builder setEnableEventBasedSuggestion(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearEnableEventBasedSuggestion() {
-
+        bitField0_ = (bitField0_ & ~0x00000002);
         enableEventBasedSuggestion_ = false;
         onChanged();
         return this;
@@ -2192,7 +2233,7 @@ public Builder clearEnableEventBasedSuggestion() {
        * @return Whether the suggestionTriggerSettings field is set.
        */
       public boolean hasSuggestionTriggerSettings() {
-        return suggestionTriggerSettingsBuilder_ != null || suggestionTriggerSettings_ != null;
+        return ((bitField0_ & 0x00000004) != 0);
       }
       /**
        *
@@ -2241,11 +2282,11 @@ public Builder setSuggestionTriggerSettings(
             throw new NullPointerException();
           }
           suggestionTriggerSettings_ = value;
-          onChanged();
         } else {
           suggestionTriggerSettingsBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -2267,11 +2308,11 @@ public Builder setSuggestionTriggerSettings(
               builderForValue) {
         if (suggestionTriggerSettingsBuilder_ == null) {
           suggestionTriggerSettings_ = builderForValue.build();
-          onChanged();
         } else {
           suggestionTriggerSettingsBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -2291,20 +2332,20 @@ public Builder mergeSuggestionTriggerSettings(
           com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionTriggerSettings
               value) {
         if (suggestionTriggerSettingsBuilder_ == null) {
-          if (suggestionTriggerSettings_ != null) {
-            suggestionTriggerSettings_ =
-                com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
-                    .SuggestionTriggerSettings.newBuilder(suggestionTriggerSettings_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000004) != 0)
+              && suggestionTriggerSettings_ != null
+              && suggestionTriggerSettings_
+                  != com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
+                      .SuggestionTriggerSettings.getDefaultInstance()) {
+            getSuggestionTriggerSettingsBuilder().mergeFrom(value);
           } else {
             suggestionTriggerSettings_ = value;
           }
-          onChanged();
         } else {
           suggestionTriggerSettingsBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -2321,14 +2362,13 @@ public Builder mergeSuggestionTriggerSettings(
        * </code>
        */
       public Builder clearSuggestionTriggerSettings() {
-        if (suggestionTriggerSettingsBuilder_ == null) {
-          suggestionTriggerSettings_ = null;
-          onChanged();
-        } else {
-          suggestionTriggerSettings_ = null;
+        bitField0_ = (bitField0_ & ~0x00000004);
+        suggestionTriggerSettings_ = null;
+        if (suggestionTriggerSettingsBuilder_ != null) {
+          suggestionTriggerSettingsBuilder_.dispose();
           suggestionTriggerSettingsBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -2347,7 +2387,7 @@ public Builder clearSuggestionTriggerSettings() {
       public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionTriggerSettings
               .Builder
           getSuggestionTriggerSettingsBuilder() {
-
+        bitField0_ |= 0x00000004;
         onChanged();
         return getSuggestionTriggerSettingsFieldBuilder().getBuilder();
       }
@@ -2435,7 +2475,7 @@ public Builder clearSuggestionTriggerSettings() {
        * @return Whether the queryConfig field is set.
        */
       public boolean hasQueryConfig() {
-        return queryConfigBuilder_ != null || queryConfig_ != null;
+        return ((bitField0_ & 0x00000008) != 0);
       }
       /**
        *
@@ -2480,11 +2520,11 @@ public Builder setQueryConfig(
             throw new NullPointerException();
           }
           queryConfig_ = value;
-          onChanged();
         } else {
           queryConfigBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000008;
+        onChanged();
         return this;
       }
       /**
@@ -2504,11 +2544,11 @@ public Builder setQueryConfig(
               builderForValue) {
         if (queryConfigBuilder_ == null) {
           queryConfig_ = builderForValue.build();
-          onChanged();
         } else {
           queryConfigBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000008;
+        onChanged();
         return this;
       }
       /**
@@ -2526,20 +2566,20 @@ public Builder mergeQueryConfig(
           com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionQueryConfig
               value) {
         if (queryConfigBuilder_ == null) {
-          if (queryConfig_ != null) {
-            queryConfig_ =
-                com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionQueryConfig
-                    .newBuilder(queryConfig_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000008) != 0)
+              && queryConfig_ != null
+              && queryConfig_
+                  != com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
+                      .SuggestionQueryConfig.getDefaultInstance()) {
+            getQueryConfigBuilder().mergeFrom(value);
           } else {
             queryConfig_ = value;
           }
-          onChanged();
         } else {
           queryConfigBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000008;
+        onChanged();
         return this;
       }
       /**
@@ -2554,14 +2594,13 @@ public Builder mergeQueryConfig(
        * </code>
        */
       public Builder clearQueryConfig() {
-        if (queryConfigBuilder_ == null) {
-          queryConfig_ = null;
-          onChanged();
-        } else {
-          queryConfig_ = null;
+        bitField0_ = (bitField0_ & ~0x00000008);
+        queryConfig_ = null;
+        if (queryConfigBuilder_ != null) {
+          queryConfigBuilder_.dispose();
           queryConfigBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -2578,7 +2617,7 @@ public Builder clearQueryConfig() {
       public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionQueryConfig
               .Builder
           getQueryConfigBuilder() {
-
+        bitField0_ |= 0x00000008;
         onChanged();
         return getQueryConfigFieldBuilder().getBuilder();
       }
@@ -2661,7 +2700,7 @@ public Builder clearQueryConfig() {
        * @return Whether the conversationModelConfig field is set.
        */
       public boolean hasConversationModelConfig() {
-        return conversationModelConfigBuilder_ != null || conversationModelConfig_ != null;
+        return ((bitField0_ & 0x00000010) != 0);
       }
       /**
        *
@@ -2706,11 +2745,11 @@ public Builder setConversationModelConfig(
             throw new NullPointerException();
           }
           conversationModelConfig_ = value;
-          onChanged();
         } else {
           conversationModelConfigBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /**
@@ -2730,11 +2769,11 @@ public Builder setConversationModelConfig(
               builderForValue) {
         if (conversationModelConfigBuilder_ == null) {
           conversationModelConfig_ = builderForValue.build();
-          onChanged();
         } else {
           conversationModelConfigBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /**
@@ -2752,20 +2791,20 @@ public Builder mergeConversationModelConfig(
           com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.ConversationModelConfig
               value) {
         if (conversationModelConfigBuilder_ == null) {
-          if (conversationModelConfig_ != null) {
-            conversationModelConfig_ =
-                com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
-                    .ConversationModelConfig.newBuilder(conversationModelConfig_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000010) != 0)
+              && conversationModelConfig_ != null
+              && conversationModelConfig_
+                  != com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
+                      .ConversationModelConfig.getDefaultInstance()) {
+            getConversationModelConfigBuilder().mergeFrom(value);
           } else {
             conversationModelConfig_ = value;
           }
-          onChanged();
         } else {
           conversationModelConfigBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /**
@@ -2780,14 +2819,13 @@ public Builder mergeConversationModelConfig(
        * </code>
        */
       public Builder clearConversationModelConfig() {
-        if (conversationModelConfigBuilder_ == null) {
-          conversationModelConfig_ = null;
-          onChanged();
-        } else {
-          conversationModelConfig_ = null;
+        bitField0_ = (bitField0_ & ~0x00000010);
+        conversationModelConfig_ = null;
+        if (conversationModelConfigBuilder_ != null) {
+          conversationModelConfigBuilder_.dispose();
           conversationModelConfigBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -2804,7 +2842,7 @@ public Builder clearConversationModelConfig() {
       public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.ConversationModelConfig
               .Builder
           getConversationModelConfigBuilder() {
-
+        bitField0_ |= 0x00000010;
         onChanged();
         return getConversationModelConfigFieldBuilder().getBuilder();
       }
@@ -2889,7 +2927,7 @@ public Builder clearConversationModelConfig() {
        * @return Whether the conversationProcessConfig field is set.
        */
       public boolean hasConversationProcessConfig() {
-        return conversationProcessConfigBuilder_ != null || conversationProcessConfig_ != null;
+        return ((bitField0_ & 0x00000020) != 0);
       }
       /**
        *
@@ -2934,11 +2972,11 @@ public Builder setConversationProcessConfig(
             throw new NullPointerException();
           }
           conversationProcessConfig_ = value;
-          onChanged();
         } else {
           conversationProcessConfigBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000020;
+        onChanged();
         return this;
       }
       /**
@@ -2958,11 +2996,11 @@ public Builder setConversationProcessConfig(
               builderForValue) {
         if (conversationProcessConfigBuilder_ == null) {
           conversationProcessConfig_ = builderForValue.build();
-          onChanged();
         } else {
           conversationProcessConfigBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000020;
+        onChanged();
         return this;
       }
       /**
@@ -2980,20 +3018,20 @@ public Builder mergeConversationProcessConfig(
           com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.ConversationProcessConfig
               value) {
         if (conversationProcessConfigBuilder_ == null) {
-          if (conversationProcessConfig_ != null) {
-            conversationProcessConfig_ =
-                com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
-                    .ConversationProcessConfig.newBuilder(conversationProcessConfig_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000020) != 0)
+              && conversationProcessConfig_ != null
+              && conversationProcessConfig_
+                  != com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
+                      .ConversationProcessConfig.getDefaultInstance()) {
+            getConversationProcessConfigBuilder().mergeFrom(value);
           } else {
             conversationProcessConfig_ = value;
           }
-          onChanged();
         } else {
           conversationProcessConfigBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000020;
+        onChanged();
         return this;
       }
       /**
@@ -3008,14 +3046,13 @@ public Builder mergeConversationProcessConfig(
        * </code>
        */
       public Builder clearConversationProcessConfig() {
-        if (conversationProcessConfigBuilder_ == null) {
-          conversationProcessConfig_ = null;
-          onChanged();
-        } else {
-          conversationProcessConfig_ = null;
+        bitField0_ = (bitField0_ & ~0x00000020);
+        conversationProcessConfig_ = null;
+        if (conversationProcessConfigBuilder_ != null) {
+          conversationProcessConfigBuilder_.dispose();
           conversationProcessConfigBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -3032,7 +3069,7 @@ public Builder clearConversationProcessConfig() {
       public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.ConversationProcessConfig
               .Builder
           getConversationProcessConfigBuilder() {
-
+        bitField0_ |= 0x00000020;
         onChanged();
         return getConversationProcessConfigFieldBuilder().getBuilder();
       }
@@ -3316,6 +3353,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int FEATURE_CONFIGS_FIELD_NUMBER = 2;
+
+    @SuppressWarnings("serial")
     private java.util.List<
             com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionFeatureConfig>
         featureConfigs_;
@@ -3410,7 +3449,7 @@ public int getFeatureConfigsCount() {
     }
 
     public static final int GROUP_SUGGESTION_RESPONSES_FIELD_NUMBER = 3;
-    private boolean groupSuggestionResponses_;
+    private boolean groupSuggestionResponses_ = false;
     /**
      *
      *
@@ -3658,6 +3697,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (featureConfigsBuilder_ == null) {
           featureConfigs_ = java.util.Collections.emptyList();
         } else {
@@ -3666,7 +3706,6 @@ public Builder clear() {
         }
         bitField0_ = (bitField0_ & ~0x00000001);
         groupSuggestionResponses_ = false;
-
         return this;
       }
 
@@ -3700,7 +3739,16 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
         com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionConfig result =
             new com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionConfig(
                 this);
-        int from_bitField0_ = bitField0_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(
+          com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionConfig result) {
         if (featureConfigsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             featureConfigs_ = java.util.Collections.unmodifiableList(featureConfigs_);
@@ -3710,9 +3758,14 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
         } else {
           result.featureConfigs_ = featureConfigsBuilder_.build();
         }
-        result.groupSuggestionResponses_ = groupSuggestionResponses_;
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionConfig result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.groupSuggestionResponses_ = groupSuggestionResponses_;
+        }
       }
 
       @java.lang.Override
@@ -3845,7 +3898,7 @@ public Builder mergeFrom(
               case 24:
                 {
                   groupSuggestionResponses_ = input.readBool();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 24
               default:
@@ -4373,6 +4426,7 @@ public boolean getGroupSuggestionResponses() {
       public Builder setGroupSuggestionResponses(boolean value) {
 
         groupSuggestionResponses_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4396,7 +4450,7 @@ public Builder setGroupSuggestionResponses(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearGroupSuggestionResponses() {
-
+        bitField0_ = (bitField0_ & ~0x00000002);
         groupSuggestionResponses_ = false;
         onChanged();
         return this;
@@ -4890,6 +4944,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int KNOWLEDGE_BASES_FIELD_NUMBER = 1;
+
+      @SuppressWarnings("serial")
       private com.google.protobuf.LazyStringList knowledgeBases_;
       /**
        *
@@ -5212,6 +5268,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           knowledgeBases_ = com.google.protobuf.LazyStringArrayList.EMPTY;
           bitField0_ = (bitField0_ & ~0x00000001);
           return this;
@@ -5253,14 +5310,30 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
               result =
                   new com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
                       .SuggestionQueryConfig.KnowledgeBaseQuerySource(this);
-          int from_bitField0_ = bitField0_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionQueryConfig
+                    .KnowledgeBaseQuerySource
+                result) {
           if (((bitField0_ & 0x00000001) != 0)) {
             knowledgeBases_ = knowledgeBases_.getUnmodifiableView();
             bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.knowledgeBases_ = knowledgeBases_;
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionQueryConfig
+                    .KnowledgeBaseQuerySource
+                result) {
+          int from_bitField0_ = bitField0_;
         }
 
         @java.lang.Override
@@ -5798,6 +5871,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int DOCUMENTS_FIELD_NUMBER = 1;
+
+      @SuppressWarnings("serial")
       private com.google.protobuf.LazyStringList documents_;
       /**
        *
@@ -6120,6 +6195,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           documents_ = com.google.protobuf.LazyStringArrayList.EMPTY;
           bitField0_ = (bitField0_ & ~0x00000001);
           return this;
@@ -6161,14 +6237,30 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
               result =
                   new com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
                       .SuggestionQueryConfig.DocumentQuerySource(this);
-          int from_bitField0_ = bitField0_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionQueryConfig
+                    .DocumentQuerySource
+                result) {
           if (((bitField0_ & 0x00000001) != 0)) {
             documents_ = documents_.getUnmodifiableView();
             bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.documents_ = documents_;
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionQueryConfig
+                    .DocumentQuerySource
+                result) {
+          int from_bitField0_ = bitField0_;
         }
 
         @java.lang.Override
@@ -6670,7 +6762,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int AGENT_FIELD_NUMBER = 1;
-      private volatile java.lang.Object agent_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object agent_ = "";
       /**
        *
        *
@@ -6963,8 +7057,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           agent_ = "";
-
           return this;
         }
 
@@ -7004,11 +7098,23 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
               result =
                   new com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
                       .SuggestionQueryConfig.DialogflowQuerySource(this);
-          result.agent_ = agent_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionQueryConfig
+                    .DialogflowQuerySource
+                result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.agent_ = agent_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -7069,6 +7175,7 @@ public Builder mergeFrom(
                   .DialogflowQuerySource.getDefaultInstance()) return this;
           if (!other.getAgent().isEmpty()) {
             agent_ = other.agent_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           this.mergeUnknownFields(other.getUnknownFields());
@@ -7100,7 +7207,7 @@ public Builder mergeFrom(
                 case 10:
                   {
                     agent_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 default:
@@ -7120,6 +7227,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object agent_ = "";
         /**
          *
@@ -7196,8 +7305,8 @@ public Builder setAgent(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           agent_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -7218,8 +7327,8 @@ public Builder setAgent(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearAgent() {
-
           agent_ = getDefaultInstance().getAgent();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -7245,8 +7354,8 @@ public Builder setAgentBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           agent_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -7420,7 +7529,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int DROP_HANDOFF_MESSAGES_FIELD_NUMBER = 1;
-      private boolean dropHandoffMessages_;
+      private boolean dropHandoffMessages_ = false;
       /**
        *
        *
@@ -7439,7 +7548,7 @@ public boolean getDropHandoffMessages() {
       }
 
       public static final int DROP_VIRTUAL_AGENT_MESSAGES_FIELD_NUMBER = 2;
-      private boolean dropVirtualAgentMessages_;
+      private boolean dropVirtualAgentMessages_ = false;
       /**
        *
        *
@@ -7457,7 +7566,7 @@ public boolean getDropVirtualAgentMessages() {
       }
 
       public static final int DROP_IVR_MESSAGES_FIELD_NUMBER = 3;
-      private boolean dropIvrMessages_;
+      private boolean dropIvrMessages_ = false;
       /**
        *
        *
@@ -7729,12 +7838,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           dropHandoffMessages_ = false;
-
           dropVirtualAgentMessages_ = false;
-
           dropIvrMessages_ = false;
-
           return this;
         }
 
@@ -7774,13 +7881,29 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
               result =
                   new com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
                       .SuggestionQueryConfig.ContextFilterSettings(this);
-          result.dropHandoffMessages_ = dropHandoffMessages_;
-          result.dropVirtualAgentMessages_ = dropVirtualAgentMessages_;
-          result.dropIvrMessages_ = dropIvrMessages_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionQueryConfig
+                    .ContextFilterSettings
+                result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.dropHandoffMessages_ = dropHandoffMessages_;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.dropVirtualAgentMessages_ = dropVirtualAgentMessages_;
+          }
+          if (((from_bitField0_ & 0x00000004) != 0)) {
+            result.dropIvrMessages_ = dropIvrMessages_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -7877,19 +8000,19 @@ public Builder mergeFrom(
                 case 8:
                   {
                     dropHandoffMessages_ = input.readBool();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 8
                 case 16:
                   {
                     dropVirtualAgentMessages_ = input.readBool();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 16
                 case 24:
                   {
                     dropIvrMessages_ = input.readBool();
-
+                    bitField0_ |= 0x00000004;
                     break;
                   } // case 24
                 default:
@@ -7909,6 +8032,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private boolean dropHandoffMessages_;
         /**
          *
@@ -7942,6 +8067,7 @@ public boolean getDropHandoffMessages() {
         public Builder setDropHandoffMessages(boolean value) {
 
           dropHandoffMessages_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -7958,7 +8084,7 @@ public Builder setDropHandoffMessages(boolean value) {
          * @return This builder for chaining.
          */
         public Builder clearDropHandoffMessages() {
-
+          bitField0_ = (bitField0_ & ~0x00000001);
           dropHandoffMessages_ = false;
           onChanged();
           return this;
@@ -7995,6 +8121,7 @@ public boolean getDropVirtualAgentMessages() {
         public Builder setDropVirtualAgentMessages(boolean value) {
 
           dropVirtualAgentMessages_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -8010,7 +8137,7 @@ public Builder setDropVirtualAgentMessages(boolean value) {
          * @return This builder for chaining.
          */
         public Builder clearDropVirtualAgentMessages() {
-
+          bitField0_ = (bitField0_ & ~0x00000002);
           dropVirtualAgentMessages_ = false;
           onChanged();
           return this;
@@ -8047,6 +8174,7 @@ public boolean getDropIvrMessages() {
         public Builder setDropIvrMessages(boolean value) {
 
           dropIvrMessages_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -8062,7 +8190,7 @@ public Builder setDropIvrMessages(boolean value) {
          * @return This builder for chaining.
          */
         public Builder clearDropIvrMessages() {
-
+          bitField0_ = (bitField0_ & ~0x00000004);
           dropIvrMessages_ = false;
           onChanged();
           return this;
@@ -8398,7 +8526,7 @@ public boolean hasDialogflowQuerySource() {
     }
 
     public static final int MAX_RESULTS_FIELD_NUMBER = 4;
-    private int maxResults_;
+    private int maxResults_ = 0;
     /**
      *
      *
@@ -8417,7 +8545,7 @@ public int getMaxResults() {
     }
 
     public static final int CONFIDENCE_THRESHOLD_FIELD_NUMBER = 5;
-    private float confidenceThreshold_;
+    private float confidenceThreshold_ = 0F;
     /**
      *
      *
@@ -8508,7 +8636,10 @@ public boolean hasContextFilterSettings() {
     public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionQueryConfig
             .ContextFilterSettingsOrBuilder
         getContextFilterSettingsOrBuilder() {
-      return getContextFilterSettings();
+      return contextFilterSettings_ == null
+          ? com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionQueryConfig
+              .ContextFilterSettings.getDefaultInstance()
+          : contextFilterSettings_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -8838,6 +8969,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (knowledgeBaseQuerySourceBuilder_ != null) {
           knowledgeBaseQuerySourceBuilder_.clear();
         }
@@ -8848,13 +8980,10 @@ public Builder clear() {
           dialogflowQuerySourceBuilder_.clear();
         }
         maxResults_ = 0;
-
         confidenceThreshold_ = 0F;
-
-        if (contextFilterSettingsBuilder_ == null) {
-          contextFilterSettings_ = null;
-        } else {
-          contextFilterSettings_ = null;
+        contextFilterSettings_ = null;
+        if (contextFilterSettingsBuilder_ != null) {
+          contextFilterSettingsBuilder_.dispose();
           contextFilterSettingsBuilder_ = null;
         }
         querySourceCase_ = 0;
@@ -8892,37 +9021,46 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
         com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionQueryConfig result =
             new com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionQueryConfig(
                 this);
-        if (querySourceCase_ == 1) {
-          if (knowledgeBaseQuerySourceBuilder_ == null) {
-            result.querySource_ = querySource_;
-          } else {
-            result.querySource_ = knowledgeBaseQuerySourceBuilder_.build();
-          }
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
-        if (querySourceCase_ == 2) {
-          if (documentQuerySourceBuilder_ == null) {
-            result.querySource_ = querySource_;
-          } else {
-            result.querySource_ = documentQuerySourceBuilder_.build();
-          }
+        buildPartialOneofs(result);
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionQueryConfig
+              result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.maxResults_ = maxResults_;
         }
-        if (querySourceCase_ == 3) {
-          if (dialogflowQuerySourceBuilder_ == null) {
-            result.querySource_ = querySource_;
-          } else {
-            result.querySource_ = dialogflowQuerySourceBuilder_.build();
-          }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.confidenceThreshold_ = confidenceThreshold_;
         }
-        result.maxResults_ = maxResults_;
-        result.confidenceThreshold_ = confidenceThreshold_;
-        if (contextFilterSettingsBuilder_ == null) {
-          result.contextFilterSettings_ = contextFilterSettings_;
-        } else {
-          result.contextFilterSettings_ = contextFilterSettingsBuilder_.build();
+        if (((from_bitField0_ & 0x00000020) != 0)) {
+          result.contextFilterSettings_ =
+              contextFilterSettingsBuilder_ == null
+                  ? contextFilterSettings_
+                  : contextFilterSettingsBuilder_.build();
         }
+      }
+
+      private void buildPartialOneofs(
+          com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionQueryConfig
+              result) {
         result.querySourceCase_ = querySourceCase_;
-        onBuilt();
-        return result;
+        result.querySource_ = this.querySource_;
+        if (querySourceCase_ == 1 && knowledgeBaseQuerySourceBuilder_ != null) {
+          result.querySource_ = knowledgeBaseQuerySourceBuilder_.build();
+        }
+        if (querySourceCase_ == 2 && documentQuerySourceBuilder_ != null) {
+          result.querySource_ = documentQuerySourceBuilder_.build();
+        }
+        if (querySourceCase_ == 3 && dialogflowQuerySourceBuilder_ != null) {
+          result.querySource_ = dialogflowQuerySourceBuilder_.build();
+        }
       }
 
       @java.lang.Override
@@ -9060,20 +9198,20 @@ public Builder mergeFrom(
               case 32:
                 {
                   maxResults_ = input.readInt32();
-
+                  bitField0_ |= 0x00000008;
                   break;
                 } // case 32
               case 45:
                 {
                   confidenceThreshold_ = input.readFloat();
-
+                  bitField0_ |= 0x00000010;
                   break;
                 } // case 45
               case 58:
                 {
                   input.readMessage(
                       getContextFilterSettingsFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000020;
                   break;
                 } // case 58
               default:
@@ -9107,6 +9245,8 @@ public Builder clearQuerySource() {
         return this;
       }
 
+      private int bitField0_;
+
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionQueryConfig
                   .KnowledgeBaseQuerySource,
@@ -9379,7 +9519,6 @@ public Builder clearKnowledgeBaseQuerySource() {
         }
         querySourceCase_ = 1;
         onChanged();
-        ;
         return knowledgeBaseQuerySourceBuilder_;
       }
 
@@ -9655,7 +9794,6 @@ public Builder clearDocumentQuerySource() {
         }
         querySourceCase_ = 2;
         onChanged();
-        ;
         return documentQuerySourceBuilder_;
       }
 
@@ -9922,7 +10060,6 @@ public Builder clearDialogflowQuerySource() {
         }
         querySourceCase_ = 3;
         onChanged();
-        ;
         return dialogflowQuerySourceBuilder_;
       }
 
@@ -9959,6 +10096,7 @@ public int getMaxResults() {
       public Builder setMaxResults(int value) {
 
         maxResults_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -9975,7 +10113,7 @@ public Builder setMaxResults(int value) {
        * @return This builder for chaining.
        */
       public Builder clearMaxResults() {
-
+        bitField0_ = (bitField0_ & ~0x00000008);
         maxResults_ = 0;
         onChanged();
         return this;
@@ -10038,6 +10176,7 @@ public float getConfidenceThreshold() {
       public Builder setConfidenceThreshold(float value) {
 
         confidenceThreshold_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -10066,7 +10205,7 @@ public Builder setConfidenceThreshold(float value) {
        * @return This builder for chaining.
        */
       public Builder clearConfidenceThreshold() {
-
+        bitField0_ = (bitField0_ & ~0x00000010);
         confidenceThreshold_ = 0F;
         onChanged();
         return this;
@@ -10098,7 +10237,7 @@ public Builder clearConfidenceThreshold() {
        * @return Whether the contextFilterSettings field is set.
        */
       public boolean hasContextFilterSettings() {
-        return contextFilterSettingsBuilder_ != null || contextFilterSettings_ != null;
+        return ((bitField0_ & 0x00000020) != 0);
       }
       /**
        *
@@ -10147,11 +10286,11 @@ public Builder setContextFilterSettings(
             throw new NullPointerException();
           }
           contextFilterSettings_ = value;
-          onChanged();
         } else {
           contextFilterSettingsBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000020;
+        onChanged();
         return this;
       }
       /**
@@ -10172,11 +10311,11 @@ public Builder setContextFilterSettings(
               builderForValue) {
         if (contextFilterSettingsBuilder_ == null) {
           contextFilterSettings_ = builderForValue.build();
-          onChanged();
         } else {
           contextFilterSettingsBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000020;
+        onChanged();
         return this;
       }
       /**
@@ -10196,20 +10335,20 @@ public Builder mergeContextFilterSettings(
                   .ContextFilterSettings
               value) {
         if (contextFilterSettingsBuilder_ == null) {
-          if (contextFilterSettings_ != null) {
-            contextFilterSettings_ =
-                com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionQueryConfig
-                    .ContextFilterSettings.newBuilder(contextFilterSettings_)
-                    .mergeFrom(value)
-                    .buildPartial();
+          if (((bitField0_ & 0x00000020) != 0)
+              && contextFilterSettings_ != null
+              && contextFilterSettings_
+                  != com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
+                      .SuggestionQueryConfig.ContextFilterSettings.getDefaultInstance()) {
+            getContextFilterSettingsBuilder().mergeFrom(value);
           } else {
             contextFilterSettings_ = value;
           }
-          onChanged();
         } else {
           contextFilterSettingsBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000020;
+        onChanged();
         return this;
       }
       /**
@@ -10225,14 +10364,13 @@ public Builder mergeContextFilterSettings(
        * </code>
        */
       public Builder clearContextFilterSettings() {
-        if (contextFilterSettingsBuilder_ == null) {
-          contextFilterSettings_ = null;
-          onChanged();
-        } else {
-          contextFilterSettings_ = null;
+        bitField0_ = (bitField0_ & ~0x00000020);
+        contextFilterSettings_ = null;
+        if (contextFilterSettingsBuilder_ != null) {
+          contextFilterSettingsBuilder_.dispose();
           contextFilterSettingsBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -10250,7 +10388,7 @@ public Builder clearContextFilterSettings() {
       public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionQueryConfig
               .ContextFilterSettings.Builder
           getContextFilterSettingsBuilder() {
-
+        bitField0_ |= 0x00000020;
         onChanged();
         return getContextFilterSettingsFieldBuilder().getBuilder();
       }
@@ -10470,7 +10608,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int MODEL_FIELD_NUMBER = 1;
-    private volatile java.lang.Object model_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object model_ = "";
     /**
      *
      *
@@ -10749,8 +10889,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         model_ = "";
-
         return this;
       }
 
@@ -10785,11 +10925,22 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
             result =
                 new com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
                     .ConversationModelConfig(this);
-        result.model_ = model_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.ConversationModelConfig
+              result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.model_ = model_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -10848,6 +10999,7 @@ public Builder mergeFrom(
                 .getDefaultInstance()) return this;
         if (!other.getModel().isEmpty()) {
           model_ = other.model_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -10879,7 +11031,7 @@ public Builder mergeFrom(
               case 10:
                 {
                   model_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               default:
@@ -10899,6 +11051,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object model_ = "";
       /**
        *
@@ -10963,8 +11117,8 @@ public Builder setModel(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         model_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -10981,8 +11135,8 @@ public Builder setModel(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearModel() {
-
         model_ = getDefaultInstance().getModel();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -11004,8 +11158,8 @@ public Builder setModelBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         model_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -11151,7 +11305,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int RECENT_SENTENCES_COUNT_FIELD_NUMBER = 2;
-    private int recentSentencesCount_;
+    private int recentSentencesCount_ = 0;
     /**
      *
      *
@@ -11399,8 +11553,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         recentSentencesCount_ = 0;
-
         return this;
       }
 
@@ -11435,11 +11589,22 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
             result =
                 new com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
                     .ConversationProcessConfig(this);
-        result.recentSentencesCount_ = recentSentencesCount_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.ConversationProcessConfig
+              result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.recentSentencesCount_ = recentSentencesCount_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -11529,7 +11694,7 @@ public Builder mergeFrom(
               case 16:
                 {
                   recentSentencesCount_ = input.readInt32();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 16
               default:
@@ -11549,6 +11714,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private int recentSentencesCount_;
       /**
        *
@@ -11582,6 +11749,7 @@ public int getRecentSentencesCount() {
       public Builder setRecentSentencesCount(int value) {
 
         recentSentencesCount_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -11598,7 +11766,7 @@ public Builder setRecentSentencesCount(int value) {
        * @return This builder for chaining.
        */
       public Builder clearRecentSentencesCount() {
-
+        bitField0_ = (bitField0_ & ~0x00000001);
         recentSentencesCount_ = 0;
         onChanged();
         return this;
@@ -11774,7 +11942,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int ENABLE_ENTITY_EXTRACTION_FIELD_NUMBER = 2;
-    private boolean enableEntityExtraction_;
+    private boolean enableEntityExtraction_ = false;
     /**
      *
      *
@@ -11796,7 +11964,7 @@ public boolean getEnableEntityExtraction() {
     }
 
     public static final int ENABLE_SENTIMENT_ANALYSIS_FIELD_NUMBER = 3;
-    private boolean enableSentimentAnalysis_;
+    private boolean enableSentimentAnalysis_ = false;
     /**
      *
      *
@@ -12061,10 +12229,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         enableEntityExtraction_ = false;
-
         enableSentimentAnalysis_ = false;
-
         return this;
       }
 
@@ -12098,12 +12265,25 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
         com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.MessageAnalysisConfig result =
             new com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.MessageAnalysisConfig(
                 this);
-        result.enableEntityExtraction_ = enableEntityExtraction_;
-        result.enableSentimentAnalysis_ = enableSentimentAnalysis_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.MessageAnalysisConfig
+              result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.enableEntityExtraction_ = enableEntityExtraction_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.enableSentimentAnalysis_ = enableSentimentAnalysis_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -12194,13 +12374,13 @@ public Builder mergeFrom(
               case 16:
                 {
                   enableEntityExtraction_ = input.readBool();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 16
               case 24:
                 {
                   enableSentimentAnalysis_ = input.readBool();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 24
               default:
@@ -12220,6 +12400,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private boolean enableEntityExtraction_;
       /**
        *
@@ -12259,6 +12441,7 @@ public boolean getEnableEntityExtraction() {
       public Builder setEnableEntityExtraction(boolean value) {
 
         enableEntityExtraction_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -12278,7 +12461,7 @@ public Builder setEnableEntityExtraction(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearEnableEntityExtraction() {
-
+        bitField0_ = (bitField0_ & ~0x00000001);
         enableEntityExtraction_ = false;
         onChanged();
         return this;
@@ -12341,6 +12524,7 @@ public boolean getEnableSentimentAnalysis() {
       public Builder setEnableSentimentAnalysis(boolean value) {
 
         enableSentimentAnalysis_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -12369,7 +12553,7 @@ public Builder setEnableSentimentAnalysis(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearEnableSentimentAnalysis() {
-
+        bitField0_ = (bitField0_ & ~0x00000002);
         enableSentimentAnalysis_ = false;
         onChanged();
         return this;
@@ -12491,7 +12675,9 @@ public com.google.cloud.dialogflow.v2beta1.NotificationConfig getNotificationCon
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.NotificationConfigOrBuilder
       getNotificationConfigOrBuilder() {
-    return getNotificationConfig();
+    return notificationConfig_ == null
+        ? com.google.cloud.dialogflow.v2beta1.NotificationConfig.getDefaultInstance()
+        : notificationConfig_;
   }
 
   public static final int HUMAN_AGENT_SUGGESTION_CONFIG_FIELD_NUMBER = 3;
@@ -12549,7 +12735,10 @@ public boolean hasHumanAgentSuggestionConfig() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionConfigOrBuilder
       getHumanAgentSuggestionConfigOrBuilder() {
-    return getHumanAgentSuggestionConfig();
+    return humanAgentSuggestionConfig_ == null
+        ? com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionConfig
+            .getDefaultInstance()
+        : humanAgentSuggestionConfig_;
   }
 
   public static final int END_USER_SUGGESTION_CONFIG_FIELD_NUMBER = 4;
@@ -12613,7 +12802,10 @@ public boolean hasEndUserSuggestionConfig() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionConfigOrBuilder
       getEndUserSuggestionConfigOrBuilder() {
-    return getEndUserSuggestionConfig();
+    return endUserSuggestionConfig_ == null
+        ? com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionConfig
+            .getDefaultInstance()
+        : endUserSuggestionConfig_;
   }
 
   public static final int MESSAGE_ANALYSIS_CONFIG_FIELD_NUMBER = 5;
@@ -12672,7 +12864,10 @@ public boolean hasMessageAnalysisConfig() {
   public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
           .MessageAnalysisConfigOrBuilder
       getMessageAnalysisConfigOrBuilder() {
-    return getMessageAnalysisConfig();
+    return messageAnalysisConfig_ == null
+        ? com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.MessageAnalysisConfig
+            .getDefaultInstance()
+        : messageAnalysisConfig_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -12925,28 +13120,25 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (notificationConfigBuilder_ == null) {
-        notificationConfig_ = null;
-      } else {
-        notificationConfig_ = null;
+      bitField0_ = 0;
+      notificationConfig_ = null;
+      if (notificationConfigBuilder_ != null) {
+        notificationConfigBuilder_.dispose();
         notificationConfigBuilder_ = null;
       }
-      if (humanAgentSuggestionConfigBuilder_ == null) {
-        humanAgentSuggestionConfig_ = null;
-      } else {
-        humanAgentSuggestionConfig_ = null;
+      humanAgentSuggestionConfig_ = null;
+      if (humanAgentSuggestionConfigBuilder_ != null) {
+        humanAgentSuggestionConfigBuilder_.dispose();
         humanAgentSuggestionConfigBuilder_ = null;
       }
-      if (endUserSuggestionConfigBuilder_ == null) {
-        endUserSuggestionConfig_ = null;
-      } else {
-        endUserSuggestionConfig_ = null;
+      endUserSuggestionConfig_ = null;
+      if (endUserSuggestionConfigBuilder_ != null) {
+        endUserSuggestionConfigBuilder_.dispose();
         endUserSuggestionConfigBuilder_ = null;
       }
-      if (messageAnalysisConfigBuilder_ == null) {
-        messageAnalysisConfig_ = null;
-      } else {
-        messageAnalysisConfig_ = null;
+      messageAnalysisConfig_ = null;
+      if (messageAnalysisConfigBuilder_ != null) {
+        messageAnalysisConfigBuilder_.dispose();
         messageAnalysisConfigBuilder_ = null;
       }
       return this;
@@ -12977,28 +13169,40 @@ public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig build() {
     public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig buildPartial() {
       com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig result =
           new com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig(this);
-      if (notificationConfigBuilder_ == null) {
-        result.notificationConfig_ = notificationConfig_;
-      } else {
-        result.notificationConfig_ = notificationConfigBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (humanAgentSuggestionConfigBuilder_ == null) {
-        result.humanAgentSuggestionConfig_ = humanAgentSuggestionConfig_;
-      } else {
-        result.humanAgentSuggestionConfig_ = humanAgentSuggestionConfigBuilder_.build();
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.notificationConfig_ =
+            notificationConfigBuilder_ == null
+                ? notificationConfig_
+                : notificationConfigBuilder_.build();
       }
-      if (endUserSuggestionConfigBuilder_ == null) {
-        result.endUserSuggestionConfig_ = endUserSuggestionConfig_;
-      } else {
-        result.endUserSuggestionConfig_ = endUserSuggestionConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.humanAgentSuggestionConfig_ =
+            humanAgentSuggestionConfigBuilder_ == null
+                ? humanAgentSuggestionConfig_
+                : humanAgentSuggestionConfigBuilder_.build();
       }
-      if (messageAnalysisConfigBuilder_ == null) {
-        result.messageAnalysisConfig_ = messageAnalysisConfig_;
-      } else {
-        result.messageAnalysisConfig_ = messageAnalysisConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.endUserSuggestionConfig_ =
+            endUserSuggestionConfigBuilder_ == null
+                ? endUserSuggestionConfig_
+                : endUserSuggestionConfigBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.messageAnalysisConfig_ =
+            messageAnalysisConfigBuilder_ == null
+                ? messageAnalysisConfig_
+                : messageAnalysisConfigBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -13090,28 +13294,28 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getNotificationConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(
                     getHumanAgentSuggestionConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(
                     getEndUserSuggestionConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 34
             case 42:
               {
                 input.readMessage(
                     getMessageAnalysisConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 42
             default:
@@ -13131,6 +13335,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2beta1.NotificationConfig notificationConfig_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.NotificationConfig,
@@ -13149,7 +13355,7 @@ public Builder mergeFrom(
      * @return Whether the notificationConfig field is set.
      */
     public boolean hasNotificationConfig() {
-      return notificationConfigBuilder_ != null || notificationConfig_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -13187,11 +13393,11 @@ public Builder setNotificationConfig(
           throw new NullPointerException();
         }
         notificationConfig_ = value;
-        onChanged();
       } else {
         notificationConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -13207,11 +13413,11 @@ public Builder setNotificationConfig(
         com.google.cloud.dialogflow.v2beta1.NotificationConfig.Builder builderForValue) {
       if (notificationConfigBuilder_ == null) {
         notificationConfig_ = builderForValue.build();
-        onChanged();
       } else {
         notificationConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -13226,19 +13432,19 @@ public Builder setNotificationConfig(
     public Builder mergeNotificationConfig(
         com.google.cloud.dialogflow.v2beta1.NotificationConfig value) {
       if (notificationConfigBuilder_ == null) {
-        if (notificationConfig_ != null) {
-          notificationConfig_ =
-              com.google.cloud.dialogflow.v2beta1.NotificationConfig.newBuilder(notificationConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && notificationConfig_ != null
+            && notificationConfig_
+                != com.google.cloud.dialogflow.v2beta1.NotificationConfig.getDefaultInstance()) {
+          getNotificationConfigBuilder().mergeFrom(value);
         } else {
           notificationConfig_ = value;
         }
-        onChanged();
       } else {
         notificationConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -13251,14 +13457,13 @@ public Builder mergeNotificationConfig(
      * <code>.google.cloud.dialogflow.v2beta1.NotificationConfig notification_config = 2;</code>
      */
     public Builder clearNotificationConfig() {
-      if (notificationConfigBuilder_ == null) {
-        notificationConfig_ = null;
-        onChanged();
-      } else {
-        notificationConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      notificationConfig_ = null;
+      if (notificationConfigBuilder_ != null) {
+        notificationConfigBuilder_.dispose();
         notificationConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -13272,7 +13477,7 @@ public Builder clearNotificationConfig() {
      */
     public com.google.cloud.dialogflow.v2beta1.NotificationConfig.Builder
         getNotificationConfigBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getNotificationConfigFieldBuilder().getBuilder();
     }
@@ -13342,7 +13547,7 @@ public Builder clearNotificationConfig() {
      * @return Whether the humanAgentSuggestionConfig field is set.
      */
     public boolean hasHumanAgentSuggestionConfig() {
-      return humanAgentSuggestionConfigBuilder_ != null || humanAgentSuggestionConfig_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -13386,11 +13591,11 @@ public Builder setHumanAgentSuggestionConfig(
           throw new NullPointerException();
         }
         humanAgentSuggestionConfig_ = value;
-        onChanged();
       } else {
         humanAgentSuggestionConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -13409,11 +13614,11 @@ public Builder setHumanAgentSuggestionConfig(
             builderForValue) {
       if (humanAgentSuggestionConfigBuilder_ == null) {
         humanAgentSuggestionConfig_ = builderForValue.build();
-        onChanged();
       } else {
         humanAgentSuggestionConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -13430,20 +13635,20 @@ public Builder setHumanAgentSuggestionConfig(
     public Builder mergeHumanAgentSuggestionConfig(
         com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionConfig value) {
       if (humanAgentSuggestionConfigBuilder_ == null) {
-        if (humanAgentSuggestionConfig_ != null) {
-          humanAgentSuggestionConfig_ =
-              com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionConfig
-                  .newBuilder(humanAgentSuggestionConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && humanAgentSuggestionConfig_ != null
+            && humanAgentSuggestionConfig_
+                != com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionConfig
+                    .getDefaultInstance()) {
+          getHumanAgentSuggestionConfigBuilder().mergeFrom(value);
         } else {
           humanAgentSuggestionConfig_ = value;
         }
-        onChanged();
       } else {
         humanAgentSuggestionConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -13458,14 +13663,13 @@ public Builder mergeHumanAgentSuggestionConfig(
      * </code>
      */
     public Builder clearHumanAgentSuggestionConfig() {
-      if (humanAgentSuggestionConfigBuilder_ == null) {
-        humanAgentSuggestionConfig_ = null;
-        onChanged();
-      } else {
-        humanAgentSuggestionConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      humanAgentSuggestionConfig_ = null;
+      if (humanAgentSuggestionConfigBuilder_ != null) {
+        humanAgentSuggestionConfigBuilder_.dispose();
         humanAgentSuggestionConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -13481,7 +13685,7 @@ public Builder clearHumanAgentSuggestionConfig() {
      */
     public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionConfig.Builder
         getHumanAgentSuggestionConfigBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getHumanAgentSuggestionConfigFieldBuilder().getBuilder();
     }
@@ -13560,7 +13764,7 @@ public Builder clearHumanAgentSuggestionConfig() {
      * @return Whether the endUserSuggestionConfig field is set.
      */
     public boolean hasEndUserSuggestionConfig() {
-      return endUserSuggestionConfigBuilder_ != null || endUserSuggestionConfig_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -13608,11 +13812,11 @@ public Builder setEndUserSuggestionConfig(
           throw new NullPointerException();
         }
         endUserSuggestionConfig_ = value;
-        onChanged();
       } else {
         endUserSuggestionConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -13633,11 +13837,11 @@ public Builder setEndUserSuggestionConfig(
             builderForValue) {
       if (endUserSuggestionConfigBuilder_ == null) {
         endUserSuggestionConfig_ = builderForValue.build();
-        onChanged();
       } else {
         endUserSuggestionConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -13656,20 +13860,20 @@ public Builder setEndUserSuggestionConfig(
     public Builder mergeEndUserSuggestionConfig(
         com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionConfig value) {
       if (endUserSuggestionConfigBuilder_ == null) {
-        if (endUserSuggestionConfig_ != null) {
-          endUserSuggestionConfig_ =
-              com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionConfig
-                  .newBuilder(endUserSuggestionConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && endUserSuggestionConfig_ != null
+            && endUserSuggestionConfig_
+                != com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionConfig
+                    .getDefaultInstance()) {
+          getEndUserSuggestionConfigBuilder().mergeFrom(value);
         } else {
           endUserSuggestionConfig_ = value;
         }
-        onChanged();
       } else {
         endUserSuggestionConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -13686,14 +13890,13 @@ public Builder mergeEndUserSuggestionConfig(
      * </code>
      */
     public Builder clearEndUserSuggestionConfig() {
-      if (endUserSuggestionConfigBuilder_ == null) {
-        endUserSuggestionConfig_ = null;
-        onChanged();
-      } else {
-        endUserSuggestionConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      endUserSuggestionConfig_ = null;
+      if (endUserSuggestionConfigBuilder_ != null) {
+        endUserSuggestionConfigBuilder_.dispose();
         endUserSuggestionConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -13711,7 +13914,7 @@ public Builder clearEndUserSuggestionConfig() {
      */
     public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionConfig.Builder
         getEndUserSuggestionConfigBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getEndUserSuggestionConfigFieldBuilder().getBuilder();
     }
@@ -13794,7 +13997,7 @@ public Builder clearEndUserSuggestionConfig() {
      * @return Whether the messageAnalysisConfig field is set.
      */
     public boolean hasMessageAnalysisConfig() {
-      return messageAnalysisConfigBuilder_ != null || messageAnalysisConfig_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -13838,11 +14041,11 @@ public Builder setMessageAnalysisConfig(
           throw new NullPointerException();
         }
         messageAnalysisConfig_ = value;
-        onChanged();
       } else {
         messageAnalysisConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -13861,11 +14064,11 @@ public Builder setMessageAnalysisConfig(
             builderForValue) {
       if (messageAnalysisConfigBuilder_ == null) {
         messageAnalysisConfig_ = builderForValue.build();
-        onChanged();
       } else {
         messageAnalysisConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -13882,20 +14085,20 @@ public Builder setMessageAnalysisConfig(
     public Builder mergeMessageAnalysisConfig(
         com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.MessageAnalysisConfig value) {
       if (messageAnalysisConfigBuilder_ == null) {
-        if (messageAnalysisConfig_ != null) {
-          messageAnalysisConfig_ =
-              com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.MessageAnalysisConfig
-                  .newBuilder(messageAnalysisConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && messageAnalysisConfig_ != null
+            && messageAnalysisConfig_
+                != com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
+                    .MessageAnalysisConfig.getDefaultInstance()) {
+          getMessageAnalysisConfigBuilder().mergeFrom(value);
         } else {
           messageAnalysisConfig_ = value;
         }
-        onChanged();
       } else {
         messageAnalysisConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -13910,14 +14113,13 @@ public Builder mergeMessageAnalysisConfig(
      * </code>
      */
     public Builder clearMessageAnalysisConfig() {
-      if (messageAnalysisConfigBuilder_ == null) {
-        messageAnalysisConfig_ = null;
-        onChanged();
-      } else {
-        messageAnalysisConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      messageAnalysisConfig_ = null;
+      if (messageAnalysisConfigBuilder_ != null) {
+        messageAnalysisConfigBuilder_.dispose();
         messageAnalysisConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -13934,7 +14136,7 @@ public Builder clearMessageAnalysisConfig() {
     public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.MessageAnalysisConfig
             .Builder
         getMessageAnalysisConfigBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getMessageAnalysisConfigFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/HumanAgentAssistantEvent.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/HumanAgentAssistantEvent.java
index deb0871b65d9..755b2ca1e7b4 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/HumanAgentAssistantEvent.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/HumanAgentAssistantEvent.java
@@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_FIELD_NUMBER = 1;
-  private volatile java.lang.Object conversation_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversation_ = "";
   /**
    *
    *
@@ -122,7 +124,9 @@ public com.google.protobuf.ByteString getConversationBytes() {
   }
 
   public static final int PARTICIPANT_FIELD_NUMBER = 3;
-  private volatile java.lang.Object participant_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object participant_ = "";
   /**
    *
    *
@@ -183,6 +187,8 @@ public com.google.protobuf.ByteString getParticipantBytes() {
   }
 
   public static final int SUGGESTION_RESULTS_FIELD_NUMBER = 5;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.SuggestionResult> suggestionResults_;
   /**
    *
@@ -488,17 +494,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       conversation_ = "";
-
       participant_ = "";
-
       if (suggestionResultsBuilder_ == null) {
         suggestionResults_ = java.util.Collections.emptyList();
       } else {
         suggestionResults_ = null;
         suggestionResultsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000004);
       return this;
     }
 
@@ -527,20 +532,36 @@ public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantEvent build() {
     public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantEvent buildPartial() {
       com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantEvent result =
           new com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantEvent(this);
-      int from_bitField0_ = bitField0_;
-      result.conversation_ = conversation_;
-      result.participant_ = participant_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantEvent result) {
       if (suggestionResultsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000004) != 0)) {
           suggestionResults_ = java.util.Collections.unmodifiableList(suggestionResults_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.suggestionResults_ = suggestionResults_;
       } else {
         result.suggestionResults_ = suggestionResultsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantEvent result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversation_ = conversation_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.participant_ = participant_;
+      }
     }
 
     @java.lang.Override
@@ -592,17 +613,19 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.HumanAgentAssistant
         return this;
       if (!other.getConversation().isEmpty()) {
         conversation_ = other.conversation_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getParticipant().isEmpty()) {
         participant_ = other.participant_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (suggestionResultsBuilder_ == null) {
         if (!other.suggestionResults_.isEmpty()) {
           if (suggestionResults_.isEmpty()) {
             suggestionResults_ = other.suggestionResults_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureSuggestionResultsIsMutable();
             suggestionResults_.addAll(other.suggestionResults_);
@@ -615,7 +638,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.HumanAgentAssistant
             suggestionResultsBuilder_.dispose();
             suggestionResultsBuilder_ = null;
             suggestionResults_ = other.suggestionResults_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
             suggestionResultsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getSuggestionResultsFieldBuilder()
@@ -654,13 +677,13 @@ public Builder mergeFrom(
             case 10:
               {
                 conversation_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 26:
               {
                 participant_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 26
             case 42:
@@ -760,8 +783,8 @@ public Builder setConversation(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversation_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -778,8 +801,8 @@ public Builder setConversation(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversation() {
-
       conversation_ = getDefaultInstance().getConversation();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -801,8 +824,8 @@ public Builder setConversationBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversation_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -886,8 +909,8 @@ public Builder setParticipant(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       participant_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -909,8 +932,8 @@ public Builder setParticipant(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParticipant() {
-
       participant_ = getDefaultInstance().getParticipant();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -937,8 +960,8 @@ public Builder setParticipantBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       participant_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -947,11 +970,11 @@ public Builder setParticipantBytes(com.google.protobuf.ByteString value) {
         suggestionResults_ = java.util.Collections.emptyList();
 
     private void ensureSuggestionResultsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         suggestionResults_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.SuggestionResult>(
                 suggestionResults_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000004;
       }
     }
 
@@ -1215,7 +1238,7 @@ public Builder addAllSuggestionResults(
     public Builder clearSuggestionResults() {
       if (suggestionResultsBuilder_ == null) {
         suggestionResults_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
       } else {
         suggestionResultsBuilder_.clear();
@@ -1371,7 +1394,7 @@ public com.google.cloud.dialogflow.v2beta1.SuggestionResult.Builder addSuggestio
                 com.google.cloud.dialogflow.v2beta1.SuggestionResult.Builder,
                 com.google.cloud.dialogflow.v2beta1.SuggestionResultOrBuilder>(
                 suggestionResults_,
-                ((bitField0_ & 0x00000001) != 0),
+                ((bitField0_ & 0x00000004) != 0),
                 getParentForChildren(),
                 isClean());
         suggestionResults_ = null;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/HumanAgentHandoffConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/HumanAgentHandoffConfig.java
index 1e659fe93392..296f16a0f3fc 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/HumanAgentHandoffConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/HumanAgentHandoffConfig.java
@@ -151,7 +151,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int ACCOUNT_NUMBER_FIELD_NUMBER = 1;
-    private volatile java.lang.Object accountNumber_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object accountNumber_ = "";
     /**
      *
      *
@@ -412,8 +414,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         accountNumber_ = "";
-
         return this;
       }
 
@@ -445,11 +447,21 @@ public com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfig.LivePersonCon
           buildPartial() {
         com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfig.LivePersonConfig result =
             new com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfig.LivePersonConfig(this);
-        result.accountNumber_ = accountNumber_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfig.LivePersonConfig result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.accountNumber_ = accountNumber_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -505,6 +517,7 @@ public Builder mergeFrom(
                 .getDefaultInstance()) return this;
         if (!other.getAccountNumber().isEmpty()) {
           accountNumber_ = other.accountNumber_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -536,7 +549,7 @@ public Builder mergeFrom(
               case 10:
                 {
                   accountNumber_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               default:
@@ -556,6 +569,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object accountNumber_ = "";
       /**
        *
@@ -620,8 +635,8 @@ public Builder setAccountNumber(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         accountNumber_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -638,8 +653,8 @@ public Builder setAccountNumber(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearAccountNumber() {
-
         accountNumber_ = getDefaultInstance().getAccountNumber();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -661,8 +676,8 @@ public Builder setAccountNumberBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         accountNumber_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -903,7 +918,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int ORGANIZATION_ID_FIELD_NUMBER = 1;
-    private volatile java.lang.Object organizationId_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object organizationId_ = "";
     /**
      *
      *
@@ -952,7 +969,9 @@ public com.google.protobuf.ByteString getOrganizationIdBytes() {
     }
 
     public static final int DEPLOYMENT_ID_FIELD_NUMBER = 2;
-    private volatile java.lang.Object deploymentId_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object deploymentId_ = "";
     /**
      *
      *
@@ -1001,7 +1020,9 @@ public com.google.protobuf.ByteString getDeploymentIdBytes() {
     }
 
     public static final int BUTTON_ID_FIELD_NUMBER = 3;
-    private volatile java.lang.Object buttonId_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object buttonId_ = "";
     /**
      *
      *
@@ -1050,7 +1071,9 @@ public com.google.protobuf.ByteString getButtonIdBytes() {
     }
 
     public static final int ENDPOINT_DOMAIN_FIELD_NUMBER = 4;
-    private volatile java.lang.Object endpointDomain_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object endpointDomain_ = "";
     /**
      *
      *
@@ -1358,14 +1381,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         organizationId_ = "";
-
         deploymentId_ = "";
-
         buttonId_ = "";
-
         endpointDomain_ = "";
-
         return this;
       }
 
@@ -1400,14 +1420,31 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
             result =
                 new com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfig
                     .SalesforceLiveAgentConfig(this);
-        result.organizationId_ = organizationId_;
-        result.deploymentId_ = deploymentId_;
-        result.buttonId_ = buttonId_;
-        result.endpointDomain_ = endpointDomain_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfig.SalesforceLiveAgentConfig
+              result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.organizationId_ = organizationId_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.deploymentId_ = deploymentId_;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.buttonId_ = buttonId_;
+        }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.endpointDomain_ = endpointDomain_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1466,18 +1503,22 @@ public Builder mergeFrom(
                 .getDefaultInstance()) return this;
         if (!other.getOrganizationId().isEmpty()) {
           organizationId_ = other.organizationId_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getDeploymentId().isEmpty()) {
           deploymentId_ = other.deploymentId_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (!other.getButtonId().isEmpty()) {
           buttonId_ = other.buttonId_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
         if (!other.getEndpointDomain().isEmpty()) {
           endpointDomain_ = other.endpointDomain_;
+          bitField0_ |= 0x00000008;
           onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -1509,25 +1550,25 @@ public Builder mergeFrom(
               case 10:
                 {
                   organizationId_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
                 {
                   deploymentId_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 18
               case 26:
                 {
                   buttonId_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000004;
                   break;
                 } // case 26
               case 34:
                 {
                   endpointDomain_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000008;
                   break;
                 } // case 34
               default:
@@ -1547,6 +1588,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object organizationId_ = "";
       /**
        *
@@ -1608,8 +1651,8 @@ public Builder setOrganizationId(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         organizationId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1625,8 +1668,8 @@ public Builder setOrganizationId(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearOrganizationId() {
-
         organizationId_ = getDefaultInstance().getOrganizationId();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1647,8 +1690,8 @@ public Builder setOrganizationIdBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         organizationId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1714,8 +1757,8 @@ public Builder setDeploymentId(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         deploymentId_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1731,8 +1774,8 @@ public Builder setDeploymentId(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearDeploymentId() {
-
         deploymentId_ = getDefaultInstance().getDeploymentId();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1753,8 +1796,8 @@ public Builder setDeploymentIdBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         deploymentId_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1820,8 +1863,8 @@ public Builder setButtonId(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         buttonId_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1837,8 +1880,8 @@ public Builder setButtonId(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearButtonId() {
-
         buttonId_ = getDefaultInstance().getButtonId();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -1859,8 +1902,8 @@ public Builder setButtonIdBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         buttonId_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1935,8 +1978,8 @@ public Builder setEndpointDomain(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         endpointDomain_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -1955,8 +1998,8 @@ public Builder setEndpointDomain(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearEndpointDomain() {
-
         endpointDomain_ = getDefaultInstance().getEndpointDomain();
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
@@ -1980,8 +2023,8 @@ public Builder setEndpointDomainBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         endpointDomain_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -2474,6 +2517,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (livePersonConfigBuilder_ != null) {
         livePersonConfigBuilder_.clear();
       }
@@ -2509,25 +2553,30 @@ public com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfig build() {
     public com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfig buildPartial() {
       com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfig result =
           new com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfig(this);
-      if (agentServiceCase_ == 1) {
-        if (livePersonConfigBuilder_ == null) {
-          result.agentService_ = agentService_;
-        } else {
-          result.agentService_ = livePersonConfigBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (agentServiceCase_ == 2) {
-        if (salesforceLiveAgentConfigBuilder_ == null) {
-          result.agentService_ = agentService_;
-        } else {
-          result.agentService_ = salesforceLiveAgentConfigBuilder_.build();
-        }
-      }
-      result.agentServiceCase_ = agentServiceCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfig result) {
+      int from_bitField0_ = bitField0_;
+    }
+
+    private void buildPartialOneofs(
+        com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfig result) {
+      result.agentServiceCase_ = agentServiceCase_;
+      result.agentService_ = this.agentService_;
+      if (agentServiceCase_ == 1 && livePersonConfigBuilder_ != null) {
+        result.agentService_ = livePersonConfigBuilder_.build();
+      }
+      if (agentServiceCase_ == 2 && salesforceLiveAgentConfigBuilder_ != null) {
+        result.agentService_ = salesforceLiveAgentConfigBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -2661,6 +2710,8 @@ public Builder clearAgentService() {
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfig.LivePersonConfig,
             com.google.cloud.dialogflow.v2beta1.HumanAgentHandoffConfig.LivePersonConfig.Builder,
@@ -2905,7 +2956,6 @@ public Builder clearLivePersonConfig() {
       }
       agentServiceCase_ = 1;
       onChanged();
-      ;
       return livePersonConfigBuilder_;
     }
 
@@ -3167,7 +3217,6 @@ public Builder clearSalesforceLiveAgentConfig() {
       }
       agentServiceCase_ = 2;
       onChanged();
-      ;
       return salesforceLiveAgentConfigBuilder_;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportAgentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportAgentRequest.java
index 363507bc6603..c1379dce1a1a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportAgentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportAgentRequest.java
@@ -115,7 +115,9 @@ public AgentCase getAgentCase() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -529,8 +531,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       agentCase_ = 0;
       agent_ = null;
       return this;
@@ -560,18 +562,26 @@ public com.google.cloud.dialogflow.v2beta1.ImportAgentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.ImportAgentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ImportAgentRequest result =
           new com.google.cloud.dialogflow.v2beta1.ImportAgentRequest(this);
-      result.parent_ = parent_;
-      if (agentCase_ == 2) {
-        result.agent_ = agent_;
-      }
-      if (agentCase_ == 3) {
-        result.agent_ = agent_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.agentCase_ = agentCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ImportAgentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2beta1.ImportAgentRequest result) {
+      result.agentCase_ = agentCase_;
+      result.agent_ = this.agent_;
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -620,6 +630,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ImportAgentRequest
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       switch (other.getAgentCase()) {
@@ -669,7 +680,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -716,6 +727,8 @@ public Builder clearAgent() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -789,8 +802,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -810,8 +823,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -836,8 +849,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportDocumentTemplate.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportDocumentTemplate.java
index 925d9ef475be..dce171987431 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportDocumentTemplate.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportDocumentTemplate.java
@@ -80,7 +80,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   }
 
   public static final int MIME_TYPE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object mimeType_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object mimeType_ = "";
   /**
    *
    *
@@ -129,7 +131,10 @@ public com.google.protobuf.ByteString getMimeTypeBytes() {
   }
 
   public static final int KNOWLEDGE_TYPES_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<java.lang.Integer> knowledgeTypes_;
+
   private static final com.google.protobuf.Internal.ListAdapter.Converter<
           java.lang.Integer, com.google.cloud.dialogflow.v2beta1.Document.KnowledgeType>
       knowledgeTypes_converter_ =
@@ -137,9 +142,8 @@ public com.google.protobuf.ByteString getMimeTypeBytes() {
               java.lang.Integer, com.google.cloud.dialogflow.v2beta1.Document.KnowledgeType>() {
             public com.google.cloud.dialogflow.v2beta1.Document.KnowledgeType convert(
                 java.lang.Integer from) {
-              @SuppressWarnings("deprecation")
               com.google.cloud.dialogflow.v2beta1.Document.KnowledgeType result =
-                  com.google.cloud.dialogflow.v2beta1.Document.KnowledgeType.valueOf(from);
+                  com.google.cloud.dialogflow.v2beta1.Document.KnowledgeType.forNumber(from);
               return result == null
                   ? com.google.cloud.dialogflow.v2beta1.Document.KnowledgeType.UNRECOGNIZED
                   : result;
@@ -251,6 +255,7 @@ private static final class MetadataDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> metadata_;
 
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> internalGetMetadata() {
@@ -317,8 +322,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
    * <code>map&lt;string, string&gt; metadata = 3;</code>
    */
   @java.lang.Override
-  public java.lang.String getMetadataOrDefault(
-      java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getMetadataOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -610,10 +617,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       mimeType_ = "";
-
       knowledgeTypes_ = java.util.Collections.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       internalGetMutableMetadata().clear();
       return this;
     }
@@ -642,19 +649,34 @@ public com.google.cloud.dialogflow.v2beta1.ImportDocumentTemplate build() {
     public com.google.cloud.dialogflow.v2beta1.ImportDocumentTemplate buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ImportDocumentTemplate result =
           new com.google.cloud.dialogflow.v2beta1.ImportDocumentTemplate(this);
-      int from_bitField0_ = bitField0_;
-      result.mimeType_ = mimeType_;
-      if (((bitField0_ & 0x00000001) != 0)) {
-        knowledgeTypes_ = java.util.Collections.unmodifiableList(knowledgeTypes_);
-        bitField0_ = (bitField0_ & ~0x00000001);
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.knowledgeTypes_ = knowledgeTypes_;
-      result.metadata_ = internalGetMetadata();
-      result.metadata_.makeImmutable();
       onBuilt();
       return result;
     }
 
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.ImportDocumentTemplate result) {
+      if (((bitField0_ & 0x00000002) != 0)) {
+        knowledgeTypes_ = java.util.Collections.unmodifiableList(knowledgeTypes_);
+        bitField0_ = (bitField0_ & ~0x00000002);
+      }
+      result.knowledgeTypes_ = knowledgeTypes_;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ImportDocumentTemplate result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.mimeType_ = mimeType_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.metadata_ = internalGetMetadata();
+        result.metadata_.makeImmutable();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -703,12 +725,13 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ImportDocumentTempl
         return this;
       if (!other.getMimeType().isEmpty()) {
         mimeType_ = other.mimeType_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.knowledgeTypes_.isEmpty()) {
         if (knowledgeTypes_.isEmpty()) {
           knowledgeTypes_ = other.knowledgeTypes_;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureKnowledgeTypesIsMutable();
           knowledgeTypes_.addAll(other.knowledgeTypes_);
@@ -716,6 +739,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ImportDocumentTempl
         onChanged();
       }
       internalGetMutableMetadata().mergeFrom(other.internalGetMetadata());
+      bitField0_ |= 0x00000004;
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -745,7 +769,7 @@ public Builder mergeFrom(
             case 10:
               {
                 mimeType_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
@@ -776,6 +800,7 @@ public Builder mergeFrom(
                 internalGetMutableMetadata()
                     .getMutableMap()
                     .put(metadata__.getKey(), metadata__.getValue());
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -858,8 +883,8 @@ public Builder setMimeType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       mimeType_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -875,8 +900,8 @@ public Builder setMimeType(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearMimeType() {
-
       mimeType_ = getDefaultInstance().getMimeType();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -897,8 +922,8 @@ public Builder setMimeTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       mimeType_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -906,9 +931,9 @@ public Builder setMimeTypeBytes(com.google.protobuf.ByteString value) {
     private java.util.List<java.lang.Integer> knowledgeTypes_ = java.util.Collections.emptyList();
 
     private void ensureKnowledgeTypesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         knowledgeTypes_ = new java.util.ArrayList<java.lang.Integer>(knowledgeTypes_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
     /**
@@ -1051,7 +1076,7 @@ public Builder addAllKnowledgeTypes(
      */
     public Builder clearKnowledgeTypes() {
       knowledgeTypes_ = java.util.Collections.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1163,8 +1188,6 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
         internalGetMutableMetadata() {
-      onChanged();
-      ;
       if (metadata_ == null) {
         metadata_ =
             com.google.protobuf.MapField.newMapField(MetadataDefaultEntryHolder.defaultEntry);
@@ -1172,6 +1195,8 @@ private com.google.protobuf.MapField<java.lang.String, java.lang.String> interna
       if (!metadata_.isMutable()) {
         metadata_ = metadata_.copy();
       }
+      bitField0_ |= 0x00000004;
+      onChanged();
       return metadata_;
     }
 
@@ -1232,8 +1257,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
      * <code>map&lt;string, string&gt; metadata = 3;</code>
      */
     @java.lang.Override
-    public java.lang.String getMetadataOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getMetadataOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1265,6 +1292,7 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
     }
 
     public Builder clearMetadata() {
+      bitField0_ = (bitField0_ & ~0x00000004);
       internalGetMutableMetadata().getMutableMap().clear();
       return this;
     }
@@ -1290,6 +1318,7 @@ public Builder removeMetadata(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMutableMetadata() {
+      bitField0_ |= 0x00000004;
       return internalGetMutableMetadata().getMutableMap();
     }
     /**
@@ -1311,8 +1340,8 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableMetadata().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000004;
       return this;
     }
     /**
@@ -1329,6 +1358,7 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllMetadata(java.util.Map<java.lang.String, java.lang.String> values) {
       internalGetMutableMetadata().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000004;
       return this;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportDocumentTemplateOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportDocumentTemplateOrBuilder.java
index 47573a190c8f..c8b83bb5bd9a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportDocumentTemplateOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportDocumentTemplateOrBuilder.java
@@ -176,7 +176,6 @@ public interface ImportDocumentTemplateOrBuilder
    *
    * <code>map&lt;string, string&gt; metadata = 3;</code>
    */
-
   /* nullable */
   java.lang.String getMetadataOrDefault(
       java.lang.String key,
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportDocumentsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportDocumentsRequest.java
index b207a0f9832c..68cb92453c95 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportDocumentsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportDocumentsRequest.java
@@ -112,7 +112,9 @@ public SourceCase getSourceCase() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -283,11 +285,13 @@ public com.google.cloud.dialogflow.v2beta1.ImportDocumentTemplate getDocumentTem
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.ImportDocumentTemplateOrBuilder
       getDocumentTemplateOrBuilder() {
-    return getDocumentTemplate();
+    return documentTemplate_ == null
+        ? com.google.cloud.dialogflow.v2beta1.ImportDocumentTemplate.getDefaultInstance()
+        : documentTemplate_;
   }
 
   public static final int IMPORT_GCS_CUSTOM_METADATA_FIELD_NUMBER = 4;
-  private boolean importGcsCustomMetadata_;
+  private boolean importGcsCustomMetadata_ = false;
   /**
    *
    *
@@ -550,19 +554,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       if (gcsSourceBuilder_ != null) {
         gcsSourceBuilder_.clear();
       }
-      if (documentTemplateBuilder_ == null) {
-        documentTemplate_ = null;
-      } else {
-        documentTemplate_ = null;
+      documentTemplate_ = null;
+      if (documentTemplateBuilder_ != null) {
+        documentTemplateBuilder_.dispose();
         documentTemplateBuilder_ = null;
       }
       importGcsCustomMetadata_ = false;
-
       sourceCase_ = 0;
       source_ = null;
       return this;
@@ -592,25 +594,37 @@ public com.google.cloud.dialogflow.v2beta1.ImportDocumentsRequest build() {
     public com.google.cloud.dialogflow.v2beta1.ImportDocumentsRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ImportDocumentsRequest result =
           new com.google.cloud.dialogflow.v2beta1.ImportDocumentsRequest(this);
-      result.parent_ = parent_;
-      if (sourceCase_ == 2) {
-        if (gcsSourceBuilder_ == null) {
-          result.source_ = source_;
-        } else {
-          result.source_ = gcsSourceBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (documentTemplateBuilder_ == null) {
-        result.documentTemplate_ = documentTemplate_;
-      } else {
-        result.documentTemplate_ = documentTemplateBuilder_.build();
-      }
-      result.importGcsCustomMetadata_ = importGcsCustomMetadata_;
-      result.sourceCase_ = sourceCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ImportDocumentsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.documentTemplate_ =
+            documentTemplateBuilder_ == null ? documentTemplate_ : documentTemplateBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.importGcsCustomMetadata_ = importGcsCustomMetadata_;
+      }
+    }
+
+    private void buildPartialOneofs(
+        com.google.cloud.dialogflow.v2beta1.ImportDocumentsRequest result) {
+      result.sourceCase_ = sourceCase_;
+      result.source_ = this.source_;
+      if (sourceCase_ == 2 && gcsSourceBuilder_ != null) {
+        result.source_ = gcsSourceBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -659,6 +673,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ImportDocumentsRequ
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasDocumentTemplate()) {
@@ -707,7 +722,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -720,13 +735,13 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getDocumentTemplateFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 32:
               {
                 importGcsCustomMetadata_ = input.readBool();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 32
             default:
@@ -760,6 +775,8 @@ public Builder clearSource() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -833,8 +850,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -854,8 +871,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -880,8 +897,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1128,7 +1145,6 @@ public com.google.cloud.dialogflow.v2beta1.GcsSourcesOrBuilder getGcsSourceOrBui
       }
       sourceCase_ = 2;
       onChanged();
-      ;
       return gcsSourceBuilder_;
     }
 
@@ -1152,7 +1168,7 @@ public com.google.cloud.dialogflow.v2beta1.GcsSourcesOrBuilder getGcsSourceOrBui
      * @return Whether the documentTemplate field is set.
      */
     public boolean hasDocumentTemplate() {
-      return documentTemplateBuilder_ != null || documentTemplate_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1194,11 +1210,11 @@ public Builder setDocumentTemplate(
           throw new NullPointerException();
         }
         documentTemplate_ = value;
-        onChanged();
       } else {
         documentTemplateBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1216,11 +1232,11 @@ public Builder setDocumentTemplate(
         com.google.cloud.dialogflow.v2beta1.ImportDocumentTemplate.Builder builderForValue) {
       if (documentTemplateBuilder_ == null) {
         documentTemplate_ = builderForValue.build();
-        onChanged();
       } else {
         documentTemplateBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1237,20 +1253,20 @@ public Builder setDocumentTemplate(
     public Builder mergeDocumentTemplate(
         com.google.cloud.dialogflow.v2beta1.ImportDocumentTemplate value) {
       if (documentTemplateBuilder_ == null) {
-        if (documentTemplate_ != null) {
-          documentTemplate_ =
-              com.google.cloud.dialogflow.v2beta1.ImportDocumentTemplate.newBuilder(
-                      documentTemplate_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && documentTemplate_ != null
+            && documentTemplate_
+                != com.google.cloud.dialogflow.v2beta1.ImportDocumentTemplate
+                    .getDefaultInstance()) {
+          getDocumentTemplateBuilder().mergeFrom(value);
         } else {
           documentTemplate_ = value;
         }
-        onChanged();
       } else {
         documentTemplateBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1265,14 +1281,13 @@ public Builder mergeDocumentTemplate(
      * </code>
      */
     public Builder clearDocumentTemplate() {
-      if (documentTemplateBuilder_ == null) {
-        documentTemplate_ = null;
-        onChanged();
-      } else {
-        documentTemplate_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      documentTemplate_ = null;
+      if (documentTemplateBuilder_ != null) {
+        documentTemplateBuilder_.dispose();
         documentTemplateBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1288,7 +1303,7 @@ public Builder clearDocumentTemplate() {
      */
     public com.google.cloud.dialogflow.v2beta1.ImportDocumentTemplate.Builder
         getDocumentTemplateBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getDocumentTemplateFieldBuilder().getBuilder();
     }
@@ -1374,6 +1389,7 @@ public boolean getImportGcsCustomMetadata() {
     public Builder setImportGcsCustomMetadata(boolean value) {
 
       importGcsCustomMetadata_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1390,7 +1406,7 @@ public Builder setImportGcsCustomMetadata(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearImportGcsCustomMetadata() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       importGcsCustomMetadata_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportDocumentsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportDocumentsResponse.java
index ac510344062a..5854946c4a47 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportDocumentsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportDocumentsResponse.java
@@ -68,6 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int WARNINGS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.rpc.Status> warnings_;
   /**
    *
@@ -335,6 +337,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (warningsBuilder_ == null) {
         warnings_ = java.util.Collections.emptyList();
       } else {
@@ -369,7 +372,16 @@ public com.google.cloud.dialogflow.v2beta1.ImportDocumentsResponse build() {
     public com.google.cloud.dialogflow.v2beta1.ImportDocumentsResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ImportDocumentsResponse result =
           new com.google.cloud.dialogflow.v2beta1.ImportDocumentsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.ImportDocumentsResponse result) {
       if (warningsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           warnings_ = java.util.Collections.unmodifiableList(warnings_);
@@ -379,8 +391,10 @@ public com.google.cloud.dialogflow.v2beta1.ImportDocumentsResponse buildPartial(
       } else {
         result.warnings_ = warningsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ImportDocumentsResponse result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/InputAudioConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/InputAudioConfig.java
index e7fc61d86ec8..a66b21f08ca2 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/InputAudioConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/InputAudioConfig.java
@@ -73,7 +73,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int AUDIO_ENCODING_FIELD_NUMBER = 1;
-  private int audioEncoding_;
+  private int audioEncoding_ = 0;
   /**
    *
    *
@@ -102,14 +102,13 @@ public int getAudioEncodingValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.AudioEncoding getAudioEncoding() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.AudioEncoding result =
-        com.google.cloud.dialogflow.v2beta1.AudioEncoding.valueOf(audioEncoding_);
+        com.google.cloud.dialogflow.v2beta1.AudioEncoding.forNumber(audioEncoding_);
     return result == null ? com.google.cloud.dialogflow.v2beta1.AudioEncoding.UNRECOGNIZED : result;
   }
 
   public static final int SAMPLE_RATE_HERTZ_FIELD_NUMBER = 2;
-  private int sampleRateHertz_;
+  private int sampleRateHertz_ = 0;
   /**
    *
    *
@@ -131,7 +130,9 @@ public int getSampleRateHertz() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -188,7 +189,7 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
   }
 
   public static final int ENABLE_WORD_INFO_FIELD_NUMBER = 13;
-  private boolean enableWordInfo_;
+  private boolean enableWordInfo_ = false;
   /**
    *
    *
@@ -211,6 +212,8 @@ public boolean getEnableWordInfo() {
   }
 
   public static final int PHRASE_HINTS_FIELD_NUMBER = 4;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList phraseHints_;
   /**
    *
@@ -312,6 +315,8 @@ public com.google.protobuf.ByteString getPhraseHintsBytes(int index) {
   }
 
   public static final int SPEECH_CONTEXTS_FIELD_NUMBER = 11;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.SpeechContext> speechContexts_;
   /**
    *
@@ -397,7 +402,9 @@ public com.google.cloud.dialogflow.v2beta1.SpeechContextOrBuilder getSpeechConte
   }
 
   public static final int MODEL_FIELD_NUMBER = 7;
-  private volatile java.lang.Object model_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object model_ = "";
   /**
    *
    *
@@ -466,7 +473,7 @@ public com.google.protobuf.ByteString getModelBytes() {
   }
 
   public static final int MODEL_VARIANT_FIELD_NUMBER = 10;
-  private int modelVariant_;
+  private int modelVariant_ = 0;
   /**
    *
    *
@@ -497,16 +504,15 @@ public int getModelVariantValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.SpeechModelVariant getModelVariant() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.SpeechModelVariant result =
-        com.google.cloud.dialogflow.v2beta1.SpeechModelVariant.valueOf(modelVariant_);
+        com.google.cloud.dialogflow.v2beta1.SpeechModelVariant.forNumber(modelVariant_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.SpeechModelVariant.UNRECOGNIZED
         : result;
   }
 
   public static final int SINGLE_UTTERANCE_FIELD_NUMBER = 8;
-  private boolean singleUtterance_;
+  private boolean singleUtterance_ = false;
   /**
    *
    *
@@ -533,7 +539,7 @@ public boolean getSingleUtterance() {
   }
 
   public static final int DISABLE_NO_SPEECH_RECOGNIZED_EVENT_FIELD_NUMBER = 14;
-  private boolean disableNoSpeechRecognizedEvent_;
+  private boolean disableNoSpeechRecognizedEvent_ = false;
   /**
    *
    *
@@ -854,31 +860,24 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       audioEncoding_ = 0;
-
       sampleRateHertz_ = 0;
-
       languageCode_ = "";
-
       enableWordInfo_ = false;
-
       phraseHints_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000010);
       if (speechContextsBuilder_ == null) {
         speechContexts_ = java.util.Collections.emptyList();
       } else {
         speechContexts_ = null;
         speechContextsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000020);
       model_ = "";
-
       modelVariant_ = 0;
-
       singleUtterance_ = false;
-
       disableNoSpeechRecognizedEvent_ = false;
-
       return this;
     }
 
@@ -906,31 +905,58 @@ public com.google.cloud.dialogflow.v2beta1.InputAudioConfig build() {
     public com.google.cloud.dialogflow.v2beta1.InputAudioConfig buildPartial() {
       com.google.cloud.dialogflow.v2beta1.InputAudioConfig result =
           new com.google.cloud.dialogflow.v2beta1.InputAudioConfig(this);
-      int from_bitField0_ = bitField0_;
-      result.audioEncoding_ = audioEncoding_;
-      result.sampleRateHertz_ = sampleRateHertz_;
-      result.languageCode_ = languageCode_;
-      result.enableWordInfo_ = enableWordInfo_;
-      if (((bitField0_ & 0x00000001) != 0)) {
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.InputAudioConfig result) {
+      if (((bitField0_ & 0x00000010) != 0)) {
         phraseHints_ = phraseHints_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000010);
       }
       result.phraseHints_ = phraseHints_;
       if (speechContextsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000020) != 0)) {
           speechContexts_ = java.util.Collections.unmodifiableList(speechContexts_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000020);
         }
         result.speechContexts_ = speechContexts_;
       } else {
         result.speechContexts_ = speechContextsBuilder_.build();
       }
-      result.model_ = model_;
-      result.modelVariant_ = modelVariant_;
-      result.singleUtterance_ = singleUtterance_;
-      result.disableNoSpeechRecognizedEvent_ = disableNoSpeechRecognizedEvent_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.InputAudioConfig result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.audioEncoding_ = audioEncoding_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.sampleRateHertz_ = sampleRateHertz_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.enableWordInfo_ = enableWordInfo_;
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.model_ = model_;
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.modelVariant_ = modelVariant_;
+      }
+      if (((from_bitField0_ & 0x00000100) != 0)) {
+        result.singleUtterance_ = singleUtterance_;
+      }
+      if (((from_bitField0_ & 0x00000200) != 0)) {
+        result.disableNoSpeechRecognizedEvent_ = disableNoSpeechRecognizedEvent_;
+      }
     }
 
     @java.lang.Override
@@ -987,6 +1013,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.InputAudioConfig ot
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.getEnableWordInfo() != false) {
@@ -995,7 +1022,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.InputAudioConfig ot
       if (!other.phraseHints_.isEmpty()) {
         if (phraseHints_.isEmpty()) {
           phraseHints_ = other.phraseHints_;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000010);
         } else {
           ensurePhraseHintsIsMutable();
           phraseHints_.addAll(other.phraseHints_);
@@ -1006,7 +1033,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.InputAudioConfig ot
         if (!other.speechContexts_.isEmpty()) {
           if (speechContexts_.isEmpty()) {
             speechContexts_ = other.speechContexts_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000020);
           } else {
             ensureSpeechContextsIsMutable();
             speechContexts_.addAll(other.speechContexts_);
@@ -1019,7 +1046,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.InputAudioConfig ot
             speechContextsBuilder_.dispose();
             speechContextsBuilder_ = null;
             speechContexts_ = other.speechContexts_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000020);
             speechContextsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getSpeechContextsFieldBuilder()
@@ -1031,6 +1058,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.InputAudioConfig ot
       }
       if (!other.getModel().isEmpty()) {
         model_ = other.model_;
+        bitField0_ |= 0x00000040;
         onChanged();
       }
       if (other.modelVariant_ != 0) {
@@ -1071,19 +1099,19 @@ public Builder mergeFrom(
             case 8:
               {
                 audioEncoding_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 16:
               {
                 sampleRateHertz_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
@@ -1096,19 +1124,19 @@ public Builder mergeFrom(
             case 58:
               {
                 model_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 58
             case 64:
               {
                 singleUtterance_ = input.readBool();
-
+                bitField0_ |= 0x00000100;
                 break;
               } // case 64
             case 80:
               {
                 modelVariant_ = input.readEnum();
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 80
             case 90:
@@ -1128,13 +1156,13 @@ public Builder mergeFrom(
             case 104:
               {
                 enableWordInfo_ = input.readBool();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 104
             case 112:
               {
                 disableNoSpeechRecognizedEvent_ = input.readBool();
-
+                bitField0_ |= 0x00000200;
                 break;
               } // case 112
             default:
@@ -1185,8 +1213,8 @@ public int getAudioEncodingValue() {
      * @return This builder for chaining.
      */
     public Builder setAudioEncodingValue(int value) {
-
       audioEncoding_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1203,9 +1231,8 @@ public Builder setAudioEncodingValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.AudioEncoding getAudioEncoding() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.AudioEncoding result =
-          com.google.cloud.dialogflow.v2beta1.AudioEncoding.valueOf(audioEncoding_);
+          com.google.cloud.dialogflow.v2beta1.AudioEncoding.forNumber(audioEncoding_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.AudioEncoding.UNRECOGNIZED
           : result;
@@ -1226,7 +1253,7 @@ public Builder setAudioEncoding(com.google.cloud.dialogflow.v2beta1.AudioEncodin
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       audioEncoding_ = value.getNumber();
       onChanged();
       return this;
@@ -1243,7 +1270,7 @@ public Builder setAudioEncoding(com.google.cloud.dialogflow.v2beta1.AudioEncodin
      * @return This builder for chaining.
      */
     public Builder clearAudioEncoding() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       audioEncoding_ = 0;
       onChanged();
       return this;
@@ -1288,6 +1315,7 @@ public int getSampleRateHertz() {
     public Builder setSampleRateHertz(int value) {
 
       sampleRateHertz_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1307,7 +1335,7 @@ public Builder setSampleRateHertz(int value) {
      * @return This builder for chaining.
      */
     public Builder clearSampleRateHertz() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       sampleRateHertz_ = 0;
       onChanged();
       return this;
@@ -1386,8 +1414,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1407,8 +1435,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1433,8 +1461,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1480,6 +1508,7 @@ public boolean getEnableWordInfo() {
     public Builder setEnableWordInfo(boolean value) {
 
       enableWordInfo_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1500,7 +1529,7 @@ public Builder setEnableWordInfo(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearEnableWordInfo() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       enableWordInfo_ = false;
       onChanged();
       return this;
@@ -1510,9 +1539,9 @@ public Builder clearEnableWordInfo() {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensurePhraseHintsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         phraseHints_ = new com.google.protobuf.LazyStringArrayList(phraseHints_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000010;
       }
     }
     /**
@@ -1727,7 +1756,7 @@ public Builder addAllPhraseHints(java.lang.Iterable<java.lang.String> values) {
     @java.lang.Deprecated
     public Builder clearPhraseHints() {
       phraseHints_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000010);
       onChanged();
       return this;
     }
@@ -1768,11 +1797,11 @@ public Builder addPhraseHintsBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureSpeechContextsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000020) != 0)) {
         speechContexts_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.SpeechContext>(
                 speechContexts_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000020;
       }
     }
 
@@ -2024,7 +2053,7 @@ public Builder addAllSpeechContexts(
     public Builder clearSpeechContexts() {
       if (speechContextsBuilder_ == null) {
         speechContexts_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000020);
         onChanged();
       } else {
         speechContextsBuilder_.clear();
@@ -2172,7 +2201,7 @@ public com.google.cloud.dialogflow.v2beta1.SpeechContext.Builder addSpeechContex
                 com.google.cloud.dialogflow.v2beta1.SpeechContext.Builder,
                 com.google.cloud.dialogflow.v2beta1.SpeechContextOrBuilder>(
                 speechContexts_,
-                ((bitField0_ & 0x00000002) != 0),
+                ((bitField0_ & 0x00000020) != 0),
                 getParentForChildren(),
                 isClean());
         speechContexts_ = null;
@@ -2271,8 +2300,8 @@ public Builder setModel(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       model_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2298,8 +2327,8 @@ public Builder setModel(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearModel() {
-
       model_ = getDefaultInstance().getModel();
+      bitField0_ = (bitField0_ & ~0x00000040);
       onChanged();
       return this;
     }
@@ -2330,8 +2359,8 @@ public Builder setModelBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       model_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2367,8 +2396,8 @@ public int getModelVariantValue() {
      * @return This builder for chaining.
      */
     public Builder setModelVariantValue(int value) {
-
       modelVariant_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2386,9 +2415,8 @@ public Builder setModelVariantValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.SpeechModelVariant getModelVariant() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.SpeechModelVariant result =
-          com.google.cloud.dialogflow.v2beta1.SpeechModelVariant.valueOf(modelVariant_);
+          com.google.cloud.dialogflow.v2beta1.SpeechModelVariant.forNumber(modelVariant_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.SpeechModelVariant.UNRECOGNIZED
           : result;
@@ -2410,7 +2438,7 @@ public Builder setModelVariant(com.google.cloud.dialogflow.v2beta1.SpeechModelVa
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000080;
       modelVariant_ = value.getNumber();
       onChanged();
       return this;
@@ -2428,7 +2456,7 @@ public Builder setModelVariant(com.google.cloud.dialogflow.v2beta1.SpeechModelVa
      * @return This builder for chaining.
      */
     public Builder clearModelVariant() {
-
+      bitField0_ = (bitField0_ & ~0x00000080);
       modelVariant_ = 0;
       onChanged();
       return this;
@@ -2483,6 +2511,7 @@ public boolean getSingleUtterance() {
     public Builder setSingleUtterance(boolean value) {
 
       singleUtterance_ = value;
+      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -2507,7 +2536,7 @@ public Builder setSingleUtterance(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearSingleUtterance() {
-
+      bitField0_ = (bitField0_ & ~0x00000100);
       singleUtterance_ = false;
       onChanged();
       return this;
@@ -2554,6 +2583,7 @@ public boolean getDisableNoSpeechRecognizedEvent() {
     public Builder setDisableNoSpeechRecognizedEvent(boolean value) {
 
       disableNoSpeechRecognizedEvent_ = value;
+      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -2574,7 +2604,7 @@ public Builder setDisableNoSpeechRecognizedEvent(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearDisableNoSpeechRecognizedEvent() {
-
+      bitField0_ = (bitField0_ & ~0x00000200);
       disableNoSpeechRecognizedEvent_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/InputTextConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/InputTextConfig.java
index 5153fa076836..24957009ac5a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/InputTextConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/InputTextConfig.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -317,8 +319,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       languageCode_ = "";
-
       return this;
     }
 
@@ -346,11 +348,20 @@ public com.google.cloud.dialogflow.v2beta1.InputTextConfig build() {
     public com.google.cloud.dialogflow.v2beta1.InputTextConfig buildPartial() {
       com.google.cloud.dialogflow.v2beta1.InputTextConfig result =
           new com.google.cloud.dialogflow.v2beta1.InputTextConfig(this);
-      result.languageCode_ = languageCode_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.InputTextConfig result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -399,6 +410,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.InputTextConfig oth
         return this;
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -430,7 +442,7 @@ public Builder mergeFrom(
             case 10:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -450,6 +462,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object languageCode_ = "";
     /**
      *
@@ -517,8 +531,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -536,8 +550,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -560,8 +574,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Intent.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Intent.java
index 7c5b5acf2235..2d48572249cf 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Intent.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Intent.java
@@ -826,7 +826,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int TEXT_FIELD_NUMBER = 1;
-      private volatile java.lang.Object text_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object text_ = "";
       /**
        *
        *
@@ -875,7 +877,9 @@ public com.google.protobuf.ByteString getTextBytes() {
       }
 
       public static final int ENTITY_TYPE_FIELD_NUMBER = 2;
-      private volatile java.lang.Object entityType_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object entityType_ = "";
       /**
        *
        *
@@ -926,7 +930,9 @@ public com.google.protobuf.ByteString getEntityTypeBytes() {
       }
 
       public static final int ALIAS_FIELD_NUMBER = 3;
-      private volatile java.lang.Object alias_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object alias_ = "";
       /**
        *
        *
@@ -979,7 +985,7 @@ public com.google.protobuf.ByteString getAliasBytes() {
       }
 
       public static final int USER_DEFINED_FIELD_NUMBER = 4;
-      private boolean userDefined_;
+      private boolean userDefined_ = false;
       /**
        *
        *
@@ -1229,14 +1235,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           text_ = "";
-
           entityType_ = "";
-
           alias_ = "";
-
           userDefined_ = false;
-
           return this;
         }
 
@@ -1266,14 +1269,30 @@ public com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Part build() {
         public com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Part buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Part result =
               new com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Part(this);
-          result.text_ = text_;
-          result.entityType_ = entityType_;
-          result.alias_ = alias_;
-          result.userDefined_ = userDefined_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Part result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.text_ = text_;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.entityType_ = entityType_;
+          }
+          if (((from_bitField0_ & 0x00000004) != 0)) {
+            result.alias_ = alias_;
+          }
+          if (((from_bitField0_ & 0x00000008) != 0)) {
+            result.userDefined_ = userDefined_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -1327,14 +1346,17 @@ public Builder mergeFrom(
                   .getDefaultInstance()) return this;
           if (!other.getText().isEmpty()) {
             text_ = other.text_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (!other.getEntityType().isEmpty()) {
             entityType_ = other.entityType_;
+            bitField0_ |= 0x00000002;
             onChanged();
           }
           if (!other.getAlias().isEmpty()) {
             alias_ = other.alias_;
+            bitField0_ |= 0x00000004;
             onChanged();
           }
           if (other.getUserDefined() != false) {
@@ -1369,25 +1391,25 @@ public Builder mergeFrom(
                 case 10:
                   {
                     text_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
                   {
                     entityType_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 18
                 case 26:
                   {
                     alias_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000004;
                     break;
                   } // case 26
                 case 32:
                   {
                     userDefined_ = input.readBool();
-
+                    bitField0_ |= 0x00000008;
                     break;
                   } // case 32
                 default:
@@ -1407,6 +1429,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object text_ = "";
         /**
          *
@@ -1468,8 +1492,8 @@ public Builder setText(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           text_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -1485,8 +1509,8 @@ public Builder setText(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearText() {
-
           text_ = getDefaultInstance().getText();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -1507,8 +1531,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           text_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -1577,8 +1601,8 @@ public Builder setEntityType(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           entityType_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -1595,8 +1619,8 @@ public Builder setEntityType(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearEntityType() {
-
           entityType_ = getDefaultInstance().getEntityType();
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -1618,8 +1642,8 @@ public Builder setEntityTypeBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           entityType_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -1691,8 +1715,8 @@ public Builder setAlias(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           alias_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -1710,8 +1734,8 @@ public Builder setAlias(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearAlias() {
-
           alias_ = getDefaultInstance().getAlias();
+          bitField0_ = (bitField0_ & ~0x00000004);
           onChanged();
           return this;
         }
@@ -1734,8 +1758,8 @@ public Builder setAliasBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           alias_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -1777,6 +1801,7 @@ public boolean getUserDefined() {
         public Builder setUserDefined(boolean value) {
 
           userDefined_ = value;
+          bitField0_ |= 0x00000008;
           onChanged();
           return this;
         }
@@ -1795,7 +1820,7 @@ public Builder setUserDefined(boolean value) {
          * @return This builder for chaining.
          */
         public Builder clearUserDefined() {
-
+          bitField0_ = (bitField0_ & ~0x00000008);
           userDefined_ = false;
           onChanged();
           return this;
@@ -1869,7 +1894,9 @@ public com.google.protobuf.Parser<Part> getParserForType() {
     }
 
     public static final int NAME_FIELD_NUMBER = 1;
-    private volatile java.lang.Object name_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object name_ = "";
     /**
      *
      *
@@ -1918,7 +1945,7 @@ public com.google.protobuf.ByteString getNameBytes() {
     }
 
     public static final int TYPE_FIELD_NUMBER = 2;
-    private int type_;
+    private int type_ = 0;
     /**
      *
      *
@@ -1951,15 +1978,16 @@ public int getTypeValue() {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Type result =
-          com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Type.valueOf(type_);
+          com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Type.forNumber(type_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Type.UNRECOGNIZED
           : result;
     }
 
     public static final int PARTS_FIELD_NUMBER = 3;
+
+    @SuppressWarnings("serial")
     private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Part> parts_;
     /**
      *
@@ -2107,7 +2135,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Part getParts(i
     }
 
     public static final int TIMES_ADDED_COUNT_FIELD_NUMBER = 4;
-    private int timesAddedCount_;
+    private int timesAddedCount_ = 0;
     /**
      *
      *
@@ -2359,19 +2387,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         name_ = "";
-
         type_ = 0;
-
         if (partsBuilder_ == null) {
           parts_ = java.util.Collections.emptyList();
         } else {
           parts_ = null;
           partsBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000004);
         timesAddedCount_ = 0;
-
         return this;
       }
 
@@ -2399,21 +2425,38 @@ public com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase build() {
       public com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase buildPartial() {
         com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase result =
             new com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase(this);
-        int from_bitField0_ = bitField0_;
-        result.name_ = name_;
-        result.type_ = type_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(
+          com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase result) {
         if (partsBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
+          if (((bitField0_ & 0x00000004) != 0)) {
             parts_ = java.util.Collections.unmodifiableList(parts_);
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
           }
           result.parts_ = parts_;
         } else {
           result.parts_ = partsBuilder_.build();
         }
-        result.timesAddedCount_ = timesAddedCount_;
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.name_ = name_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.type_ = type_;
+        }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.timesAddedCount_ = timesAddedCount_;
+        }
       }
 
       @java.lang.Override
@@ -2466,6 +2509,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhra
           return this;
         if (!other.getName().isEmpty()) {
           name_ = other.name_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.type_ != 0) {
@@ -2475,7 +2519,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhra
           if (!other.parts_.isEmpty()) {
             if (parts_.isEmpty()) {
               parts_ = other.parts_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000004);
             } else {
               ensurePartsIsMutable();
               parts_.addAll(other.parts_);
@@ -2488,7 +2532,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhra
               partsBuilder_.dispose();
               partsBuilder_ = null;
               parts_ = other.parts_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000004);
               partsBuilder_ =
                   com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                       ? getPartsFieldBuilder()
@@ -2530,13 +2574,13 @@ public Builder mergeFrom(
               case 10:
                 {
                   name_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 16:
                 {
                   type_ = input.readEnum();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 16
               case 26:
@@ -2556,7 +2600,7 @@ public Builder mergeFrom(
               case 32:
                 {
                   timesAddedCount_ = input.readInt32();
-
+                  bitField0_ |= 0x00000008;
                   break;
                 } // case 32
               default:
@@ -2639,8 +2683,8 @@ public Builder setName(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         name_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2656,8 +2700,8 @@ public Builder setName(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearName() {
-
         name_ = getDefaultInstance().getName();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -2678,8 +2722,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         name_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2717,8 +2761,8 @@ public int getTypeValue() {
        * @return This builder for chaining.
        */
       public Builder setTypeValue(int value) {
-
         type_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2737,9 +2781,8 @@ public Builder setTypeValue(int value) {
        */
       @java.lang.Override
       public com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Type getType() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Type result =
-            com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Type.valueOf(type_);
+            com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Type.forNumber(type_);
         return result == null
             ? com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Type.UNRECOGNIZED
             : result;
@@ -2762,7 +2805,7 @@ public Builder setType(com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase
         if (value == null) {
           throw new NullPointerException();
         }
-
+        bitField0_ |= 0x00000002;
         type_ = value.getNumber();
         onChanged();
         return this;
@@ -2781,7 +2824,7 @@ public Builder setType(com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase
        * @return This builder for chaining.
        */
       public Builder clearType() {
-
+        bitField0_ = (bitField0_ & ~0x00000002);
         type_ = 0;
         onChanged();
         return this;
@@ -2791,11 +2834,11 @@ public Builder clearType() {
           parts_ = java.util.Collections.emptyList();
 
       private void ensurePartsIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!((bitField0_ & 0x00000004) != 0)) {
           parts_ =
               new java.util.ArrayList<
                   com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Part>(parts_);
-          bitField0_ |= 0x00000001;
+          bitField0_ |= 0x00000004;
         }
       }
 
@@ -3184,7 +3227,7 @@ public Builder addAllParts(
       public Builder clearParts() {
         if (partsBuilder_ == null) {
           parts_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000004);
           onChanged();
         } else {
           partsBuilder_.clear();
@@ -3421,7 +3464,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Part.Builder ad
                   com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Part,
                   com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Part.Builder,
                   com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.PartOrBuilder>(
-                  parts_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                  parts_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
           parts_ = null;
         }
         return partsBuilder_;
@@ -3462,6 +3505,7 @@ public int getTimesAddedCount() {
       public Builder setTimesAddedCount(int value) {
 
         timesAddedCount_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -3479,7 +3523,7 @@ public Builder setTimesAddedCount(int value) {
        * @return This builder for chaining.
        */
       public Builder clearTimesAddedCount() {
-
+        bitField0_ = (bitField0_ & ~0x00000008);
         timesAddedCount_ = 0;
         onChanged();
         return this;
@@ -3837,7 +3881,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int NAME_FIELD_NUMBER = 1;
-    private volatile java.lang.Object name_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object name_ = "";
     /**
      *
      *
@@ -3886,7 +3932,9 @@ public com.google.protobuf.ByteString getNameBytes() {
     }
 
     public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-    private volatile java.lang.Object displayName_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object displayName_ = "";
     /**
      *
      *
@@ -3935,7 +3983,9 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
     }
 
     public static final int VALUE_FIELD_NUMBER = 3;
-    private volatile java.lang.Object value_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object value_ = "";
     /**
      *
      *
@@ -3994,7 +4044,9 @@ public com.google.protobuf.ByteString getValueBytes() {
     }
 
     public static final int DEFAULT_VALUE_FIELD_NUMBER = 4;
-    private volatile java.lang.Object defaultValue_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object defaultValue_ = "";
     /**
      *
      *
@@ -4049,7 +4101,9 @@ public com.google.protobuf.ByteString getDefaultValueBytes() {
     }
 
     public static final int ENTITY_TYPE_DISPLAY_NAME_FIELD_NUMBER = 5;
-    private volatile java.lang.Object entityTypeDisplayName_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object entityTypeDisplayName_ = "";
     /**
      *
      *
@@ -4102,7 +4156,7 @@ public com.google.protobuf.ByteString getEntityTypeDisplayNameBytes() {
     }
 
     public static final int MANDATORY_FIELD_NUMBER = 6;
-    private boolean mandatory_;
+    private boolean mandatory_ = false;
     /**
      *
      *
@@ -4122,6 +4176,8 @@ public boolean getMandatory() {
     }
 
     public static final int PROMPTS_FIELD_NUMBER = 7;
+
+    @SuppressWarnings("serial")
     private com.google.protobuf.LazyStringList prompts_;
     /**
      *
@@ -4187,7 +4243,7 @@ public com.google.protobuf.ByteString getPromptsBytes(int index) {
     }
 
     public static final int IS_LIST_FIELD_NUMBER = 8;
-    private boolean isList_;
+    private boolean isList_ = false;
     /**
      *
      *
@@ -4474,22 +4530,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         name_ = "";
-
         displayName_ = "";
-
         value_ = "";
-
         defaultValue_ = "";
-
         entityTypeDisplayName_ = "";
-
         mandatory_ = false;
-
         prompts_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000040);
         isList_ = false;
-
         return this;
       }
 
@@ -4517,23 +4567,48 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Parameter build() {
       public com.google.cloud.dialogflow.v2beta1.Intent.Parameter buildPartial() {
         com.google.cloud.dialogflow.v2beta1.Intent.Parameter result =
             new com.google.cloud.dialogflow.v2beta1.Intent.Parameter(this);
-        int from_bitField0_ = bitField0_;
-        result.name_ = name_;
-        result.displayName_ = displayName_;
-        result.value_ = value_;
-        result.defaultValue_ = defaultValue_;
-        result.entityTypeDisplayName_ = entityTypeDisplayName_;
-        result.mandatory_ = mandatory_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          prompts_ = prompts_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000001);
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
-        result.prompts_ = prompts_;
-        result.isList_ = isList_;
         onBuilt();
         return result;
       }
 
+      private void buildPartialRepeatedFields(
+          com.google.cloud.dialogflow.v2beta1.Intent.Parameter result) {
+        if (((bitField0_ & 0x00000040) != 0)) {
+          prompts_ = prompts_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000040);
+        }
+        result.prompts_ = prompts_;
+      }
+
+      private void buildPartial0(com.google.cloud.dialogflow.v2beta1.Intent.Parameter result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.name_ = name_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.displayName_ = displayName_;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.value_ = value_;
+        }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.defaultValue_ = defaultValue_;
+        }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.entityTypeDisplayName_ = entityTypeDisplayName_;
+        }
+        if (((from_bitField0_ & 0x00000020) != 0)) {
+          result.mandatory_ = mandatory_;
+        }
+        if (((from_bitField0_ & 0x00000080) != 0)) {
+          result.isList_ = isList_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -4584,22 +4659,27 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent.Parameter ot
           return this;
         if (!other.getName().isEmpty()) {
           name_ = other.name_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getDisplayName().isEmpty()) {
           displayName_ = other.displayName_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (!other.getValue().isEmpty()) {
           value_ = other.value_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
         if (!other.getDefaultValue().isEmpty()) {
           defaultValue_ = other.defaultValue_;
+          bitField0_ |= 0x00000008;
           onChanged();
         }
         if (!other.getEntityTypeDisplayName().isEmpty()) {
           entityTypeDisplayName_ = other.entityTypeDisplayName_;
+          bitField0_ |= 0x00000010;
           onChanged();
         }
         if (other.getMandatory() != false) {
@@ -4608,7 +4688,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent.Parameter ot
         if (!other.prompts_.isEmpty()) {
           if (prompts_.isEmpty()) {
             prompts_ = other.prompts_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000040);
           } else {
             ensurePromptsIsMutable();
             prompts_.addAll(other.prompts_);
@@ -4647,37 +4727,37 @@ public Builder mergeFrom(
               case 10:
                 {
                   name_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
                 {
                   displayName_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 18
               case 26:
                 {
                   value_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000004;
                   break;
                 } // case 26
               case 34:
                 {
                   defaultValue_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000008;
                   break;
                 } // case 34
               case 42:
                 {
                   entityTypeDisplayName_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000010;
                   break;
                 } // case 42
               case 48:
                 {
                   mandatory_ = input.readBool();
-
+                  bitField0_ |= 0x00000020;
                   break;
                 } // case 48
               case 58:
@@ -4690,7 +4770,7 @@ public Builder mergeFrom(
               case 64:
                 {
                   isList_ = input.readBool();
-
+                  bitField0_ |= 0x00000080;
                   break;
                 } // case 64
               default:
@@ -4773,8 +4853,8 @@ public Builder setName(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         name_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4790,8 +4870,8 @@ public Builder setName(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearName() {
-
         name_ = getDefaultInstance().getName();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -4812,8 +4892,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         name_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4879,8 +4959,8 @@ public Builder setDisplayName(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         displayName_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4896,8 +4976,8 @@ public Builder setDisplayName(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearDisplayName() {
-
         displayName_ = getDefaultInstance().getDisplayName();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -4918,8 +4998,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         displayName_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -5000,8 +5080,8 @@ public Builder setValue(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         value_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -5022,8 +5102,8 @@ public Builder setValue(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearValue() {
-
         value_ = getDefaultInstance().getValue();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -5049,8 +5129,8 @@ public Builder setValueBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         value_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -5125,8 +5205,8 @@ public Builder setDefaultValue(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         defaultValue_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -5145,8 +5225,8 @@ public Builder setDefaultValue(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearDefaultValue() {
-
         defaultValue_ = getDefaultInstance().getDefaultValue();
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
@@ -5170,8 +5250,8 @@ public Builder setDefaultValueBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         defaultValue_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -5243,8 +5323,8 @@ public Builder setEntityTypeDisplayName(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         entityTypeDisplayName_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -5262,8 +5342,8 @@ public Builder setEntityTypeDisplayName(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearEntityTypeDisplayName() {
-
         entityTypeDisplayName_ = getDefaultInstance().getEntityTypeDisplayName();
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
       }
@@ -5286,8 +5366,8 @@ public Builder setEntityTypeDisplayNameBytes(com.google.protobuf.ByteString valu
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         entityTypeDisplayName_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -5327,6 +5407,7 @@ public boolean getMandatory() {
       public Builder setMandatory(boolean value) {
 
         mandatory_ = value;
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -5344,7 +5425,7 @@ public Builder setMandatory(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearMandatory() {
-
+        bitField0_ = (bitField0_ & ~0x00000020);
         mandatory_ = false;
         onChanged();
         return this;
@@ -5354,9 +5435,9 @@ public Builder clearMandatory() {
           com.google.protobuf.LazyStringArrayList.EMPTY;
 
       private void ensurePromptsIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!((bitField0_ & 0x00000040) != 0)) {
           prompts_ = new com.google.protobuf.LazyStringArrayList(prompts_);
-          bitField0_ |= 0x00000001;
+          bitField0_ |= 0x00000040;
         }
       }
       /**
@@ -5499,7 +5580,7 @@ public Builder addAllPrompts(java.lang.Iterable<java.lang.String> values) {
        */
       public Builder clearPrompts() {
         prompts_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000040);
         onChanged();
         return this;
       }
@@ -5558,6 +5639,7 @@ public boolean getIsList() {
       public Builder setIsList(boolean value) {
 
         isList_ = value;
+        bitField0_ |= 0x00000080;
         onChanged();
         return this;
       }
@@ -5573,7 +5655,7 @@ public Builder setIsList(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearIsList() {
-
+        bitField0_ = (bitField0_ & ~0x00000080);
         isList_ = false;
         onChanged();
         return this;
@@ -6941,6 +7023,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int TEXT_FIELD_NUMBER = 1;
+
+      @SuppressWarnings("serial")
       private com.google.protobuf.LazyStringList text_;
       /**
        *
@@ -7208,6 +7292,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           text_ = com.google.protobuf.LazyStringArrayList.EMPTY;
           bitField0_ = (bitField0_ & ~0x00000001);
           return this;
@@ -7237,14 +7322,25 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Text build() {
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.Text buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.Text result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.Text(this);
-          int from_bitField0_ = bitField0_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.Text result) {
           if (((bitField0_ & 0x00000001) != 0)) {
             text_ = text_.getUnmodifiableView();
             bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.text_ = text_;
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(com.google.cloud.dialogflow.v2beta1.Intent.Message.Text result) {
+          int from_bitField0_ = bitField0_;
         }
 
         @java.lang.Override
@@ -7697,7 +7793,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int IMAGE_URI_FIELD_NUMBER = 1;
-      private volatile java.lang.Object imageUri_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object imageUri_ = "";
       /**
        *
        *
@@ -7746,7 +7844,9 @@ public com.google.protobuf.ByteString getImageUriBytes() {
       }
 
       public static final int ACCESSIBILITY_TEXT_FIELD_NUMBER = 2;
-      private volatile java.lang.Object accessibilityText_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object accessibilityText_ = "";
       /**
        *
        *
@@ -8005,10 +8105,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           imageUri_ = "";
-
           accessibilityText_ = "";
-
           return this;
         }
 
@@ -8037,12 +8136,24 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Image build() {
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.Image buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.Image result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.Image(this);
-          result.imageUri_ = imageUri_;
-          result.accessibilityText_ = accessibilityText_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.Image result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.imageUri_ = imageUri_;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.accessibilityText_ = accessibilityText_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -8094,10 +8205,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent.Message.Imag
             return this;
           if (!other.getImageUri().isEmpty()) {
             imageUri_ = other.imageUri_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (!other.getAccessibilityText().isEmpty()) {
             accessibilityText_ = other.accessibilityText_;
+            bitField0_ |= 0x00000002;
             onChanged();
           }
           this.mergeUnknownFields(other.getUnknownFields());
@@ -8129,13 +8242,13 @@ public Builder mergeFrom(
                 case 10:
                   {
                     imageUri_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
                   {
                     accessibilityText_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 18
                 default:
@@ -8155,6 +8268,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object imageUri_ = "";
         /**
          *
@@ -8216,8 +8331,8 @@ public Builder setImageUri(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           imageUri_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -8233,8 +8348,8 @@ public Builder setImageUri(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearImageUri() {
-
           imageUri_ = getDefaultInstance().getImageUri();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -8255,8 +8370,8 @@ public Builder setImageUriBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           imageUri_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -8325,8 +8440,8 @@ public Builder setAccessibilityText(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           accessibilityText_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -8343,8 +8458,8 @@ public Builder setAccessibilityText(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearAccessibilityText() {
-
           accessibilityText_ = getDefaultInstance().getAccessibilityText();
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -8366,8 +8481,8 @@ public Builder setAccessibilityTextBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           accessibilityText_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -8569,7 +8684,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int TITLE_FIELD_NUMBER = 1;
-      private volatile java.lang.Object title_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object title_ = "";
       /**
        *
        *
@@ -8618,6 +8735,8 @@ public com.google.protobuf.ByteString getTitleBytes() {
       }
 
       public static final int QUICK_REPLIES_FIELD_NUMBER = 2;
+
+      @SuppressWarnings("serial")
       private com.google.protobuf.LazyStringList quickReplies_;
       /**
        *
@@ -8897,10 +9016,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           title_ = "";
-
           quickReplies_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
@@ -8930,17 +9049,31 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.QuickReplies build() {
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.QuickReplies buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.QuickReplies result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.QuickReplies(this);
-          int from_bitField0_ = bitField0_;
-          result.title_ = title_;
-          if (((bitField0_ & 0x00000001) != 0)) {
-            quickReplies_ = quickReplies_.getUnmodifiableView();
-            bitField0_ = (bitField0_ & ~0x00000001);
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
           }
-          result.quickReplies_ = quickReplies_;
           onBuilt();
           return result;
         }
 
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.QuickReplies result) {
+          if (((bitField0_ & 0x00000002) != 0)) {
+            quickReplies_ = quickReplies_.getUnmodifiableView();
+            bitField0_ = (bitField0_ & ~0x00000002);
+          }
+          result.quickReplies_ = quickReplies_;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.QuickReplies result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.title_ = title_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -8994,12 +9127,13 @@ public Builder mergeFrom(
                   .getDefaultInstance()) return this;
           if (!other.getTitle().isEmpty()) {
             title_ = other.title_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (!other.quickReplies_.isEmpty()) {
             if (quickReplies_.isEmpty()) {
               quickReplies_ = other.quickReplies_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
             } else {
               ensureQuickRepliesIsMutable();
               quickReplies_.addAll(other.quickReplies_);
@@ -9035,7 +9169,7 @@ public Builder mergeFrom(
                 case 10:
                   {
                     title_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
@@ -9125,8 +9259,8 @@ public Builder setTitle(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -9142,8 +9276,8 @@ public Builder setTitle(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearTitle() {
-
           title_ = getDefaultInstance().getTitle();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -9164,8 +9298,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -9174,9 +9308,9 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
             com.google.protobuf.LazyStringArrayList.EMPTY;
 
         private void ensureQuickRepliesIsMutable() {
-          if (!((bitField0_ & 0x00000001) != 0)) {
+          if (!((bitField0_ & 0x00000002) != 0)) {
             quickReplies_ = new com.google.protobuf.LazyStringArrayList(quickReplies_);
-            bitField0_ |= 0x00000001;
+            bitField0_ |= 0x00000002;
           }
         }
         /**
@@ -9311,7 +9445,7 @@ public Builder addAllQuickReplies(java.lang.Iterable<java.lang.String> values) {
          */
         public Builder clearQuickReplies() {
           quickReplies_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -9705,7 +9839,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         }
 
         public static final int TEXT_FIELD_NUMBER = 1;
-        private volatile java.lang.Object text_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object text_ = "";
         /**
          *
          *
@@ -9754,7 +9890,9 @@ public com.google.protobuf.ByteString getTextBytes() {
         }
 
         public static final int POSTBACK_FIELD_NUMBER = 2;
-        private volatile java.lang.Object postback_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object postback_ = "";
         /**
          *
          *
@@ -10018,10 +10156,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           @java.lang.Override
           public Builder clear() {
             super.clear();
+            bitField0_ = 0;
             text_ = "";
-
             postback_ = "";
-
             return this;
           }
 
@@ -10051,12 +10188,24 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Card.Button build() {
           public com.google.cloud.dialogflow.v2beta1.Intent.Message.Card.Button buildPartial() {
             com.google.cloud.dialogflow.v2beta1.Intent.Message.Card.Button result =
                 new com.google.cloud.dialogflow.v2beta1.Intent.Message.Card.Button(this);
-            result.text_ = text_;
-            result.postback_ = postback_;
+            if (bitField0_ != 0) {
+              buildPartial0(result);
+            }
             onBuilt();
             return result;
           }
 
+          private void buildPartial0(
+              com.google.cloud.dialogflow.v2beta1.Intent.Message.Card.Button result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+              result.text_ = text_;
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+              result.postback_ = postback_;
+            }
+          }
+
           @java.lang.Override
           public Builder clone() {
             return super.clone();
@@ -10110,10 +10259,12 @@ public Builder mergeFrom(
                     .getDefaultInstance()) return this;
             if (!other.getText().isEmpty()) {
               text_ = other.text_;
+              bitField0_ |= 0x00000001;
               onChanged();
             }
             if (!other.getPostback().isEmpty()) {
               postback_ = other.postback_;
+              bitField0_ |= 0x00000002;
               onChanged();
             }
             this.mergeUnknownFields(other.getUnknownFields());
@@ -10145,13 +10296,13 @@ public Builder mergeFrom(
                   case 10:
                     {
                       text_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000001;
                       break;
                     } // case 10
                   case 18:
                     {
                       postback_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000002;
                       break;
                     } // case 18
                   default:
@@ -10171,6 +10322,8 @@ public Builder mergeFrom(
             return this;
           }
 
+          private int bitField0_;
+
           private java.lang.Object text_ = "";
           /**
            *
@@ -10232,8 +10385,8 @@ public Builder setText(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             text_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
           }
@@ -10249,8 +10402,8 @@ public Builder setText(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearText() {
-
             text_ = getDefaultInstance().getText();
+            bitField0_ = (bitField0_ & ~0x00000001);
             onChanged();
             return this;
           }
@@ -10271,8 +10424,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             text_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
           }
@@ -10341,8 +10494,8 @@ public Builder setPostback(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             postback_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -10359,8 +10512,8 @@ public Builder setPostback(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearPostback() {
-
             postback_ = getDefaultInstance().getPostback();
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
             return this;
           }
@@ -10382,8 +10535,8 @@ public Builder setPostbackBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             postback_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -10456,7 +10609,9 @@ public com.google.protobuf.Parser<Button> getParserForType() {
       }
 
       public static final int TITLE_FIELD_NUMBER = 1;
-      private volatile java.lang.Object title_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object title_ = "";
       /**
        *
        *
@@ -10505,7 +10660,9 @@ public com.google.protobuf.ByteString getTitleBytes() {
       }
 
       public static final int SUBTITLE_FIELD_NUMBER = 2;
-      private volatile java.lang.Object subtitle_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object subtitle_ = "";
       /**
        *
        *
@@ -10554,7 +10711,9 @@ public com.google.protobuf.ByteString getSubtitleBytes() {
       }
 
       public static final int IMAGE_URI_FIELD_NUMBER = 3;
-      private volatile java.lang.Object imageUri_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object imageUri_ = "";
       /**
        *
        *
@@ -10603,6 +10762,8 @@ public com.google.protobuf.ByteString getImageUriBytes() {
       }
 
       public static final int BUTTONS_FIELD_NUMBER = 4;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent.Message.Card.Button>
           buttons_;
       /**
@@ -10909,19 +11070,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           title_ = "";
-
           subtitle_ = "";
-
           imageUri_ = "";
-
           if (buttonsBuilder_ == null) {
             buttons_ = java.util.Collections.emptyList();
           } else {
             buttons_ = null;
             buttonsBuilder_.clear();
           }
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000008);
           return this;
         }
 
@@ -10949,21 +11108,38 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Card build() {
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.Card buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.Card result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.Card(this);
-          int from_bitField0_ = bitField0_;
-          result.title_ = title_;
-          result.subtitle_ = subtitle_;
-          result.imageUri_ = imageUri_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.Card result) {
           if (buttonsBuilder_ == null) {
-            if (((bitField0_ & 0x00000001) != 0)) {
+            if (((bitField0_ & 0x00000008) != 0)) {
               buttons_ = java.util.Collections.unmodifiableList(buttons_);
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000008);
             }
             result.buttons_ = buttons_;
           } else {
             result.buttons_ = buttonsBuilder_.build();
           }
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(com.google.cloud.dialogflow.v2beta1.Intent.Message.Card result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.title_ = title_;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.subtitle_ = subtitle_;
+          }
+          if (((from_bitField0_ & 0x00000004) != 0)) {
+            result.imageUri_ = imageUri_;
+          }
         }
 
         @java.lang.Override
@@ -11016,21 +11192,24 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent.Message.Card
             return this;
           if (!other.getTitle().isEmpty()) {
             title_ = other.title_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (!other.getSubtitle().isEmpty()) {
             subtitle_ = other.subtitle_;
+            bitField0_ |= 0x00000002;
             onChanged();
           }
           if (!other.getImageUri().isEmpty()) {
             imageUri_ = other.imageUri_;
+            bitField0_ |= 0x00000004;
             onChanged();
           }
           if (buttonsBuilder_ == null) {
             if (!other.buttons_.isEmpty()) {
               if (buttons_.isEmpty()) {
                 buttons_ = other.buttons_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000008);
               } else {
                 ensureButtonsIsMutable();
                 buttons_.addAll(other.buttons_);
@@ -11043,7 +11222,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent.Message.Card
                 buttonsBuilder_.dispose();
                 buttonsBuilder_ = null;
                 buttons_ = other.buttons_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000008);
                 buttonsBuilder_ =
                     com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                         ? getButtonsFieldBuilder()
@@ -11082,19 +11261,19 @@ public Builder mergeFrom(
                 case 10:
                   {
                     title_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
                   {
                     subtitle_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 18
                 case 26:
                   {
                     imageUri_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000004;
                     break;
                   } // case 26
                 case 34:
@@ -11191,8 +11370,8 @@ public Builder setTitle(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -11208,8 +11387,8 @@ public Builder setTitle(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearTitle() {
-
           title_ = getDefaultInstance().getTitle();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -11230,8 +11409,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -11297,8 +11476,8 @@ public Builder setSubtitle(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           subtitle_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -11314,8 +11493,8 @@ public Builder setSubtitle(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearSubtitle() {
-
           subtitle_ = getDefaultInstance().getSubtitle();
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -11336,8 +11515,8 @@ public Builder setSubtitleBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           subtitle_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -11403,8 +11582,8 @@ public Builder setImageUri(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           imageUri_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -11420,8 +11599,8 @@ public Builder setImageUri(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearImageUri() {
-
           imageUri_ = getDefaultInstance().getImageUri();
+          bitField0_ = (bitField0_ & ~0x00000004);
           onChanged();
           return this;
         }
@@ -11442,8 +11621,8 @@ public Builder setImageUriBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           imageUri_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -11452,11 +11631,11 @@ public Builder setImageUriBytes(com.google.protobuf.ByteString value) {
             buttons_ = java.util.Collections.emptyList();
 
         private void ensureButtonsIsMutable() {
-          if (!((bitField0_ & 0x00000001) != 0)) {
+          if (!((bitField0_ & 0x00000008) != 0)) {
             buttons_ =
                 new java.util.ArrayList<
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.Card.Button>(buttons_);
-            bitField0_ |= 0x00000001;
+            bitField0_ |= 0x00000008;
           }
         }
 
@@ -11695,7 +11874,7 @@ public Builder addAllButtons(
         public Builder clearButtons() {
           if (buttonsBuilder_ == null) {
             buttons_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000008);
             onChanged();
           } else {
             buttonsBuilder_.clear();
@@ -11835,7 +12014,7 @@ public Builder removeButtons(int index) {
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.Card.Button,
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.Card.Button.Builder,
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.Card.ButtonOrBuilder>(
-                    buttons_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                    buttons_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
             buttons_ = null;
           }
           return buttonsBuilder_;
@@ -12043,7 +12222,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int TEXT_TO_SPEECH_FIELD_NUMBER = 1;
-      private volatile java.lang.Object textToSpeech_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object textToSpeech_ = "";
       /**
        *
        *
@@ -12094,7 +12275,9 @@ public com.google.protobuf.ByteString getTextToSpeechBytes() {
       }
 
       public static final int SSML_FIELD_NUMBER = 2;
-      private volatile java.lang.Object ssml_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object ssml_ = "";
       /**
        *
        *
@@ -12147,7 +12330,9 @@ public com.google.protobuf.ByteString getSsmlBytes() {
       }
 
       public static final int DISPLAY_TEXT_FIELD_NUMBER = 3;
-      private volatile java.lang.Object displayText_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object displayText_ = "";
       /**
        *
        *
@@ -12416,12 +12601,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           textToSpeech_ = "";
-
           ssml_ = "";
-
           displayText_ = "";
-
           return this;
         }
 
@@ -12451,13 +12634,27 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponse build()
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponse buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponse result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponse(this);
-          result.textToSpeech_ = textToSpeech_;
-          result.ssml_ = ssml_;
-          result.displayText_ = displayText_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponse result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.textToSpeech_ = textToSpeech_;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.ssml_ = ssml_;
+          }
+          if (((from_bitField0_ & 0x00000004) != 0)) {
+            result.displayText_ = displayText_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -12511,14 +12708,17 @@ public Builder mergeFrom(
                   .getDefaultInstance()) return this;
           if (!other.getTextToSpeech().isEmpty()) {
             textToSpeech_ = other.textToSpeech_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (!other.getSsml().isEmpty()) {
             ssml_ = other.ssml_;
+            bitField0_ |= 0x00000002;
             onChanged();
           }
           if (!other.getDisplayText().isEmpty()) {
             displayText_ = other.displayText_;
+            bitField0_ |= 0x00000004;
             onChanged();
           }
           this.mergeUnknownFields(other.getUnknownFields());
@@ -12550,19 +12750,19 @@ public Builder mergeFrom(
                 case 10:
                   {
                     textToSpeech_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
                   {
                     ssml_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 18
                 case 26:
                   {
                     displayText_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000004;
                     break;
                   } // case 26
                 default:
@@ -12582,6 +12782,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object textToSpeech_ = "";
         /**
          *
@@ -12646,8 +12848,8 @@ public Builder setTextToSpeech(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           textToSpeech_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -12664,8 +12866,8 @@ public Builder setTextToSpeech(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearTextToSpeech() {
-
           textToSpeech_ = getDefaultInstance().getTextToSpeech();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -12687,8 +12889,8 @@ public Builder setTextToSpeechBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           textToSpeech_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -12760,8 +12962,8 @@ public Builder setSsml(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           ssml_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -12779,8 +12981,8 @@ public Builder setSsml(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearSsml() {
-
           ssml_ = getDefaultInstance().getSsml();
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -12803,8 +13005,8 @@ public Builder setSsmlBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           ssml_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -12870,8 +13072,8 @@ public Builder setDisplayText(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           displayText_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -12887,8 +13089,8 @@ public Builder setDisplayText(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearDisplayText() {
-
           displayText_ = getDefaultInstance().getDisplayText();
+          bitField0_ = (bitField0_ & ~0x00000004);
           onChanged();
           return this;
         }
@@ -12909,8 +13111,8 @@ public Builder setDisplayTextBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           displayText_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -13106,6 +13308,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int SIMPLE_RESPONSES_FIELD_NUMBER = 1;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponse>
           simpleResponses_;
       /**
@@ -13398,6 +13602,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           if (simpleResponsesBuilder_ == null) {
             simpleResponses_ = java.util.Collections.emptyList();
           } else {
@@ -13435,7 +13640,16 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponses build(
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponses buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponses result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponses(this);
-          int from_bitField0_ = bitField0_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponses result) {
           if (simpleResponsesBuilder_ == null) {
             if (((bitField0_ & 0x00000001) != 0)) {
               simpleResponses_ = java.util.Collections.unmodifiableList(simpleResponses_);
@@ -13445,8 +13659,11 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponses buildP
           } else {
             result.simpleResponses_ = simpleResponsesBuilder_.build();
           }
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponses result) {
+          int from_bitField0_ = bitField0_;
         }
 
         @java.lang.Override
@@ -14509,7 +14726,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
           }
 
           public static final int URI_FIELD_NUMBER = 1;
-          private volatile java.lang.Object uri_;
+
+          @SuppressWarnings("serial")
+          private volatile java.lang.Object uri_ = "";
           /**
            *
            *
@@ -14792,8 +15011,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
             @java.lang.Override
             public Builder clear() {
               super.clear();
+              bitField0_ = 0;
               uri_ = "";
-
               return this;
             }
 
@@ -14828,11 +15047,22 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
                   result =
                       new com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button
                           .OpenUriAction(this);
-              result.uri_ = uri_;
+              if (bitField0_ != 0) {
+                buildPartial0(result);
+              }
               onBuilt();
               return result;
             }
 
+            private void buildPartial0(
+                com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button.OpenUriAction
+                    result) {
+              int from_bitField0_ = bitField0_;
+              if (((from_bitField0_ & 0x00000001) != 0)) {
+                result.uri_ = uri_;
+              }
+            }
+
             @java.lang.Override
             public Builder clone() {
               return super.clone();
@@ -14892,6 +15122,7 @@ public Builder mergeFrom(
                       .OpenUriAction.getDefaultInstance()) return this;
               if (!other.getUri().isEmpty()) {
                 uri_ = other.uri_;
+                bitField0_ |= 0x00000001;
                 onChanged();
               }
               this.mergeUnknownFields(other.getUnknownFields());
@@ -14923,7 +15154,7 @@ public Builder mergeFrom(
                     case 10:
                       {
                         uri_ = input.readStringRequireUtf8();
-
+                        bitField0_ |= 0x00000001;
                         break;
                       } // case 10
                     default:
@@ -14943,6 +15174,8 @@ public Builder mergeFrom(
               return this;
             }
 
+            private int bitField0_;
+
             private java.lang.Object uri_ = "";
             /**
              *
@@ -15004,8 +15237,8 @@ public Builder setUri(java.lang.String value) {
               if (value == null) {
                 throw new NullPointerException();
               }
-
               uri_ = value;
+              bitField0_ |= 0x00000001;
               onChanged();
               return this;
             }
@@ -15021,8 +15254,8 @@ public Builder setUri(java.lang.String value) {
              * @return This builder for chaining.
              */
             public Builder clearUri() {
-
               uri_ = getDefaultInstance().getUri();
+              bitField0_ = (bitField0_ & ~0x00000001);
               onChanged();
               return this;
             }
@@ -15043,8 +15276,8 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
               }
               checkByteStringIsUtf8(value);
-
               uri_ = value;
+              bitField0_ |= 0x00000001;
               onChanged();
               return this;
             }
@@ -15121,7 +15354,9 @@ public com.google.protobuf.Parser<OpenUriAction> getParserForType() {
         }
 
         public static final int TITLE_FIELD_NUMBER = 1;
-        private volatile java.lang.Object title_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object title_ = "";
         /**
          *
          *
@@ -15225,7 +15460,10 @@ public boolean hasOpenUriAction() {
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button
                 .OpenUriActionOrBuilder
             getOpenUriActionOrBuilder() {
-          return getOpenUriAction();
+          return openUriAction_ == null
+              ? com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button.OpenUriAction
+                  .getDefaultInstance()
+              : openUriAction_;
         }
 
         private byte memoizedIsInitialized = -1;
@@ -15449,12 +15687,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           @java.lang.Override
           public Builder clear() {
             super.clear();
+            bitField0_ = 0;
             title_ = "";
-
-            if (openUriActionBuilder_ == null) {
-              openUriAction_ = null;
-            } else {
-              openUriAction_ = null;
+            openUriAction_ = null;
+            if (openUriActionBuilder_ != null) {
+              openUriActionBuilder_.dispose();
               openUriActionBuilder_ = null;
             }
             return this;
@@ -15488,16 +15725,25 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button build
               buildPartial() {
             com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button result =
                 new com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button(this);
-            result.title_ = title_;
-            if (openUriActionBuilder_ == null) {
-              result.openUriAction_ = openUriAction_;
-            } else {
-              result.openUriAction_ = openUriActionBuilder_.build();
+            if (bitField0_ != 0) {
+              buildPartial0(result);
             }
             onBuilt();
             return result;
           }
 
+          private void buildPartial0(
+              com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+              result.title_ = title_;
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+              result.openUriAction_ =
+                  openUriActionBuilder_ == null ? openUriAction_ : openUriActionBuilder_.build();
+            }
+          }
+
           @java.lang.Override
           public Builder clone() {
             return super.clone();
@@ -15552,6 +15798,7 @@ public Builder mergeFrom(
                     .getDefaultInstance()) return this;
             if (!other.getTitle().isEmpty()) {
               title_ = other.title_;
+              bitField0_ |= 0x00000001;
               onChanged();
             }
             if (other.hasOpenUriAction()) {
@@ -15586,14 +15833,14 @@ public Builder mergeFrom(
                   case 10:
                     {
                       title_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000001;
                       break;
                     } // case 10
                   case 18:
                     {
                       input.readMessage(
                           getOpenUriActionFieldBuilder().getBuilder(), extensionRegistry);
-
+                      bitField0_ |= 0x00000002;
                       break;
                     } // case 18
                   default:
@@ -15613,6 +15860,8 @@ public Builder mergeFrom(
             return this;
           }
 
+          private int bitField0_;
+
           private java.lang.Object title_ = "";
           /**
            *
@@ -15674,8 +15923,8 @@ public Builder setTitle(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             title_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
           }
@@ -15691,8 +15940,8 @@ public Builder setTitle(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearTitle() {
-
             title_ = getDefaultInstance().getTitle();
+            bitField0_ = (bitField0_ & ~0x00000001);
             onChanged();
             return this;
           }
@@ -15713,8 +15962,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             title_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
           }
@@ -15742,7 +15991,7 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
            * @return Whether the openUriAction field is set.
            */
           public boolean hasOpenUriAction() {
-            return openUriActionBuilder_ != null || openUriAction_ != null;
+            return ((bitField0_ & 0x00000002) != 0);
           }
           /**
            *
@@ -15787,11 +16036,11 @@ public Builder setOpenUriAction(
                 throw new NullPointerException();
               }
               openUriAction_ = value;
-              onChanged();
             } else {
               openUriActionBuilder_.setMessage(value);
             }
-
+            bitField0_ |= 0x00000002;
+            onChanged();
             return this;
           }
           /**
@@ -15811,11 +16060,11 @@ public Builder setOpenUriAction(
                   builderForValue) {
             if (openUriActionBuilder_ == null) {
               openUriAction_ = builderForValue.build();
-              onChanged();
             } else {
               openUriActionBuilder_.setMessage(builderForValue.build());
             }
-
+            bitField0_ |= 0x00000002;
+            onChanged();
             return this;
           }
           /**
@@ -15833,20 +16082,20 @@ public Builder mergeOpenUriAction(
               com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button.OpenUriAction
                   value) {
             if (openUriActionBuilder_ == null) {
-              if (openUriAction_ != null) {
-                openUriAction_ =
-                    com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button
-                        .OpenUriAction.newBuilder(openUriAction_)
-                        .mergeFrom(value)
-                        .buildPartial();
+              if (((bitField0_ & 0x00000002) != 0)
+                  && openUriAction_ != null
+                  && openUriAction_
+                      != com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button
+                          .OpenUriAction.getDefaultInstance()) {
+                getOpenUriActionBuilder().mergeFrom(value);
               } else {
                 openUriAction_ = value;
               }
-              onChanged();
             } else {
               openUriActionBuilder_.mergeFrom(value);
             }
-
+            bitField0_ |= 0x00000002;
+            onChanged();
             return this;
           }
           /**
@@ -15861,14 +16110,13 @@ public Builder mergeOpenUriAction(
            * </code>
            */
           public Builder clearOpenUriAction() {
-            if (openUriActionBuilder_ == null) {
-              openUriAction_ = null;
-              onChanged();
-            } else {
-              openUriAction_ = null;
+            bitField0_ = (bitField0_ & ~0x00000002);
+            openUriAction_ = null;
+            if (openUriActionBuilder_ != null) {
+              openUriActionBuilder_.dispose();
               openUriActionBuilder_ = null;
             }
-
+            onChanged();
             return this;
           }
           /**
@@ -15885,7 +16133,7 @@ public Builder clearOpenUriAction() {
           public com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button.OpenUriAction
                   .Builder
               getOpenUriActionBuilder() {
-
+            bitField0_ |= 0x00000002;
             onChanged();
             return getOpenUriActionFieldBuilder().getBuilder();
           }
@@ -16014,7 +16262,9 @@ public com.google.protobuf.Parser<Button> getParserForType() {
       }
 
       public static final int TITLE_FIELD_NUMBER = 1;
-      private volatile java.lang.Object title_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object title_ = "";
       /**
        *
        *
@@ -16063,7 +16313,9 @@ public com.google.protobuf.ByteString getTitleBytes() {
       }
 
       public static final int SUBTITLE_FIELD_NUMBER = 2;
-      private volatile java.lang.Object subtitle_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object subtitle_ = "";
       /**
        *
        *
@@ -16112,7 +16364,9 @@ public com.google.protobuf.ByteString getSubtitleBytes() {
       }
 
       public static final int FORMATTED_TEXT_FIELD_NUMBER = 3;
-      private volatile java.lang.Object formattedText_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object formattedText_ = "";
       /**
        *
        *
@@ -16205,10 +16459,14 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Image getImage() {
        */
       @java.lang.Override
       public com.google.cloud.dialogflow.v2beta1.Intent.Message.ImageOrBuilder getImageOrBuilder() {
-        return getImage();
+        return image_ == null
+            ? com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.getDefaultInstance()
+            : image_;
       }
 
       public static final int BUTTONS_FIELD_NUMBER = 5;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button>
           buttons_;
       /**
@@ -16536,16 +16794,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           title_ = "";
-
           subtitle_ = "";
-
           formattedText_ = "";
-
-          if (imageBuilder_ == null) {
-            image_ = null;
-          } else {
-            image_ = null;
+          image_ = null;
+          if (imageBuilder_ != null) {
+            imageBuilder_.dispose();
             imageBuilder_ = null;
           }
           if (buttonsBuilder_ == null) {
@@ -16554,7 +16809,7 @@ public Builder clear() {
             buttons_ = null;
             buttonsBuilder_.clear();
           }
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000010);
           return this;
         }
 
@@ -16583,26 +16838,42 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard build() {
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard(this);
-          int from_bitField0_ = bitField0_;
-          result.title_ = title_;
-          result.subtitle_ = subtitle_;
-          result.formattedText_ = formattedText_;
-          if (imageBuilder_ == null) {
-            result.image_ = image_;
-          } else {
-            result.image_ = imageBuilder_.build();
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
           }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard result) {
           if (buttonsBuilder_ == null) {
-            if (((bitField0_ & 0x00000001) != 0)) {
+            if (((bitField0_ & 0x00000010) != 0)) {
               buttons_ = java.util.Collections.unmodifiableList(buttons_);
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000010);
             }
             result.buttons_ = buttons_;
           } else {
             result.buttons_ = buttonsBuilder_.build();
           }
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.title_ = title_;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.subtitle_ = subtitle_;
+          }
+          if (((from_bitField0_ & 0x00000004) != 0)) {
+            result.formattedText_ = formattedText_;
+          }
+          if (((from_bitField0_ & 0x00000008) != 0)) {
+            result.image_ = imageBuilder_ == null ? image_ : imageBuilder_.build();
+          }
         }
 
         @java.lang.Override
@@ -16657,14 +16928,17 @@ public Builder mergeFrom(
             return this;
           if (!other.getTitle().isEmpty()) {
             title_ = other.title_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (!other.getSubtitle().isEmpty()) {
             subtitle_ = other.subtitle_;
+            bitField0_ |= 0x00000002;
             onChanged();
           }
           if (!other.getFormattedText().isEmpty()) {
             formattedText_ = other.formattedText_;
+            bitField0_ |= 0x00000004;
             onChanged();
           }
           if (other.hasImage()) {
@@ -16674,7 +16948,7 @@ public Builder mergeFrom(
             if (!other.buttons_.isEmpty()) {
               if (buttons_.isEmpty()) {
                 buttons_ = other.buttons_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000010);
               } else {
                 ensureButtonsIsMutable();
                 buttons_.addAll(other.buttons_);
@@ -16687,7 +16961,7 @@ public Builder mergeFrom(
                 buttonsBuilder_.dispose();
                 buttonsBuilder_ = null;
                 buttons_ = other.buttons_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000010);
                 buttonsBuilder_ =
                     com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                         ? getButtonsFieldBuilder()
@@ -16726,25 +17000,25 @@ public Builder mergeFrom(
                 case 10:
                   {
                     title_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
                   {
                     subtitle_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 18
                 case 26:
                   {
                     formattedText_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000004;
                     break;
                   } // case 26
                 case 34:
                   {
                     input.readMessage(getImageFieldBuilder().getBuilder(), extensionRegistry);
-
+                    bitField0_ |= 0x00000008;
                     break;
                   } // case 34
                 case 42:
@@ -16842,8 +17116,8 @@ public Builder setTitle(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -16859,8 +17133,8 @@ public Builder setTitle(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearTitle() {
-
           title_ = getDefaultInstance().getTitle();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -16881,8 +17155,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -16948,8 +17222,8 @@ public Builder setSubtitle(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           subtitle_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -16965,8 +17239,8 @@ public Builder setSubtitle(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearSubtitle() {
-
           subtitle_ = getDefaultInstance().getSubtitle();
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -16987,8 +17261,8 @@ public Builder setSubtitleBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           subtitle_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -17054,8 +17328,8 @@ public Builder setFormattedText(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           formattedText_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -17071,8 +17345,8 @@ public Builder setFormattedText(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearFormattedText() {
-
           formattedText_ = getDefaultInstance().getFormattedText();
+          bitField0_ = (bitField0_ & ~0x00000004);
           onChanged();
           return this;
         }
@@ -17093,8 +17367,8 @@ public Builder setFormattedTextBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           formattedText_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -17117,7 +17391,7 @@ public Builder setFormattedTextBytes(com.google.protobuf.ByteString value) {
          * @return Whether the image field is set.
          */
         public boolean hasImage() {
-          return imageBuilder_ != null || image_ != null;
+          return ((bitField0_ & 0x00000008) != 0);
         }
         /**
          *
@@ -17154,11 +17428,11 @@ public Builder setImage(com.google.cloud.dialogflow.v2beta1.Intent.Message.Image
               throw new NullPointerException();
             }
             image_ = value;
-            onChanged();
           } else {
             imageBuilder_.setMessage(value);
           }
-
+          bitField0_ |= 0x00000008;
+          onChanged();
           return this;
         }
         /**
@@ -17174,11 +17448,11 @@ public Builder setImage(
             com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.Builder builderForValue) {
           if (imageBuilder_ == null) {
             image_ = builderForValue.build();
-            onChanged();
           } else {
             imageBuilder_.setMessage(builderForValue.build());
           }
-
+          bitField0_ |= 0x00000008;
+          onChanged();
           return this;
         }
         /**
@@ -17192,19 +17466,20 @@ public Builder setImage(
          */
         public Builder mergeImage(com.google.cloud.dialogflow.v2beta1.Intent.Message.Image value) {
           if (imageBuilder_ == null) {
-            if (image_ != null) {
-              image_ =
-                  com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.newBuilder(image_)
-                      .mergeFrom(value)
-                      .buildPartial();
+            if (((bitField0_ & 0x00000008) != 0)
+                && image_ != null
+                && image_
+                    != com.google.cloud.dialogflow.v2beta1.Intent.Message.Image
+                        .getDefaultInstance()) {
+              getImageBuilder().mergeFrom(value);
             } else {
               image_ = value;
             }
-            onChanged();
           } else {
             imageBuilder_.mergeFrom(value);
           }
-
+          bitField0_ |= 0x00000008;
+          onChanged();
           return this;
         }
         /**
@@ -17217,14 +17492,13 @@ public Builder mergeImage(com.google.cloud.dialogflow.v2beta1.Intent.Message.Ima
          * <code>.google.cloud.dialogflow.v2beta1.Intent.Message.Image image = 4;</code>
          */
         public Builder clearImage() {
-          if (imageBuilder_ == null) {
-            image_ = null;
-            onChanged();
-          } else {
-            image_ = null;
+          bitField0_ = (bitField0_ & ~0x00000008);
+          image_ = null;
+          if (imageBuilder_ != null) {
+            imageBuilder_.dispose();
             imageBuilder_ = null;
           }
-
+          onChanged();
           return this;
         }
         /**
@@ -17237,7 +17511,7 @@ public Builder clearImage() {
          * <code>.google.cloud.dialogflow.v2beta1.Intent.Message.Image image = 4;</code>
          */
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.Builder getImageBuilder() {
-
+          bitField0_ |= 0x00000008;
           onChanged();
           return getImageFieldBuilder().getBuilder();
         }
@@ -17290,11 +17564,11 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.Builder getImage
             buttons_ = java.util.Collections.emptyList();
 
         private void ensureButtonsIsMutable() {
-          if (!((bitField0_ & 0x00000001) != 0)) {
+          if (!((bitField0_ & 0x00000010) != 0)) {
             buttons_ =
                 new java.util.ArrayList<
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button>(buttons_);
-            bitField0_ |= 0x00000001;
+            bitField0_ |= 0x00000010;
           }
         }
 
@@ -17544,7 +17818,7 @@ public Builder addAllButtons(
         public Builder clearButtons() {
           if (buttonsBuilder_ == null) {
             buttons_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
             onChanged();
           } else {
             buttonsBuilder_.clear();
@@ -17692,7 +17966,7 @@ public Builder removeButtons(int index) {
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button,
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button.Builder,
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.ButtonOrBuilder>(
-                    buttons_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                    buttons_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
             buttons_ = null;
           }
           return buttonsBuilder_;
@@ -17846,7 +18120,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int TITLE_FIELD_NUMBER = 1;
-      private volatile java.lang.Object title_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object title_ = "";
       /**
        *
        *
@@ -18098,8 +18374,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           title_ = "";
-
           return this;
         }
 
@@ -18128,11 +18404,21 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestion build() {
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestion buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestion result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestion(this);
-          result.title_ = title_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestion result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.title_ = title_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -18185,6 +18471,7 @@ public Builder mergeFrom(
             return this;
           if (!other.getTitle().isEmpty()) {
             title_ = other.title_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           this.mergeUnknownFields(other.getUnknownFields());
@@ -18216,7 +18503,7 @@ public Builder mergeFrom(
                 case 10:
                   {
                     title_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 default:
@@ -18236,6 +18523,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object title_ = "";
         /**
          *
@@ -18297,8 +18586,8 @@ public Builder setTitle(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -18314,8 +18603,8 @@ public Builder setTitle(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearTitle() {
-
           title_ = getDefaultInstance().getTitle();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -18336,8 +18625,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -18524,6 +18813,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int SUGGESTIONS_FIELD_NUMBER = 1;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestion>
           suggestions_;
       /**
@@ -18807,6 +19098,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           if (suggestionsBuilder_ == null) {
             suggestions_ = java.util.Collections.emptyList();
           } else {
@@ -18843,7 +19135,16 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestions build() {
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestions buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestions result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestions(this);
-          int from_bitField0_ = bitField0_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestions result) {
           if (suggestionsBuilder_ == null) {
             if (((bitField0_ & 0x00000001) != 0)) {
               suggestions_ = java.util.Collections.unmodifiableList(suggestions_);
@@ -18853,8 +19154,11 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestions buildParti
           } else {
             result.suggestions_ = suggestionsBuilder_.build();
           }
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestions result) {
+          int from_bitField0_ = bitField0_;
         }
 
         @java.lang.Override
@@ -19580,7 +19884,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int DESTINATION_NAME_FIELD_NUMBER = 1;
-      private volatile java.lang.Object destinationName_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object destinationName_ = "";
       /**
        *
        *
@@ -19629,7 +19935,9 @@ public com.google.protobuf.ByteString getDestinationNameBytes() {
       }
 
       public static final int URI_FIELD_NUMBER = 2;
-      private volatile java.lang.Object uri_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object uri_ = "";
       /**
        *
        *
@@ -19894,10 +20202,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           destinationName_ = "";
-
           uri_ = "";
-
           return this;
         }
 
@@ -19928,12 +20235,24 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.LinkOutSuggestion buil
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.LinkOutSuggestion buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.LinkOutSuggestion result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.LinkOutSuggestion(this);
-          result.destinationName_ = destinationName_;
-          result.uri_ = uri_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.LinkOutSuggestion result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.destinationName_ = destinationName_;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.uri_ = uri_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -19988,10 +20307,12 @@ public Builder mergeFrom(
                   .getDefaultInstance()) return this;
           if (!other.getDestinationName().isEmpty()) {
             destinationName_ = other.destinationName_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (!other.getUri().isEmpty()) {
             uri_ = other.uri_;
+            bitField0_ |= 0x00000002;
             onChanged();
           }
           this.mergeUnknownFields(other.getUnknownFields());
@@ -20023,13 +20344,13 @@ public Builder mergeFrom(
                 case 10:
                   {
                     destinationName_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
                   {
                     uri_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 18
                 default:
@@ -20049,6 +20370,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object destinationName_ = "";
         /**
          *
@@ -20110,8 +20433,8 @@ public Builder setDestinationName(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           destinationName_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -20127,8 +20450,8 @@ public Builder setDestinationName(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearDestinationName() {
-
           destinationName_ = getDefaultInstance().getDestinationName();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -20149,8 +20472,8 @@ public Builder setDestinationNameBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           destinationName_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -20219,8 +20542,8 @@ public Builder setUri(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           uri_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -20237,8 +20560,8 @@ public Builder setUri(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearUri() {
-
           uri_ = getDefaultInstance().getUri();
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -20260,8 +20583,8 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           uri_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -20723,11 +21046,16 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo getInfo
         @java.lang.Override
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfoOrBuilder
             getInfoOrBuilder() {
-          return getInfo();
+          return info_ == null
+              ? com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo
+                  .getDefaultInstance()
+              : info_;
         }
 
         public static final int TITLE_FIELD_NUMBER = 2;
-        private volatile java.lang.Object title_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object title_ = "";
         /**
          *
          *
@@ -20776,7 +21104,9 @@ public com.google.protobuf.ByteString getTitleBytes() {
         }
 
         public static final int DESCRIPTION_FIELD_NUMBER = 3;
-        private volatile java.lang.Object description_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object description_ = "";
         /**
          *
          *
@@ -20870,7 +21200,9 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Image getImage() {
         @java.lang.Override
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.ImageOrBuilder
             getImageOrBuilder() {
-          return getImage();
+          return image_ == null
+              ? com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.getDefaultInstance()
+              : image_;
         }
 
         private byte memoizedIsInitialized = -1;
@@ -21117,20 +21449,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           @java.lang.Override
           public Builder clear() {
             super.clear();
-            if (infoBuilder_ == null) {
-              info_ = null;
-            } else {
-              info_ = null;
+            bitField0_ = 0;
+            info_ = null;
+            if (infoBuilder_ != null) {
+              infoBuilder_.dispose();
               infoBuilder_ = null;
             }
             title_ = "";
-
             description_ = "";
-
-            if (imageBuilder_ == null) {
-              image_ = null;
-            } else {
-              image_ = null;
+            image_ = null;
+            if (imageBuilder_ != null) {
+              imageBuilder_.dispose();
               imageBuilder_ = null;
             }
             return this;
@@ -21163,22 +21492,30 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect.Item build(
           public com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect.Item buildPartial() {
             com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect.Item result =
                 new com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect.Item(this);
-            if (infoBuilder_ == null) {
-              result.info_ = info_;
-            } else {
-              result.info_ = infoBuilder_.build();
-            }
-            result.title_ = title_;
-            result.description_ = description_;
-            if (imageBuilder_ == null) {
-              result.image_ = image_;
-            } else {
-              result.image_ = imageBuilder_.build();
+            if (bitField0_ != 0) {
+              buildPartial0(result);
             }
             onBuilt();
             return result;
           }
 
+          private void buildPartial0(
+              com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect.Item result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+              result.info_ = infoBuilder_ == null ? info_ : infoBuilder_.build();
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+              result.title_ = title_;
+            }
+            if (((from_bitField0_ & 0x00000004) != 0)) {
+              result.description_ = description_;
+            }
+            if (((from_bitField0_ & 0x00000008) != 0)) {
+              result.image_ = imageBuilder_ == null ? image_ : imageBuilder_.build();
+            }
+          }
+
           @java.lang.Override
           public Builder clone() {
             return super.clone();
@@ -21236,10 +21573,12 @@ public Builder mergeFrom(
             }
             if (!other.getTitle().isEmpty()) {
               title_ = other.title_;
+              bitField0_ |= 0x00000002;
               onChanged();
             }
             if (!other.getDescription().isEmpty()) {
               description_ = other.description_;
+              bitField0_ |= 0x00000004;
               onChanged();
             }
             if (other.hasImage()) {
@@ -21274,25 +21613,25 @@ public Builder mergeFrom(
                   case 10:
                     {
                       input.readMessage(getInfoFieldBuilder().getBuilder(), extensionRegistry);
-
+                      bitField0_ |= 0x00000001;
                       break;
                     } // case 10
                   case 18:
                     {
                       title_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000002;
                       break;
                     } // case 18
                   case 26:
                     {
                       description_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000004;
                       break;
                     } // case 26
                   case 34:
                     {
                       input.readMessage(getImageFieldBuilder().getBuilder(), extensionRegistry);
-
+                      bitField0_ |= 0x00000008;
                       break;
                     } // case 34
                   default:
@@ -21312,6 +21651,8 @@ public Builder mergeFrom(
             return this;
           }
 
+          private int bitField0_;
+
           private com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo info_;
           private com.google.protobuf.SingleFieldBuilderV3<
                   com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo,
@@ -21330,7 +21671,7 @@ public Builder mergeFrom(
            * @return Whether the info field is set.
            */
           public boolean hasInfo() {
-            return infoBuilder_ != null || info_ != null;
+            return ((bitField0_ & 0x00000001) != 0);
           }
           /**
            *
@@ -21369,11 +21710,11 @@ public Builder setInfo(
                 throw new NullPointerException();
               }
               info_ = value;
-              onChanged();
             } else {
               infoBuilder_.setMessage(value);
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
           }
           /**
@@ -21390,11 +21731,11 @@ public Builder setInfo(
                   builderForValue) {
             if (infoBuilder_ == null) {
               info_ = builderForValue.build();
-              onChanged();
             } else {
               infoBuilder_.setMessage(builderForValue.build());
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
           }
           /**
@@ -21409,20 +21750,20 @@ public Builder setInfo(
           public Builder mergeInfo(
               com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo value) {
             if (infoBuilder_ == null) {
-              if (info_ != null) {
-                info_ =
-                    com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo.newBuilder(
-                            info_)
-                        .mergeFrom(value)
-                        .buildPartial();
+              if (((bitField0_ & 0x00000001) != 0)
+                  && info_ != null
+                  && info_
+                      != com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo
+                          .getDefaultInstance()) {
+                getInfoBuilder().mergeFrom(value);
               } else {
                 info_ = value;
               }
-              onChanged();
             } else {
               infoBuilder_.mergeFrom(value);
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
           }
           /**
@@ -21435,14 +21776,13 @@ public Builder mergeInfo(
            * <code>.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo info = 1;</code>
            */
           public Builder clearInfo() {
-            if (infoBuilder_ == null) {
-              info_ = null;
-              onChanged();
-            } else {
-              info_ = null;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            info_ = null;
+            if (infoBuilder_ != null) {
+              infoBuilder_.dispose();
               infoBuilder_ = null;
             }
-
+            onChanged();
             return this;
           }
           /**
@@ -21456,7 +21796,7 @@ public Builder clearInfo() {
            */
           public com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo.Builder
               getInfoBuilder() {
-
+            bitField0_ |= 0x00000001;
             onChanged();
             return getInfoFieldBuilder().getBuilder();
           }
@@ -21567,8 +21907,8 @@ public Builder setTitle(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             title_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -21584,8 +21924,8 @@ public Builder setTitle(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearTitle() {
-
             title_ = getDefaultInstance().getTitle();
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
             return this;
           }
@@ -21606,8 +21946,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             title_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -21673,8 +22013,8 @@ public Builder setDescription(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             description_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
           }
@@ -21690,8 +22030,8 @@ public Builder setDescription(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearDescription() {
-
             description_ = getDefaultInstance().getDescription();
+            bitField0_ = (bitField0_ & ~0x00000004);
             onChanged();
             return this;
           }
@@ -21712,8 +22052,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             description_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
           }
@@ -21736,7 +22076,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
            * @return Whether the image field is set.
            */
           public boolean hasImage() {
-            return imageBuilder_ != null || image_ != null;
+            return ((bitField0_ & 0x00000008) != 0);
           }
           /**
            *
@@ -21773,11 +22113,11 @@ public Builder setImage(com.google.cloud.dialogflow.v2beta1.Intent.Message.Image
                 throw new NullPointerException();
               }
               image_ = value;
-              onChanged();
             } else {
               imageBuilder_.setMessage(value);
             }
-
+            bitField0_ |= 0x00000008;
+            onChanged();
             return this;
           }
           /**
@@ -21793,11 +22133,11 @@ public Builder setImage(
               com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.Builder builderForValue) {
             if (imageBuilder_ == null) {
               image_ = builderForValue.build();
-              onChanged();
             } else {
               imageBuilder_.setMessage(builderForValue.build());
             }
-
+            bitField0_ |= 0x00000008;
+            onChanged();
             return this;
           }
           /**
@@ -21812,19 +22152,20 @@ public Builder setImage(
           public Builder mergeImage(
               com.google.cloud.dialogflow.v2beta1.Intent.Message.Image value) {
             if (imageBuilder_ == null) {
-              if (image_ != null) {
-                image_ =
-                    com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.newBuilder(image_)
-                        .mergeFrom(value)
-                        .buildPartial();
+              if (((bitField0_ & 0x00000008) != 0)
+                  && image_ != null
+                  && image_
+                      != com.google.cloud.dialogflow.v2beta1.Intent.Message.Image
+                          .getDefaultInstance()) {
+                getImageBuilder().mergeFrom(value);
               } else {
                 image_ = value;
               }
-              onChanged();
             } else {
               imageBuilder_.mergeFrom(value);
             }
-
+            bitField0_ |= 0x00000008;
+            onChanged();
             return this;
           }
           /**
@@ -21837,14 +22178,13 @@ public Builder mergeImage(
            * <code>.google.cloud.dialogflow.v2beta1.Intent.Message.Image image = 4;</code>
            */
           public Builder clearImage() {
-            if (imageBuilder_ == null) {
-              image_ = null;
-              onChanged();
-            } else {
-              image_ = null;
+            bitField0_ = (bitField0_ & ~0x00000008);
+            image_ = null;
+            if (imageBuilder_ != null) {
+              imageBuilder_.dispose();
               imageBuilder_ = null;
             }
-
+            onChanged();
             return this;
           }
           /**
@@ -21858,7 +22198,7 @@ public Builder clearImage() {
            */
           public com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.Builder
               getImageBuilder() {
-
+            bitField0_ |= 0x00000008;
             onChanged();
             return getImageFieldBuilder().getBuilder();
           }
@@ -21976,7 +22316,9 @@ public com.google.protobuf.Parser<Item> getParserForType() {
       }
 
       public static final int TITLE_FIELD_NUMBER = 1;
-      private volatile java.lang.Object title_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object title_ = "";
       /**
        *
        *
@@ -22025,6 +22367,8 @@ public com.google.protobuf.ByteString getTitleBytes() {
       }
 
       public static final int ITEMS_FIELD_NUMBER = 2;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect.Item>
           items_;
       /**
@@ -22104,7 +22448,9 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect.Item getIte
       }
 
       public static final int SUBTITLE_FIELD_NUMBER = 3;
-      private volatile java.lang.Object subtitle_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object subtitle_ = "";
       /**
        *
        *
@@ -22375,17 +22721,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           title_ = "";
-
           if (itemsBuilder_ == null) {
             items_ = java.util.Collections.emptyList();
           } else {
             items_ = null;
             itemsBuilder_.clear();
           }
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
           subtitle_ = "";
-
           return this;
         }
 
@@ -22414,20 +22759,36 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect build() {
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect(this);
-          int from_bitField0_ = bitField0_;
-          result.title_ = title_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect result) {
           if (itemsBuilder_ == null) {
-            if (((bitField0_ & 0x00000001) != 0)) {
+            if (((bitField0_ & 0x00000002) != 0)) {
               items_ = java.util.Collections.unmodifiableList(items_);
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
             }
             result.items_ = items_;
           } else {
             result.items_ = itemsBuilder_.build();
           }
-          result.subtitle_ = subtitle_;
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.title_ = title_;
+          }
+          if (((from_bitField0_ & 0x00000004) != 0)) {
+            result.subtitle_ = subtitle_;
+          }
         }
 
         @java.lang.Override
@@ -22482,13 +22843,14 @@ public Builder mergeFrom(
             return this;
           if (!other.getTitle().isEmpty()) {
             title_ = other.title_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (itemsBuilder_ == null) {
             if (!other.items_.isEmpty()) {
               if (items_.isEmpty()) {
                 items_ = other.items_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000002);
               } else {
                 ensureItemsIsMutable();
                 items_.addAll(other.items_);
@@ -22501,7 +22863,7 @@ public Builder mergeFrom(
                 itemsBuilder_.dispose();
                 itemsBuilder_ = null;
                 items_ = other.items_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000002);
                 itemsBuilder_ =
                     com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                         ? getItemsFieldBuilder()
@@ -22513,6 +22875,7 @@ public Builder mergeFrom(
           }
           if (!other.getSubtitle().isEmpty()) {
             subtitle_ = other.subtitle_;
+            bitField0_ |= 0x00000004;
             onChanged();
           }
           this.mergeUnknownFields(other.getUnknownFields());
@@ -22544,7 +22907,7 @@ public Builder mergeFrom(
                 case 10:
                   {
                     title_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
@@ -22565,7 +22928,7 @@ public Builder mergeFrom(
                 case 26:
                   {
                     subtitle_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000004;
                     break;
                   } // case 26
                 default:
@@ -22648,8 +23011,8 @@ public Builder setTitle(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -22665,8 +23028,8 @@ public Builder setTitle(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearTitle() {
-
           title_ = getDefaultInstance().getTitle();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -22687,8 +23050,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -22697,11 +23060,11 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
             items_ = java.util.Collections.emptyList();
 
         private void ensureItemsIsMutable() {
-          if (!((bitField0_ & 0x00000001) != 0)) {
+          if (!((bitField0_ & 0x00000002) != 0)) {
             items_ =
                 new java.util.ArrayList<
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect.Item>(items_);
-            bitField0_ |= 0x00000001;
+            bitField0_ |= 0x00000002;
           }
         }
 
@@ -22940,7 +23303,7 @@ public Builder addAllItems(
         public Builder clearItems() {
           if (itemsBuilder_ == null) {
             items_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
           } else {
             itemsBuilder_.clear();
@@ -23081,7 +23444,7 @@ public Builder removeItems(int index) {
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect.Item,
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect.Item.Builder,
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect.ItemOrBuilder>(
-                    items_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                    items_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
             items_ = null;
           }
           return itemsBuilder_;
@@ -23148,8 +23511,8 @@ public Builder setSubtitle(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           subtitle_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -23165,8 +23528,8 @@ public Builder setSubtitle(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearSubtitle() {
-
           subtitle_ = getDefaultInstance().getSubtitle();
+          bitField0_ = (bitField0_ & ~0x00000004);
           onChanged();
           return this;
         }
@@ -23187,8 +23550,8 @@ public Builder setSubtitleBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           subtitle_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -23604,11 +23967,16 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo getInfo
         @java.lang.Override
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfoOrBuilder
             getInfoOrBuilder() {
-          return getInfo();
+          return info_ == null
+              ? com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo
+                  .getDefaultInstance()
+              : info_;
         }
 
         public static final int TITLE_FIELD_NUMBER = 2;
-        private volatile java.lang.Object title_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object title_ = "";
         /**
          *
          *
@@ -23657,7 +24025,9 @@ public com.google.protobuf.ByteString getTitleBytes() {
         }
 
         public static final int DESCRIPTION_FIELD_NUMBER = 3;
-        private volatile java.lang.Object description_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object description_ = "";
         /**
          *
          *
@@ -23751,7 +24121,9 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Image getImage() {
         @java.lang.Override
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.ImageOrBuilder
             getImageOrBuilder() {
-          return getImage();
+          return image_ == null
+              ? com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.getDefaultInstance()
+              : image_;
         }
 
         private byte memoizedIsInitialized = -1;
@@ -24005,20 +24377,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           @java.lang.Override
           public Builder clear() {
             super.clear();
-            if (infoBuilder_ == null) {
-              info_ = null;
-            } else {
-              info_ = null;
+            bitField0_ = 0;
+            info_ = null;
+            if (infoBuilder_ != null) {
+              infoBuilder_.dispose();
               infoBuilder_ = null;
             }
             title_ = "";
-
             description_ = "";
-
-            if (imageBuilder_ == null) {
-              image_ = null;
-            } else {
-              image_ = null;
+            image_ = null;
+            if (imageBuilder_ != null) {
+              imageBuilder_.dispose();
               imageBuilder_ = null;
             }
             return this;
@@ -24052,22 +24421,30 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect.Item bu
               buildPartial() {
             com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect.Item result =
                 new com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect.Item(this);
-            if (infoBuilder_ == null) {
-              result.info_ = info_;
-            } else {
-              result.info_ = infoBuilder_.build();
-            }
-            result.title_ = title_;
-            result.description_ = description_;
-            if (imageBuilder_ == null) {
-              result.image_ = image_;
-            } else {
-              result.image_ = imageBuilder_.build();
+            if (bitField0_ != 0) {
+              buildPartial0(result);
             }
             onBuilt();
             return result;
           }
 
+          private void buildPartial0(
+              com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect.Item result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+              result.info_ = infoBuilder_ == null ? info_ : infoBuilder_.build();
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+              result.title_ = title_;
+            }
+            if (((from_bitField0_ & 0x00000004) != 0)) {
+              result.description_ = description_;
+            }
+            if (((from_bitField0_ & 0x00000008) != 0)) {
+              result.image_ = imageBuilder_ == null ? image_ : imageBuilder_.build();
+            }
+          }
+
           @java.lang.Override
           public Builder clone() {
             return super.clone();
@@ -24125,10 +24502,12 @@ public Builder mergeFrom(
             }
             if (!other.getTitle().isEmpty()) {
               title_ = other.title_;
+              bitField0_ |= 0x00000002;
               onChanged();
             }
             if (!other.getDescription().isEmpty()) {
               description_ = other.description_;
+              bitField0_ |= 0x00000004;
               onChanged();
             }
             if (other.hasImage()) {
@@ -24163,25 +24542,25 @@ public Builder mergeFrom(
                   case 10:
                     {
                       input.readMessage(getInfoFieldBuilder().getBuilder(), extensionRegistry);
-
+                      bitField0_ |= 0x00000001;
                       break;
                     } // case 10
                   case 18:
                     {
                       title_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000002;
                       break;
                     } // case 18
                   case 26:
                     {
                       description_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000004;
                       break;
                     } // case 26
                   case 34:
                     {
                       input.readMessage(getImageFieldBuilder().getBuilder(), extensionRegistry);
-
+                      bitField0_ |= 0x00000008;
                       break;
                     } // case 34
                   default:
@@ -24201,6 +24580,8 @@ public Builder mergeFrom(
             return this;
           }
 
+          private int bitField0_;
+
           private com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo info_;
           private com.google.protobuf.SingleFieldBuilderV3<
                   com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo,
@@ -24219,7 +24600,7 @@ public Builder mergeFrom(
            * @return Whether the info field is set.
            */
           public boolean hasInfo() {
-            return infoBuilder_ != null || info_ != null;
+            return ((bitField0_ & 0x00000001) != 0);
           }
           /**
            *
@@ -24258,11 +24639,11 @@ public Builder setInfo(
                 throw new NullPointerException();
               }
               info_ = value;
-              onChanged();
             } else {
               infoBuilder_.setMessage(value);
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
           }
           /**
@@ -24279,11 +24660,11 @@ public Builder setInfo(
                   builderForValue) {
             if (infoBuilder_ == null) {
               info_ = builderForValue.build();
-              onChanged();
             } else {
               infoBuilder_.setMessage(builderForValue.build());
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
           }
           /**
@@ -24298,20 +24679,20 @@ public Builder setInfo(
           public Builder mergeInfo(
               com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo value) {
             if (infoBuilder_ == null) {
-              if (info_ != null) {
-                info_ =
-                    com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo.newBuilder(
-                            info_)
-                        .mergeFrom(value)
-                        .buildPartial();
+              if (((bitField0_ & 0x00000001) != 0)
+                  && info_ != null
+                  && info_
+                      != com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo
+                          .getDefaultInstance()) {
+                getInfoBuilder().mergeFrom(value);
               } else {
                 info_ = value;
               }
-              onChanged();
             } else {
               infoBuilder_.mergeFrom(value);
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
           }
           /**
@@ -24324,14 +24705,13 @@ public Builder mergeInfo(
            * <code>.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo info = 1;</code>
            */
           public Builder clearInfo() {
-            if (infoBuilder_ == null) {
-              info_ = null;
-              onChanged();
-            } else {
-              info_ = null;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            info_ = null;
+            if (infoBuilder_ != null) {
+              infoBuilder_.dispose();
               infoBuilder_ = null;
             }
-
+            onChanged();
             return this;
           }
           /**
@@ -24345,7 +24725,7 @@ public Builder clearInfo() {
            */
           public com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo.Builder
               getInfoBuilder() {
-
+            bitField0_ |= 0x00000001;
             onChanged();
             return getInfoFieldBuilder().getBuilder();
           }
@@ -24456,8 +24836,8 @@ public Builder setTitle(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             title_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -24473,8 +24853,8 @@ public Builder setTitle(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearTitle() {
-
             title_ = getDefaultInstance().getTitle();
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
             return this;
           }
@@ -24495,8 +24875,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             title_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -24562,8 +24942,8 @@ public Builder setDescription(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             description_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
           }
@@ -24579,8 +24959,8 @@ public Builder setDescription(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearDescription() {
-
             description_ = getDefaultInstance().getDescription();
+            bitField0_ = (bitField0_ & ~0x00000004);
             onChanged();
             return this;
           }
@@ -24601,8 +24981,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             description_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
           }
@@ -24625,7 +25005,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
            * @return Whether the image field is set.
            */
           public boolean hasImage() {
-            return imageBuilder_ != null || image_ != null;
+            return ((bitField0_ & 0x00000008) != 0);
           }
           /**
            *
@@ -24662,11 +25042,11 @@ public Builder setImage(com.google.cloud.dialogflow.v2beta1.Intent.Message.Image
                 throw new NullPointerException();
               }
               image_ = value;
-              onChanged();
             } else {
               imageBuilder_.setMessage(value);
             }
-
+            bitField0_ |= 0x00000008;
+            onChanged();
             return this;
           }
           /**
@@ -24682,11 +25062,11 @@ public Builder setImage(
               com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.Builder builderForValue) {
             if (imageBuilder_ == null) {
               image_ = builderForValue.build();
-              onChanged();
             } else {
               imageBuilder_.setMessage(builderForValue.build());
             }
-
+            bitField0_ |= 0x00000008;
+            onChanged();
             return this;
           }
           /**
@@ -24701,19 +25081,20 @@ public Builder setImage(
           public Builder mergeImage(
               com.google.cloud.dialogflow.v2beta1.Intent.Message.Image value) {
             if (imageBuilder_ == null) {
-              if (image_ != null) {
-                image_ =
-                    com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.newBuilder(image_)
-                        .mergeFrom(value)
-                        .buildPartial();
+              if (((bitField0_ & 0x00000008) != 0)
+                  && image_ != null
+                  && image_
+                      != com.google.cloud.dialogflow.v2beta1.Intent.Message.Image
+                          .getDefaultInstance()) {
+                getImageBuilder().mergeFrom(value);
               } else {
                 image_ = value;
               }
-              onChanged();
             } else {
               imageBuilder_.mergeFrom(value);
             }
-
+            bitField0_ |= 0x00000008;
+            onChanged();
             return this;
           }
           /**
@@ -24726,14 +25107,13 @@ public Builder mergeImage(
            * <code>.google.cloud.dialogflow.v2beta1.Intent.Message.Image image = 4;</code>
            */
           public Builder clearImage() {
-            if (imageBuilder_ == null) {
-              image_ = null;
-              onChanged();
-            } else {
-              image_ = null;
+            bitField0_ = (bitField0_ & ~0x00000008);
+            image_ = null;
+            if (imageBuilder_ != null) {
+              imageBuilder_.dispose();
               imageBuilder_ = null;
             }
-
+            onChanged();
             return this;
           }
           /**
@@ -24747,7 +25127,7 @@ public Builder clearImage() {
            */
           public com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.Builder
               getImageBuilder() {
-
+            bitField0_ |= 0x00000008;
             onChanged();
             return getImageFieldBuilder().getBuilder();
           }
@@ -24865,6 +25245,8 @@ public com.google.protobuf.Parser<Item> getParserForType() {
       }
 
       public static final int ITEMS_FIELD_NUMBER = 1;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect.Item>
           items_;
       /**
@@ -25154,6 +25536,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           if (itemsBuilder_ == null) {
             items_ = java.util.Collections.emptyList();
           } else {
@@ -25190,7 +25573,16 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect build()
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect(this);
-          int from_bitField0_ = bitField0_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect result) {
           if (itemsBuilder_ == null) {
             if (((bitField0_ & 0x00000001) != 0)) {
               items_ = java.util.Collections.unmodifiableList(items_);
@@ -25200,8 +25592,11 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect buildPa
           } else {
             result.items_ = itemsBuilder_.build();
           }
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect result) {
+          int from_bitField0_ = bitField0_;
         }
 
         @java.lang.Override
@@ -25966,7 +26361,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int KEY_FIELD_NUMBER = 1;
-      private volatile java.lang.Object key_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object key_ = "";
       /**
        *
        *
@@ -26017,6 +26414,8 @@ public com.google.protobuf.ByteString getKeyBytes() {
       }
 
       public static final int SYNONYMS_FIELD_NUMBER = 2;
+
+      @SuppressWarnings("serial")
       private com.google.protobuf.LazyStringList synonyms_;
       /**
        *
@@ -26301,10 +26700,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           key_ = "";
-
           synonyms_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
@@ -26334,17 +26733,31 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo build()
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo(this);
-          int from_bitField0_ = bitField0_;
-          result.key_ = key_;
-          if (((bitField0_ & 0x00000001) != 0)) {
-            synonyms_ = synonyms_.getUnmodifiableView();
-            bitField0_ = (bitField0_ & ~0x00000001);
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
           }
-          result.synonyms_ = synonyms_;
           onBuilt();
           return result;
         }
 
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo result) {
+          if (((bitField0_ & 0x00000002) != 0)) {
+            synonyms_ = synonyms_.getUnmodifiableView();
+            bitField0_ = (bitField0_ & ~0x00000002);
+          }
+          result.synonyms_ = synonyms_;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.key_ = key_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -26398,12 +26811,13 @@ public Builder mergeFrom(
                   .getDefaultInstance()) return this;
           if (!other.getKey().isEmpty()) {
             key_ = other.key_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (!other.synonyms_.isEmpty()) {
             if (synonyms_.isEmpty()) {
               synonyms_ = other.synonyms_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
             } else {
               ensureSynonymsIsMutable();
               synonyms_.addAll(other.synonyms_);
@@ -26439,7 +26853,7 @@ public Builder mergeFrom(
                 case 10:
                   {
                     key_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
@@ -26532,8 +26946,8 @@ public Builder setKey(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           key_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -26550,8 +26964,8 @@ public Builder setKey(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearKey() {
-
           key_ = getDefaultInstance().getKey();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -26573,8 +26987,8 @@ public Builder setKeyBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           key_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -26583,9 +26997,9 @@ public Builder setKeyBytes(com.google.protobuf.ByteString value) {
             com.google.protobuf.LazyStringArrayList.EMPTY;
 
         private void ensureSynonymsIsMutable() {
-          if (!((bitField0_ & 0x00000001) != 0)) {
+          if (!((bitField0_ & 0x00000002) != 0)) {
             synonyms_ = new com.google.protobuf.LazyStringArrayList(synonyms_);
-            bitField0_ |= 0x00000001;
+            bitField0_ |= 0x00000002;
           }
         }
         /**
@@ -26728,7 +27142,7 @@ public Builder addAllSynonyms(java.lang.Iterable<java.lang.String> values) {
          */
         public Builder clearSynonyms() {
           synonyms_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -26924,7 +27338,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int AUDIO_URI_FIELD_NUMBER = 1;
-      private volatile java.lang.Object audioUri_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object audioUri_ = "";
       /**
        *
        *
@@ -27197,8 +27613,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           audioUri_ = "";
-
           return this;
         }
 
@@ -27230,11 +27646,21 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.TelephonyPlayAudio bui
             buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.TelephonyPlayAudio result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.TelephonyPlayAudio(this);
-          result.audioUri_ = audioUri_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.TelephonyPlayAudio result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.audioUri_ = audioUri_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -27289,6 +27715,7 @@ public Builder mergeFrom(
                   .getDefaultInstance()) return this;
           if (!other.getAudioUri().isEmpty()) {
             audioUri_ = other.audioUri_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           this.mergeUnknownFields(other.getUnknownFields());
@@ -27320,7 +27747,7 @@ public Builder mergeFrom(
                 case 10:
                   {
                     audioUri_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 default:
@@ -27340,6 +27767,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object audioUri_ = "";
         /**
          *
@@ -27431,8 +27860,8 @@ public Builder setAudioUri(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           audioUri_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -27458,8 +27887,8 @@ public Builder setAudioUri(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearAudioUri() {
-
           audioUri_ = getDefaultInstance().getAudioUri();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -27490,8 +27919,8 @@ public Builder setAudioUriBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           audioUri_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -28137,6 +28566,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           sourceCase_ = 0;
           source_ = null;
           return this;
@@ -28172,17 +28602,25 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.TelephonySynthesizeSpeech result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.TelephonySynthesizeSpeech(
                   this);
-          if (sourceCase_ == 1) {
-            result.source_ = source_;
-          }
-          if (sourceCase_ == 2) {
-            result.source_ = source_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
           }
-          result.sourceCase_ = sourceCase_;
+          buildPartialOneofs(result);
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.TelephonySynthesizeSpeech result) {
+          int from_bitField0_ = bitField0_;
+        }
+
+        private void buildPartialOneofs(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.TelephonySynthesizeSpeech result) {
+          result.sourceCase_ = sourceCase_;
+          result.source_ = this.source_;
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -28328,6 +28766,8 @@ public Builder clearSource() {
           return this;
         }
 
+        private int bitField0_;
+
         /**
          *
          *
@@ -28756,7 +29196,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int PHONE_NUMBER_FIELD_NUMBER = 1;
-      private volatile java.lang.Object phoneNumber_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object phoneNumber_ = "";
       /**
        *
        *
@@ -29019,8 +29461,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           phoneNumber_ = "";
-
           return this;
         }
 
@@ -29052,11 +29494,21 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.TelephonyTransferCall
             buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.TelephonyTransferCall result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.TelephonyTransferCall(this);
-          result.phoneNumber_ = phoneNumber_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.TelephonyTransferCall result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.phoneNumber_ = phoneNumber_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -29111,6 +29563,7 @@ public Builder mergeFrom(
                   .getDefaultInstance()) return this;
           if (!other.getPhoneNumber().isEmpty()) {
             phoneNumber_ = other.phoneNumber_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           this.mergeUnknownFields(other.getUnknownFields());
@@ -29142,7 +29595,7 @@ public Builder mergeFrom(
                 case 10:
                   {
                     phoneNumber_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 default:
@@ -29162,6 +29615,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object phoneNumber_ = "";
         /**
          *
@@ -29229,8 +29684,8 @@ public Builder setPhoneNumber(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           phoneNumber_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -29248,8 +29703,8 @@ public Builder setPhoneNumber(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearPhoneNumber() {
-
           phoneNumber_ = getDefaultInstance().getPhoneNumber();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -29272,8 +29727,8 @@ public Builder setPhoneNumberBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           phoneNumber_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -29492,7 +29947,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int TEXT_FIELD_NUMBER = 1;
-      private volatile java.lang.Object text_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object text_ = "";
       /**
        *
        *
@@ -29541,6 +29998,8 @@ public com.google.protobuf.ByteString getTextBytes() {
       }
 
       public static final int RBM_SUGGESTION_FIELD_NUMBER = 2;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestion>
           rbmSuggestion_;
       /**
@@ -29836,15 +30295,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           text_ = "";
-
           if (rbmSuggestionBuilder_ == null) {
             rbmSuggestion_ = java.util.Collections.emptyList();
           } else {
             rbmSuggestion_ = null;
             rbmSuggestionBuilder_.clear();
           }
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
@@ -29873,19 +30332,33 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmText build() {
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmText buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmText result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmText(this);
-          int from_bitField0_ = bitField0_;
-          result.text_ = text_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmText result) {
           if (rbmSuggestionBuilder_ == null) {
-            if (((bitField0_ & 0x00000001) != 0)) {
+            if (((bitField0_ & 0x00000002) != 0)) {
               rbmSuggestion_ = java.util.Collections.unmodifiableList(rbmSuggestion_);
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
             }
             result.rbmSuggestion_ = rbmSuggestion_;
           } else {
             result.rbmSuggestion_ = rbmSuggestionBuilder_.build();
           }
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmText result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.text_ = text_;
+          }
         }
 
         @java.lang.Override
@@ -29939,13 +30412,14 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmT
             return this;
           if (!other.getText().isEmpty()) {
             text_ = other.text_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (rbmSuggestionBuilder_ == null) {
             if (!other.rbmSuggestion_.isEmpty()) {
               if (rbmSuggestion_.isEmpty()) {
                 rbmSuggestion_ = other.rbmSuggestion_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000002);
               } else {
                 ensureRbmSuggestionIsMutable();
                 rbmSuggestion_.addAll(other.rbmSuggestion_);
@@ -29958,7 +30432,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmT
                 rbmSuggestionBuilder_.dispose();
                 rbmSuggestionBuilder_ = null;
                 rbmSuggestion_ = other.rbmSuggestion_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000002);
                 rbmSuggestionBuilder_ =
                     com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                         ? getRbmSuggestionFieldBuilder()
@@ -29997,7 +30471,7 @@ public Builder mergeFrom(
                 case 10:
                   {
                     text_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
@@ -30095,8 +30569,8 @@ public Builder setText(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           text_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -30112,8 +30586,8 @@ public Builder setText(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearText() {
-
           text_ = getDefaultInstance().getText();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -30134,8 +30608,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           text_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -30144,12 +30618,12 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
             rbmSuggestion_ = java.util.Collections.emptyList();
 
         private void ensureRbmSuggestionIsMutable() {
-          if (!((bitField0_ & 0x00000001) != 0)) {
+          if (!((bitField0_ & 0x00000002) != 0)) {
             rbmSuggestion_ =
                 new java.util.ArrayList<
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestion>(
                     rbmSuggestion_);
-            bitField0_ |= 0x00000001;
+            bitField0_ |= 0x00000002;
           }
         }
 
@@ -30399,7 +30873,7 @@ public Builder addAllRbmSuggestion(
         public Builder clearRbmSuggestion() {
           if (rbmSuggestionBuilder_ == null) {
             rbmSuggestion_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
           } else {
             rbmSuggestionBuilder_.clear();
@@ -30547,7 +31021,7 @@ public Builder removeRbmSuggestion(int index) {
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestion.Builder,
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestionOrBuilder>(
                     rbmSuggestion_,
-                    ((bitField0_ & 0x00000001) != 0),
+                    ((bitField0_ & 0x00000002) != 0),
                     getParentForChildren(),
                     isClean());
             rbmSuggestion_ = null;
@@ -30942,7 +31416,7 @@ private CardWidth(int value) {
       }
 
       public static final int CARD_WIDTH_FIELD_NUMBER = 1;
-      private int cardWidth_;
+      private int cardWidth_ = 0;
       /**
        *
        *
@@ -30976,9 +31450,8 @@ public int getCardWidthValue() {
       @java.lang.Override
       public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCarouselCard.CardWidth
           getCardWidth() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCarouselCard.CardWidth result =
-            com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCarouselCard.CardWidth.valueOf(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCarouselCard.CardWidth.forNumber(
                 cardWidth_);
         return result == null
             ? com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCarouselCard.CardWidth
@@ -30987,6 +31460,8 @@ public int getCardWidthValue() {
       }
 
       public static final int CARD_CONTENTS_FIELD_NUMBER = 2;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent>
           cardContents_;
       /**
@@ -31299,15 +31774,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           cardWidth_ = 0;
-
           if (cardContentsBuilder_ == null) {
             cardContents_ = java.util.Collections.emptyList();
           } else {
             cardContents_ = null;
             cardContentsBuilder_.clear();
           }
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
@@ -31338,19 +31813,33 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCarouselCard build(
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCarouselCard buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCarouselCard result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCarouselCard(this);
-          int from_bitField0_ = bitField0_;
-          result.cardWidth_ = cardWidth_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCarouselCard result) {
           if (cardContentsBuilder_ == null) {
-            if (((bitField0_ & 0x00000001) != 0)) {
+            if (((bitField0_ & 0x00000002) != 0)) {
               cardContents_ = java.util.Collections.unmodifiableList(cardContents_);
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
             }
             result.cardContents_ = cardContents_;
           } else {
             result.cardContents_ = cardContentsBuilder_.build();
           }
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCarouselCard result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.cardWidth_ = cardWidth_;
+          }
         }
 
         @java.lang.Override
@@ -31411,7 +31900,7 @@ public Builder mergeFrom(
             if (!other.cardContents_.isEmpty()) {
               if (cardContents_.isEmpty()) {
                 cardContents_ = other.cardContents_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000002);
               } else {
                 ensureCardContentsIsMutable();
                 cardContents_.addAll(other.cardContents_);
@@ -31424,7 +31913,7 @@ public Builder mergeFrom(
                 cardContentsBuilder_.dispose();
                 cardContentsBuilder_ = null;
                 cardContents_ = other.cardContents_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000002);
                 cardContentsBuilder_ =
                     com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                         ? getCardContentsFieldBuilder()
@@ -31463,7 +31952,7 @@ public Builder mergeFrom(
                 case 8:
                   {
                     cardWidth_ = input.readEnum();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 8
                 case 18:
@@ -31533,8 +32022,8 @@ public int getCardWidthValue() {
          * @return This builder for chaining.
          */
         public Builder setCardWidthValue(int value) {
-
           cardWidth_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -31554,10 +32043,9 @@ public Builder setCardWidthValue(int value) {
         @java.lang.Override
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCarouselCard.CardWidth
             getCardWidth() {
-          @SuppressWarnings("deprecation")
           com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCarouselCard.CardWidth result =
-              com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCarouselCard.CardWidth.valueOf(
-                  cardWidth_);
+              com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCarouselCard.CardWidth
+                  .forNumber(cardWidth_);
           return result == null
               ? com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCarouselCard.CardWidth
                   .UNRECOGNIZED
@@ -31582,7 +32070,7 @@ public Builder setCardWidth(
           if (value == null) {
             throw new NullPointerException();
           }
-
+          bitField0_ |= 0x00000001;
           cardWidth_ = value.getNumber();
           onChanged();
           return this;
@@ -31601,7 +32089,7 @@ public Builder setCardWidth(
          * @return This builder for chaining.
          */
         public Builder clearCardWidth() {
-
+          bitField0_ = (bitField0_ & ~0x00000001);
           cardWidth_ = 0;
           onChanged();
           return this;
@@ -31611,12 +32099,12 @@ public Builder clearCardWidth() {
             cardContents_ = java.util.Collections.emptyList();
 
         private void ensureCardContentsIsMutable() {
-          if (!((bitField0_ & 0x00000001) != 0)) {
+          if (!((bitField0_ & 0x00000002) != 0)) {
             cardContents_ =
                 new java.util.ArrayList<
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent>(
                     cardContents_);
-            bitField0_ |= 0x00000001;
+            bitField0_ |= 0x00000002;
           }
         }
 
@@ -31877,7 +32365,7 @@ public Builder addAllCardContents(
         public Builder clearCardContents() {
           if (cardContentsBuilder_ == null) {
             cardContents_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
           } else {
             cardContentsBuilder_.clear();
@@ -32033,7 +32521,7 @@ public Builder removeCardContents(int index) {
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.Builder,
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContentOrBuilder>(
                     cardContents_,
-                    ((bitField0_ & 0x00000001) != 0),
+                    ((bitField0_ & 0x00000002) != 0),
                     getParentForChildren(),
                     isClean());
             cardContents_ = null;
@@ -32600,7 +33088,7 @@ private ThumbnailImageAlignment(int value) {
       }
 
       public static final int CARD_ORIENTATION_FIELD_NUMBER = 1;
-      private int cardOrientation_;
+      private int cardOrientation_ = 0;
       /**
        *
        *
@@ -32634,11 +33122,10 @@ public int getCardOrientationValue() {
       @java.lang.Override
       public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmStandaloneCard.CardOrientation
           getCardOrientation() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmStandaloneCard.CardOrientation
             result =
                 com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmStandaloneCard.CardOrientation
-                    .valueOf(cardOrientation_);
+                    .forNumber(cardOrientation_);
         return result == null
             ? com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmStandaloneCard.CardOrientation
                 .UNRECOGNIZED
@@ -32646,7 +33133,7 @@ public int getCardOrientationValue() {
       }
 
       public static final int THUMBNAIL_IMAGE_ALIGNMENT_FIELD_NUMBER = 2;
-      private int thumbnailImageAlignment_;
+      private int thumbnailImageAlignment_ = 0;
       /**
        *
        *
@@ -32683,11 +33170,10 @@ public int getThumbnailImageAlignmentValue() {
       public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmStandaloneCard
               .ThumbnailImageAlignment
           getThumbnailImageAlignment() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmStandaloneCard.ThumbnailImageAlignment
             result =
                 com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmStandaloneCard
-                    .ThumbnailImageAlignment.valueOf(thumbnailImageAlignment_);
+                    .ThumbnailImageAlignment.forNumber(thumbnailImageAlignment_);
         return result == null
             ? com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmStandaloneCard
                 .ThumbnailImageAlignment.UNRECOGNIZED
@@ -32743,7 +33229,9 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent getCard
       @java.lang.Override
       public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContentOrBuilder
           getCardContentOrBuilder() {
-        return getCardContent();
+        return cardContent_ == null
+            ? com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.getDefaultInstance()
+            : cardContent_;
       }
 
       private byte memoizedIsInitialized = -1;
@@ -32991,14 +33479,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           cardOrientation_ = 0;
-
           thumbnailImageAlignment_ = 0;
-
-          if (cardContentBuilder_ == null) {
-            cardContent_ = null;
-          } else {
-            cardContent_ = null;
+          cardContent_ = null;
+          if (cardContentBuilder_ != null) {
+            cardContentBuilder_.dispose();
             cardContentBuilder_ = null;
           }
           return this;
@@ -33031,17 +33517,28 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmStandaloneCard buil
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmStandaloneCard buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmStandaloneCard result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmStandaloneCard(this);
-          result.cardOrientation_ = cardOrientation_;
-          result.thumbnailImageAlignment_ = thumbnailImageAlignment_;
-          if (cardContentBuilder_ == null) {
-            result.cardContent_ = cardContent_;
-          } else {
-            result.cardContent_ = cardContentBuilder_.build();
+          if (bitField0_ != 0) {
+            buildPartial0(result);
           }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmStandaloneCard result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.cardOrientation_ = cardOrientation_;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.thumbnailImageAlignment_ = thumbnailImageAlignment_;
+          }
+          if (((from_bitField0_ & 0x00000004) != 0)) {
+            result.cardContent_ =
+                cardContentBuilder_ == null ? cardContent_ : cardContentBuilder_.build();
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -33132,19 +33629,19 @@ public Builder mergeFrom(
                 case 8:
                   {
                     cardOrientation_ = input.readEnum();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 8
                 case 16:
                   {
                     thumbnailImageAlignment_ = input.readEnum();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 16
                 case 26:
                   {
                     input.readMessage(getCardContentFieldBuilder().getBuilder(), extensionRegistry);
-
+                    bitField0_ |= 0x00000004;
                     break;
                   } // case 26
                 default:
@@ -33164,6 +33661,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private int cardOrientation_ = 0;
         /**
          *
@@ -33197,8 +33696,8 @@ public int getCardOrientationValue() {
          * @return This builder for chaining.
          */
         public Builder setCardOrientationValue(int value) {
-
           cardOrientation_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -33218,11 +33717,10 @@ public Builder setCardOrientationValue(int value) {
         @java.lang.Override
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmStandaloneCard.CardOrientation
             getCardOrientation() {
-          @SuppressWarnings("deprecation")
           com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmStandaloneCard.CardOrientation
               result =
                   com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmStandaloneCard
-                      .CardOrientation.valueOf(cardOrientation_);
+                      .CardOrientation.forNumber(cardOrientation_);
           return result == null
               ? com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmStandaloneCard.CardOrientation
                   .UNRECOGNIZED
@@ -33248,7 +33746,7 @@ public Builder setCardOrientation(
           if (value == null) {
             throw new NullPointerException();
           }
-
+          bitField0_ |= 0x00000001;
           cardOrientation_ = value.getNumber();
           onChanged();
           return this;
@@ -33267,7 +33765,7 @@ public Builder setCardOrientation(
          * @return This builder for chaining.
          */
         public Builder clearCardOrientation() {
-
+          bitField0_ = (bitField0_ & ~0x00000001);
           cardOrientation_ = 0;
           onChanged();
           return this;
@@ -33308,8 +33806,8 @@ public int getThumbnailImageAlignmentValue() {
          * @return This builder for chaining.
          */
         public Builder setThumbnailImageAlignmentValue(int value) {
-
           thumbnailImageAlignment_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -33331,12 +33829,11 @@ public Builder setThumbnailImageAlignmentValue(int value) {
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmStandaloneCard
                 .ThumbnailImageAlignment
             getThumbnailImageAlignment() {
-          @SuppressWarnings("deprecation")
           com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmStandaloneCard
                   .ThumbnailImageAlignment
               result =
                   com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmStandaloneCard
-                      .ThumbnailImageAlignment.valueOf(thumbnailImageAlignment_);
+                      .ThumbnailImageAlignment.forNumber(thumbnailImageAlignment_);
           return result == null
               ? com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmStandaloneCard
                   .ThumbnailImageAlignment.UNRECOGNIZED
@@ -33364,7 +33861,7 @@ public Builder setThumbnailImageAlignment(
           if (value == null) {
             throw new NullPointerException();
           }
-
+          bitField0_ |= 0x00000002;
           thumbnailImageAlignment_ = value.getNumber();
           onChanged();
           return this;
@@ -33384,7 +33881,7 @@ public Builder setThumbnailImageAlignment(
          * @return This builder for chaining.
          */
         public Builder clearThumbnailImageAlignment() {
-
+          bitField0_ = (bitField0_ & ~0x00000002);
           thumbnailImageAlignment_ = 0;
           onChanged();
           return this;
@@ -33409,7 +33906,7 @@ public Builder clearThumbnailImageAlignment() {
          * @return Whether the cardContent field is set.
          */
         public boolean hasCardContent() {
-          return cardContentBuilder_ != null || cardContent_ != null;
+          return ((bitField0_ & 0x00000004) != 0);
         }
         /**
          *
@@ -33450,11 +33947,11 @@ public Builder setCardContent(
               throw new NullPointerException();
             }
             cardContent_ = value;
-            onChanged();
           } else {
             cardContentBuilder_.setMessage(value);
           }
-
+          bitField0_ |= 0x00000004;
+          onChanged();
           return this;
         }
         /**
@@ -33472,11 +33969,11 @@ public Builder setCardContent(
                 builderForValue) {
           if (cardContentBuilder_ == null) {
             cardContent_ = builderForValue.build();
-            onChanged();
           } else {
             cardContentBuilder_.setMessage(builderForValue.build());
           }
-
+          bitField0_ |= 0x00000004;
+          onChanged();
           return this;
         }
         /**
@@ -33492,20 +33989,20 @@ public Builder setCardContent(
         public Builder mergeCardContent(
             com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent value) {
           if (cardContentBuilder_ == null) {
-            if (cardContent_ != null) {
-              cardContent_ =
-                  com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.newBuilder(
-                          cardContent_)
-                      .mergeFrom(value)
-                      .buildPartial();
+            if (((bitField0_ & 0x00000004) != 0)
+                && cardContent_ != null
+                && cardContent_
+                    != com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent
+                        .getDefaultInstance()) {
+              getCardContentBuilder().mergeFrom(value);
             } else {
               cardContent_ = value;
             }
-            onChanged();
           } else {
             cardContentBuilder_.mergeFrom(value);
           }
-
+          bitField0_ |= 0x00000004;
+          onChanged();
           return this;
         }
         /**
@@ -33519,14 +34016,13 @@ public Builder mergeCardContent(
          * </code>
          */
         public Builder clearCardContent() {
-          if (cardContentBuilder_ == null) {
-            cardContent_ = null;
-            onChanged();
-          } else {
-            cardContent_ = null;
+          bitField0_ = (bitField0_ & ~0x00000004);
+          cardContent_ = null;
+          if (cardContentBuilder_ != null) {
+            cardContentBuilder_.dispose();
             cardContentBuilder_ = null;
           }
-
+          onChanged();
           return this;
         }
         /**
@@ -33541,7 +34037,7 @@ public Builder clearCardContent() {
          */
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.Builder
             getCardContentBuilder() {
-
+          bitField0_ |= 0x00000004;
           onChanged();
           return getCardContentFieldBuilder().getBuilder();
         }
@@ -34236,7 +34732,9 @@ private Height(int value) {
         }
 
         public static final int FILE_URI_FIELD_NUMBER = 1;
-        private volatile java.lang.Object fileUri_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object fileUri_ = "";
         /**
          *
          *
@@ -34291,7 +34789,9 @@ public com.google.protobuf.ByteString getFileUriBytes() {
         }
 
         public static final int THUMBNAIL_URI_FIELD_NUMBER = 2;
-        private volatile java.lang.Object thumbnailUri_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object thumbnailUri_ = "";
         /**
          *
          *
@@ -34348,7 +34848,7 @@ public com.google.protobuf.ByteString getThumbnailUriBytes() {
         }
 
         public static final int HEIGHT_FIELD_NUMBER = 3;
-        private int height_;
+        private int height_ = 0;
         /**
          *
          *
@@ -34388,10 +34888,9 @@ public int getHeightValue() {
         @java.lang.Override
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.RbmMedia.Height
             getHeight() {
-          @SuppressWarnings("deprecation")
           com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.RbmMedia.Height result =
               com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.RbmMedia.Height
-                  .valueOf(height_);
+                  .forNumber(height_);
           return result == null
               ? com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.RbmMedia.Height
                   .UNRECOGNIZED
@@ -34652,12 +35151,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           @java.lang.Override
           public Builder clear() {
             super.clear();
+            bitField0_ = 0;
             fileUri_ = "";
-
             thumbnailUri_ = "";
-
             height_ = 0;
-
             return this;
           }
 
@@ -34691,13 +35188,27 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
             com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.RbmMedia result =
                 new com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.RbmMedia(
                     this);
-            result.fileUri_ = fileUri_;
-            result.thumbnailUri_ = thumbnailUri_;
-            result.height_ = height_;
+            if (bitField0_ != 0) {
+              buildPartial0(result);
+            }
             onBuilt();
             return result;
           }
 
+          private void buildPartial0(
+              com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.RbmMedia result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+              result.fileUri_ = fileUri_;
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+              result.thumbnailUri_ = thumbnailUri_;
+            }
+            if (((from_bitField0_ & 0x00000004) != 0)) {
+              result.height_ = height_;
+            }
+          }
+
           @java.lang.Override
           public Builder clone() {
             return super.clone();
@@ -34754,10 +35265,12 @@ public Builder mergeFrom(
                     .getDefaultInstance()) return this;
             if (!other.getFileUri().isEmpty()) {
               fileUri_ = other.fileUri_;
+              bitField0_ |= 0x00000001;
               onChanged();
             }
             if (!other.getThumbnailUri().isEmpty()) {
               thumbnailUri_ = other.thumbnailUri_;
+              bitField0_ |= 0x00000002;
               onChanged();
             }
             if (other.height_ != 0) {
@@ -34792,19 +35305,19 @@ public Builder mergeFrom(
                   case 10:
                     {
                       fileUri_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000001;
                       break;
                     } // case 10
                   case 18:
                     {
                       thumbnailUri_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000002;
                       break;
                     } // case 18
                   case 24:
                     {
                       height_ = input.readEnum();
-
+                      bitField0_ |= 0x00000004;
                       break;
                     } // case 24
                   default:
@@ -34824,6 +35337,8 @@ public Builder mergeFrom(
             return this;
           }
 
+          private int bitField0_;
+
           private java.lang.Object fileUri_ = "";
           /**
            *
@@ -34894,8 +35409,8 @@ public Builder setFileUri(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             fileUri_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
           }
@@ -34914,8 +35429,8 @@ public Builder setFileUri(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearFileUri() {
-
             fileUri_ = getDefaultInstance().getFileUri();
+            bitField0_ = (bitField0_ & ~0x00000001);
             onChanged();
             return this;
           }
@@ -34939,8 +35454,8 @@ public Builder setFileUriBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             fileUri_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
           }
@@ -35018,8 +35533,8 @@ public Builder setThumbnailUri(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             thumbnailUri_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -35039,8 +35554,8 @@ public Builder setThumbnailUri(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearThumbnailUri() {
-
             thumbnailUri_ = getDefaultInstance().getThumbnailUri();
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
             return this;
           }
@@ -35065,8 +35580,8 @@ public Builder setThumbnailUriBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             thumbnailUri_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -35110,8 +35625,8 @@ public int getHeightValue() {
            * @return This builder for chaining.
            */
           public Builder setHeightValue(int value) {
-
             height_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
           }
@@ -35134,11 +35649,10 @@ public Builder setHeightValue(int value) {
           @java.lang.Override
           public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.RbmMedia.Height
               getHeight() {
-            @SuppressWarnings("deprecation")
             com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.RbmMedia.Height
                 result =
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.RbmMedia
-                        .Height.valueOf(height_);
+                        .Height.forNumber(height_);
             return result == null
                 ? com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.RbmMedia.Height
                     .UNRECOGNIZED
@@ -35167,7 +35681,7 @@ public Builder setHeight(
             if (value == null) {
               throw new NullPointerException();
             }
-
+            bitField0_ |= 0x00000004;
             height_ = value.getNumber();
             onChanged();
             return this;
@@ -35189,7 +35703,7 @@ public Builder setHeight(
            * @return This builder for chaining.
            */
           public Builder clearHeight() {
-
+            bitField0_ = (bitField0_ & ~0x00000004);
             height_ = 0;
             onChanged();
             return this;
@@ -35265,7 +35779,9 @@ public com.google.protobuf.Parser<RbmMedia> getParserForType() {
       }
 
       public static final int TITLE_FIELD_NUMBER = 1;
-      private volatile java.lang.Object title_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object title_ = "";
       /**
        *
        *
@@ -35316,7 +35832,9 @@ public com.google.protobuf.ByteString getTitleBytes() {
       }
 
       public static final int DESCRIPTION_FIELD_NUMBER = 2;
-      private volatile java.lang.Object description_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object description_ = "";
       /**
        *
        *
@@ -35419,10 +35937,15 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.RbmMedi
       @java.lang.Override
       public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.RbmMediaOrBuilder
           getMediaOrBuilder() {
-        return getMedia();
+        return media_ == null
+            ? com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.RbmMedia
+                .getDefaultInstance()
+            : media_;
       }
 
       public static final int SUGGESTIONS_FIELD_NUMBER = 4;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestion>
           suggestions_;
       /**
@@ -35743,14 +36266,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           title_ = "";
-
           description_ = "";
-
-          if (mediaBuilder_ == null) {
-            media_ = null;
-          } else {
-            media_ = null;
+          media_ = null;
+          if (mediaBuilder_ != null) {
+            mediaBuilder_.dispose();
             mediaBuilder_ = null;
           }
           if (suggestionsBuilder_ == null) {
@@ -35759,7 +36280,7 @@ public Builder clear() {
             suggestions_ = null;
             suggestionsBuilder_.clear();
           }
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000008);
           return this;
         }
 
@@ -35789,25 +36310,39 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent build()
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent(this);
-          int from_bitField0_ = bitField0_;
-          result.title_ = title_;
-          result.description_ = description_;
-          if (mediaBuilder_ == null) {
-            result.media_ = media_;
-          } else {
-            result.media_ = mediaBuilder_.build();
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
           }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent result) {
           if (suggestionsBuilder_ == null) {
-            if (((bitField0_ & 0x00000001) != 0)) {
+            if (((bitField0_ & 0x00000008) != 0)) {
               suggestions_ = java.util.Collections.unmodifiableList(suggestions_);
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000008);
             }
             result.suggestions_ = suggestions_;
           } else {
             result.suggestions_ = suggestionsBuilder_.build();
           }
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.title_ = title_;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.description_ = description_;
+          }
+          if (((from_bitField0_ & 0x00000004) != 0)) {
+            result.media_ = mediaBuilder_ == null ? media_ : mediaBuilder_.build();
+          }
         }
 
         @java.lang.Override
@@ -35863,10 +36398,12 @@ public Builder mergeFrom(
                   .getDefaultInstance()) return this;
           if (!other.getTitle().isEmpty()) {
             title_ = other.title_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (!other.getDescription().isEmpty()) {
             description_ = other.description_;
+            bitField0_ |= 0x00000002;
             onChanged();
           }
           if (other.hasMedia()) {
@@ -35876,7 +36413,7 @@ public Builder mergeFrom(
             if (!other.suggestions_.isEmpty()) {
               if (suggestions_.isEmpty()) {
                 suggestions_ = other.suggestions_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000008);
               } else {
                 ensureSuggestionsIsMutable();
                 suggestions_.addAll(other.suggestions_);
@@ -35889,7 +36426,7 @@ public Builder mergeFrom(
                 suggestionsBuilder_.dispose();
                 suggestionsBuilder_ = null;
                 suggestions_ = other.suggestions_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000008);
                 suggestionsBuilder_ =
                     com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                         ? getSuggestionsFieldBuilder()
@@ -35928,19 +36465,19 @@ public Builder mergeFrom(
                 case 10:
                   {
                     title_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
                   {
                     description_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 18
                 case 26:
                   {
                     input.readMessage(getMediaFieldBuilder().getBuilder(), extensionRegistry);
-
+                    bitField0_ |= 0x00000004;
                     break;
                   } // case 26
                 case 34:
@@ -36041,8 +36578,8 @@ public Builder setTitle(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -36059,8 +36596,8 @@ public Builder setTitle(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearTitle() {
-
           title_ = getDefaultInstance().getTitle();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -36082,8 +36619,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -36152,8 +36689,8 @@ public Builder setDescription(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           description_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -36170,8 +36707,8 @@ public Builder setDescription(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearDescription() {
-
           description_ = getDefaultInstance().getDescription();
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -36193,8 +36730,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           description_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -36219,7 +36756,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
          * @return Whether the media field is set.
          */
         public boolean hasMedia() {
-          return mediaBuilder_ != null || media_ != null;
+          return ((bitField0_ & 0x00000004) != 0);
         }
         /**
          *
@@ -36263,11 +36800,11 @@ public Builder setMedia(
               throw new NullPointerException();
             }
             media_ = value;
-            onChanged();
           } else {
             mediaBuilder_.setMessage(value);
           }
-
+          bitField0_ |= 0x00000004;
+          onChanged();
           return this;
         }
         /**
@@ -36286,11 +36823,11 @@ public Builder setMedia(
                 builderForValue) {
           if (mediaBuilder_ == null) {
             media_ = builderForValue.build();
-            onChanged();
           } else {
             mediaBuilder_.setMessage(builderForValue.build());
           }
-
+          bitField0_ |= 0x00000004;
+          onChanged();
           return this;
         }
         /**
@@ -36307,20 +36844,20 @@ public Builder setMedia(
         public Builder mergeMedia(
             com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.RbmMedia value) {
           if (mediaBuilder_ == null) {
-            if (media_ != null) {
-              media_ =
-                  com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.RbmMedia
-                      .newBuilder(media_)
-                      .mergeFrom(value)
-                      .buildPartial();
+            if (((bitField0_ & 0x00000004) != 0)
+                && media_ != null
+                && media_
+                    != com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.RbmMedia
+                        .getDefaultInstance()) {
+              getMediaBuilder().mergeFrom(value);
             } else {
               media_ = value;
             }
-            onChanged();
           } else {
             mediaBuilder_.mergeFrom(value);
           }
-
+          bitField0_ |= 0x00000004;
+          onChanged();
           return this;
         }
         /**
@@ -36335,14 +36872,13 @@ public Builder mergeMedia(
          * </code>
          */
         public Builder clearMedia() {
-          if (mediaBuilder_ == null) {
-            media_ = null;
-            onChanged();
-          } else {
-            media_ = null;
+          bitField0_ = (bitField0_ & ~0x00000004);
+          media_ = null;
+          if (mediaBuilder_ != null) {
+            mediaBuilder_.dispose();
             mediaBuilder_ = null;
           }
-
+          onChanged();
           return this;
         }
         /**
@@ -36358,7 +36894,7 @@ public Builder clearMedia() {
          */
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmCardContent.RbmMedia.Builder
             getMediaBuilder() {
-
+          bitField0_ |= 0x00000004;
           onChanged();
           return getMediaFieldBuilder().getBuilder();
         }
@@ -36417,11 +36953,11 @@ public Builder clearMedia() {
             suggestions_ = java.util.Collections.emptyList();
 
         private void ensureSuggestionsIsMutable() {
-          if (!((bitField0_ & 0x00000001) != 0)) {
+          if (!((bitField0_ & 0x00000008) != 0)) {
             suggestions_ =
                 new java.util.ArrayList<
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestion>(suggestions_);
-            bitField0_ |= 0x00000001;
+            bitField0_ |= 0x00000008;
           }
         }
 
@@ -36671,7 +37207,7 @@ public Builder addAllSuggestions(
         public Builder clearSuggestions() {
           if (suggestionsBuilder_ == null) {
             suggestions_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000008);
             onChanged();
           } else {
             suggestionsBuilder_.clear();
@@ -36819,7 +37355,7 @@ public Builder removeSuggestions(int index) {
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestion.Builder,
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestionOrBuilder>(
                     suggestions_,
-                    ((bitField0_ & 0x00000001) != 0),
+                    ((bitField0_ & 0x00000008) != 0),
                     getParentForChildren(),
                     isClean());
             suggestions_ = null;
@@ -37423,6 +37959,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           if (replyBuilder_ != null) {
             replyBuilder_.clear();
           }
@@ -37460,25 +37997,31 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestion build()
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestion buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestion result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestion(this);
-          if (suggestionCase_ == 1) {
-            if (replyBuilder_ == null) {
-              result.suggestion_ = suggestion_;
-            } else {
-              result.suggestion_ = replyBuilder_.build();
-            }
+          if (bitField0_ != 0) {
+            buildPartial0(result);
           }
-          if (suggestionCase_ == 2) {
-            if (actionBuilder_ == null) {
-              result.suggestion_ = suggestion_;
-            } else {
-              result.suggestion_ = actionBuilder_.build();
-            }
-          }
-          result.suggestionCase_ = suggestionCase_;
+          buildPartialOneofs(result);
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestion result) {
+          int from_bitField0_ = bitField0_;
+        }
+
+        private void buildPartialOneofs(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestion result) {
+          result.suggestionCase_ = suggestionCase_;
+          result.suggestion_ = this.suggestion_;
+          if (suggestionCase_ == 1 && replyBuilder_ != null) {
+            result.suggestion_ = replyBuilder_.build();
+          }
+          if (suggestionCase_ == 2 && actionBuilder_ != null) {
+            result.suggestion_ = actionBuilder_.build();
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -37615,6 +38158,8 @@ public Builder clearSuggestion() {
           return this;
         }
 
+        private int bitField0_;
+
         private com.google.protobuf.SingleFieldBuilderV3<
                 com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestedReply,
                 com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestedReply.Builder,
@@ -37837,7 +38382,6 @@ public Builder clearReply() {
           }
           suggestionCase_ = 1;
           onChanged();
-          ;
           return replyBuilder_;
         }
 
@@ -38072,7 +38616,6 @@ public Builder clearAction() {
           }
           suggestionCase_ = 2;
           onChanged();
-          ;
           return actionBuilder_;
         }
 
@@ -38254,7 +38797,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int TEXT_FIELD_NUMBER = 1;
-      private volatile java.lang.Object text_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object text_ = "";
       /**
        *
        *
@@ -38303,7 +38848,9 @@ public com.google.protobuf.ByteString getTextBytes() {
       }
 
       public static final int POSTBACK_DATA_FIELD_NUMBER = 2;
-      private volatile java.lang.Object postbackData_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object postbackData_ = "";
       /**
        *
        *
@@ -38570,10 +39117,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           text_ = "";
-
           postbackData_ = "";
-
           return this;
         }
 
@@ -38604,12 +39150,24 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestedReply buil
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestedReply buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestedReply result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestedReply(this);
-          result.text_ = text_;
-          result.postbackData_ = postbackData_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestedReply result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.text_ = text_;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.postbackData_ = postbackData_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -38664,10 +39222,12 @@ public Builder mergeFrom(
                   .getDefaultInstance()) return this;
           if (!other.getText().isEmpty()) {
             text_ = other.text_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (!other.getPostbackData().isEmpty()) {
             postbackData_ = other.postbackData_;
+            bitField0_ |= 0x00000002;
             onChanged();
           }
           this.mergeUnknownFields(other.getUnknownFields());
@@ -38699,13 +39259,13 @@ public Builder mergeFrom(
                 case 10:
                   {
                     text_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
                   {
                     postbackData_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 18
                 default:
@@ -38725,6 +39285,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object text_ = "";
         /**
          *
@@ -38786,8 +39348,8 @@ public Builder setText(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           text_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -38803,8 +39365,8 @@ public Builder setText(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearText() {
-
           text_ = getDefaultInstance().getText();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -38825,8 +39387,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           text_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -38898,8 +39460,8 @@ public Builder setPostbackData(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           postbackData_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -38917,8 +39479,8 @@ public Builder setPostbackData(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearPostbackData() {
-
           postbackData_ = getDefaultInstance().getPostbackData();
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -38941,8 +39503,8 @@ public Builder setPostbackDataBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           postbackData_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -39354,7 +39916,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         }
 
         public static final int PHONE_NUMBER_FIELD_NUMBER = 1;
-        private volatile java.lang.Object phoneNumber_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object phoneNumber_ = "";
         /**
          *
          *
@@ -39646,8 +40210,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           @java.lang.Override
           public Builder clear() {
             super.clear();
+            bitField0_ = 0;
             phoneNumber_ = "";
-
             return this;
           }
 
@@ -39687,11 +40251,23 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
                 result =
                     new com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestedAction
                         .RbmSuggestedActionDial(this);
-            result.phoneNumber_ = phoneNumber_;
+            if (bitField0_ != 0) {
+              buildPartial0(result);
+            }
             onBuilt();
             return result;
           }
 
+          private void buildPartial0(
+              com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestedAction
+                      .RbmSuggestedActionDial
+                  result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+              result.phoneNumber_ = phoneNumber_;
+            }
+          }
+
           @java.lang.Override
           public Builder clone() {
             return super.clone();
@@ -39752,6 +40328,7 @@ public Builder mergeFrom(
                     .RbmSuggestedActionDial.getDefaultInstance()) return this;
             if (!other.getPhoneNumber().isEmpty()) {
               phoneNumber_ = other.phoneNumber_;
+              bitField0_ |= 0x00000001;
               onChanged();
             }
             this.mergeUnknownFields(other.getUnknownFields());
@@ -39783,7 +40360,7 @@ public Builder mergeFrom(
                   case 10:
                     {
                       phoneNumber_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000001;
                       break;
                     } // case 10
                   default:
@@ -39803,6 +40380,8 @@ public Builder mergeFrom(
             return this;
           }
 
+          private int bitField0_;
+
           private java.lang.Object phoneNumber_ = "";
           /**
            *
@@ -39873,8 +40452,8 @@ public Builder setPhoneNumber(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             phoneNumber_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
           }
@@ -39893,8 +40472,8 @@ public Builder setPhoneNumber(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearPhoneNumber() {
-
             phoneNumber_ = getDefaultInstance().getPhoneNumber();
+            bitField0_ = (bitField0_ & ~0x00000001);
             onChanged();
             return this;
           }
@@ -39918,8 +40497,8 @@ public Builder setPhoneNumberBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             phoneNumber_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
           }
@@ -40084,7 +40663,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         }
 
         public static final int URI_FIELD_NUMBER = 1;
-        private volatile java.lang.Object uri_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object uri_ = "";
         /**
          *
          *
@@ -40372,8 +40953,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           @java.lang.Override
           public Builder clear() {
             super.clear();
+            bitField0_ = 0;
             uri_ = "";
-
             return this;
           }
 
@@ -40413,11 +40994,23 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
                 result =
                     new com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestedAction
                         .RbmSuggestedActionOpenUri(this);
-            result.uri_ = uri_;
+            if (bitField0_ != 0) {
+              buildPartial0(result);
+            }
             onBuilt();
             return result;
           }
 
+          private void buildPartial0(
+              com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestedAction
+                      .RbmSuggestedActionOpenUri
+                  result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+              result.uri_ = uri_;
+            }
+          }
+
           @java.lang.Override
           public Builder clone() {
             return super.clone();
@@ -40478,6 +41071,7 @@ public Builder mergeFrom(
                     .RbmSuggestedActionOpenUri.getDefaultInstance()) return this;
             if (!other.getUri().isEmpty()) {
               uri_ = other.uri_;
+              bitField0_ |= 0x00000001;
               onChanged();
             }
             this.mergeUnknownFields(other.getUnknownFields());
@@ -40509,7 +41103,7 @@ public Builder mergeFrom(
                   case 10:
                     {
                       uri_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000001;
                       break;
                     } // case 10
                   default:
@@ -40529,6 +41123,8 @@ public Builder mergeFrom(
             return this;
           }
 
+          private int bitField0_;
+
           private java.lang.Object uri_ = "";
           /**
            *
@@ -40590,8 +41186,8 @@ public Builder setUri(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             uri_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
           }
@@ -40607,8 +41203,8 @@ public Builder setUri(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearUri() {
-
             uri_ = getDefaultInstance().getUri();
+            bitField0_ = (bitField0_ & ~0x00000001);
             onChanged();
             return this;
           }
@@ -40629,8 +41225,8 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             uri_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
           }
@@ -41260,7 +41856,9 @@ public ActionCase getActionCase() {
       }
 
       public static final int TEXT_FIELD_NUMBER = 1;
-      private volatile java.lang.Object text_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object text_ = "";
       /**
        *
        *
@@ -41309,7 +41907,9 @@ public com.google.protobuf.ByteString getTextBytes() {
       }
 
       public static final int POSTBACK_DATA_FIELD_NUMBER = 2;
-      private volatile java.lang.Object postbackData_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object postbackData_ = "";
       /**
        *
        *
@@ -41852,10 +42452,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           text_ = "";
-
           postbackData_ = "";
-
           if (dialBuilder_ != null) {
             dialBuilder_.clear();
           }
@@ -41898,32 +42497,38 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestedAction bui
             buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestedAction result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestedAction(this);
-          result.text_ = text_;
-          result.postbackData_ = postbackData_;
-          if (actionCase_ == 3) {
-            if (dialBuilder_ == null) {
-              result.action_ = action_;
-            } else {
-              result.action_ = dialBuilder_.build();
-            }
+          if (bitField0_ != 0) {
+            buildPartial0(result);
           }
-          if (actionCase_ == 4) {
-            if (openUrlBuilder_ == null) {
-              result.action_ = action_;
-            } else {
-              result.action_ = openUrlBuilder_.build();
-            }
+          buildPartialOneofs(result);
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestedAction result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.text_ = text_;
           }
-          if (actionCase_ == 5) {
-            if (shareLocationBuilder_ == null) {
-              result.action_ = action_;
-            } else {
-              result.action_ = shareLocationBuilder_.build();
-            }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.postbackData_ = postbackData_;
           }
+        }
+
+        private void buildPartialOneofs(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.RbmSuggestedAction result) {
           result.actionCase_ = actionCase_;
-          onBuilt();
-          return result;
+          result.action_ = this.action_;
+          if (actionCase_ == 3 && dialBuilder_ != null) {
+            result.action_ = dialBuilder_.build();
+          }
+          if (actionCase_ == 4 && openUrlBuilder_ != null) {
+            result.action_ = openUrlBuilder_.build();
+          }
+          if (actionCase_ == 5 && shareLocationBuilder_ != null) {
+            result.action_ = shareLocationBuilder_.build();
+          }
         }
 
         @java.lang.Override
@@ -41980,10 +42585,12 @@ public Builder mergeFrom(
                   .getDefaultInstance()) return this;
           if (!other.getText().isEmpty()) {
             text_ = other.text_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (!other.getPostbackData().isEmpty()) {
             postbackData_ = other.postbackData_;
+            bitField0_ |= 0x00000002;
             onChanged();
           }
           switch (other.getActionCase()) {
@@ -42036,13 +42643,13 @@ public Builder mergeFrom(
                 case 10:
                   {
                     text_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
                   {
                     postbackData_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 18
                 case 26:
@@ -42095,6 +42702,8 @@ public Builder clearAction() {
           return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object text_ = "";
         /**
          *
@@ -42156,8 +42765,8 @@ public Builder setText(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           text_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -42173,8 +42782,8 @@ public Builder setText(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearText() {
-
           text_ = getDefaultInstance().getText();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -42195,8 +42804,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           text_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -42268,8 +42877,8 @@ public Builder setPostbackData(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           postbackData_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -42287,8 +42896,8 @@ public Builder setPostbackData(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearPostbackData() {
-
           postbackData_ = getDefaultInstance().getPostbackData();
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -42311,8 +42920,8 @@ public Builder setPostbackDataBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           postbackData_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -42580,7 +43189,6 @@ public Builder clearDial() {
           }
           actionCase_ = 3;
           onChanged();
-          ;
           return dialBuilder_;
         }
 
@@ -42847,7 +43455,6 @@ public Builder clearOpenUrl() {
           }
           actionCase_ = 4;
           onChanged();
-          ;
           return openUrlBuilder_;
         }
 
@@ -43114,7 +43721,6 @@ public Builder clearShareLocation() {
           }
           actionCase_ = 5;
           onChanged();
-          ;
           return shareLocationBuilder_;
         }
 
@@ -43738,7 +44344,9 @@ public ImageCase getImageCase() {
         }
 
         public static final int NAME_FIELD_NUMBER = 1;
-        private volatile java.lang.Object name_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object name_ = "";
         /**
          *
          *
@@ -43787,7 +44395,9 @@ public com.google.protobuf.ByteString getNameBytes() {
         }
 
         public static final int DESCRIPTION_FIELD_NUMBER = 2;
-        private volatile java.lang.Object description_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object description_ = "";
         /**
          *
          *
@@ -43940,7 +44550,9 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Image getIcon() {
         }
 
         public static final int CONTENT_URL_FIELD_NUMBER = 5;
-        private volatile java.lang.Object contentUrl_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object contentUrl_ = "";
         /**
          *
          *
@@ -44282,10 +44894,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           @java.lang.Override
           public Builder clear() {
             super.clear();
+            bitField0_ = 0;
             name_ = "";
-
             description_ = "";
-
             if (largeImageBuilder_ != null) {
               largeImageBuilder_.clear();
             }
@@ -44293,7 +44904,6 @@ public Builder clear() {
               iconBuilder_.clear();
             }
             contentUrl_ = "";
-
             imageCase_ = 0;
             image_ = null;
             return this;
@@ -44330,28 +44940,42 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
                 result =
                     new com.google.cloud.dialogflow.v2beta1.Intent.Message.MediaContent
                         .ResponseMediaObject(this);
-            result.name_ = name_;
-            result.description_ = description_;
-            if (imageCase_ == 3) {
-              if (largeImageBuilder_ == null) {
-                result.image_ = image_;
-              } else {
-                result.image_ = largeImageBuilder_.build();
-              }
-            }
-            if (imageCase_ == 4) {
-              if (iconBuilder_ == null) {
-                result.image_ = image_;
-              } else {
-                result.image_ = iconBuilder_.build();
-              }
+            if (bitField0_ != 0) {
+              buildPartial0(result);
             }
-            result.contentUrl_ = contentUrl_;
-            result.imageCase_ = imageCase_;
+            buildPartialOneofs(result);
             onBuilt();
             return result;
           }
 
+          private void buildPartial0(
+              com.google.cloud.dialogflow.v2beta1.Intent.Message.MediaContent.ResponseMediaObject
+                  result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+              result.name_ = name_;
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+              result.description_ = description_;
+            }
+            if (((from_bitField0_ & 0x00000010) != 0)) {
+              result.contentUrl_ = contentUrl_;
+            }
+          }
+
+          private void buildPartialOneofs(
+              com.google.cloud.dialogflow.v2beta1.Intent.Message.MediaContent.ResponseMediaObject
+                  result) {
+            result.imageCase_ = imageCase_;
+            result.image_ = this.image_;
+            if (imageCase_ == 3 && largeImageBuilder_ != null) {
+              result.image_ = largeImageBuilder_.build();
+            }
+            if (imageCase_ == 4 && iconBuilder_ != null) {
+              result.image_ = iconBuilder_.build();
+            }
+          }
+
           @java.lang.Override
           public Builder clone() {
             return super.clone();
@@ -44411,14 +45035,17 @@ public Builder mergeFrom(
                     .ResponseMediaObject.getDefaultInstance()) return this;
             if (!other.getName().isEmpty()) {
               name_ = other.name_;
+              bitField0_ |= 0x00000001;
               onChanged();
             }
             if (!other.getDescription().isEmpty()) {
               description_ = other.description_;
+              bitField0_ |= 0x00000002;
               onChanged();
             }
             if (!other.getContentUrl().isEmpty()) {
               contentUrl_ = other.contentUrl_;
+              bitField0_ |= 0x00000010;
               onChanged();
             }
             switch (other.getImageCase()) {
@@ -44466,13 +45093,13 @@ public Builder mergeFrom(
                   case 10:
                     {
                       name_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000001;
                       break;
                     } // case 10
                   case 18:
                     {
                       description_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000002;
                       break;
                     } // case 18
                   case 26:
@@ -44491,7 +45118,7 @@ public Builder mergeFrom(
                   case 42:
                     {
                       contentUrl_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000010;
                       break;
                     } // case 42
                   default:
@@ -44525,6 +45152,8 @@ public Builder clearImage() {
             return this;
           }
 
+          private int bitField0_;
+
           private java.lang.Object name_ = "";
           /**
            *
@@ -44586,8 +45215,8 @@ public Builder setName(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             name_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
           }
@@ -44603,8 +45232,8 @@ public Builder setName(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearName() {
-
             name_ = getDefaultInstance().getName();
+            bitField0_ = (bitField0_ & ~0x00000001);
             onChanged();
             return this;
           }
@@ -44625,8 +45254,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             name_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
           }
@@ -44692,8 +45321,8 @@ public Builder setDescription(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             description_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -44709,8 +45338,8 @@ public Builder setDescription(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearDescription() {
-
             description_ = getDefaultInstance().getDescription();
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
             return this;
           }
@@ -44731,8 +45360,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             description_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -44950,7 +45579,6 @@ public Builder clearLargeImage() {
             }
             imageCase_ = 3;
             onChanged();
-            ;
             return largeImageBuilder_;
           }
 
@@ -45164,7 +45792,6 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.Builder getIconB
             }
             imageCase_ = 4;
             onChanged();
-            ;
             return iconBuilder_;
           }
 
@@ -45229,8 +45856,8 @@ public Builder setContentUrl(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             contentUrl_ = value;
+            bitField0_ |= 0x00000010;
             onChanged();
             return this;
           }
@@ -45246,8 +45873,8 @@ public Builder setContentUrl(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearContentUrl() {
-
             contentUrl_ = getDefaultInstance().getContentUrl();
+            bitField0_ = (bitField0_ & ~0x00000010);
             onChanged();
             return this;
           }
@@ -45268,8 +45895,8 @@ public Builder setContentUrlBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             contentUrl_ = value;
+            bitField0_ |= 0x00000010;
             onChanged();
             return this;
           }
@@ -45346,7 +45973,7 @@ public com.google.protobuf.Parser<ResponseMediaObject> getParserForType() {
       }
 
       public static final int MEDIA_TYPE_FIELD_NUMBER = 1;
-      private int mediaType_;
+      private int mediaType_ = 0;
       /**
        *
        *
@@ -45380,10 +46007,9 @@ public int getMediaTypeValue() {
       @java.lang.Override
       public com.google.cloud.dialogflow.v2beta1.Intent.Message.MediaContent.ResponseMediaType
           getMediaType() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.dialogflow.v2beta1.Intent.Message.MediaContent.ResponseMediaType result =
             com.google.cloud.dialogflow.v2beta1.Intent.Message.MediaContent.ResponseMediaType
-                .valueOf(mediaType_);
+                .forNumber(mediaType_);
         return result == null
             ? com.google.cloud.dialogflow.v2beta1.Intent.Message.MediaContent.ResponseMediaType
                 .UNRECOGNIZED
@@ -45391,6 +46017,8 @@ public int getMediaTypeValue() {
       }
 
       public static final int MEDIA_OBJECTS_FIELD_NUMBER = 2;
+
+      @SuppressWarnings("serial")
       private java.util.List<
               com.google.cloud.dialogflow.v2beta1.Intent.Message.MediaContent.ResponseMediaObject>
           mediaObjects_;
@@ -45699,15 +46327,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           mediaType_ = 0;
-
           if (mediaObjectsBuilder_ == null) {
             mediaObjects_ = java.util.Collections.emptyList();
           } else {
             mediaObjects_ = null;
             mediaObjectsBuilder_.clear();
           }
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
@@ -45737,19 +46365,33 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.MediaContent build() {
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.MediaContent buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.MediaContent result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.MediaContent(this);
-          int from_bitField0_ = bitField0_;
-          result.mediaType_ = mediaType_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.MediaContent result) {
           if (mediaObjectsBuilder_ == null) {
-            if (((bitField0_ & 0x00000001) != 0)) {
+            if (((bitField0_ & 0x00000002) != 0)) {
               mediaObjects_ = java.util.Collections.unmodifiableList(mediaObjects_);
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
             }
             result.mediaObjects_ = mediaObjects_;
           } else {
             result.mediaObjects_ = mediaObjectsBuilder_.build();
           }
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.MediaContent result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.mediaType_ = mediaType_;
+          }
         }
 
         @java.lang.Override
@@ -45810,7 +46452,7 @@ public Builder mergeFrom(
             if (!other.mediaObjects_.isEmpty()) {
               if (mediaObjects_.isEmpty()) {
                 mediaObjects_ = other.mediaObjects_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000002);
               } else {
                 ensureMediaObjectsIsMutable();
                 mediaObjects_.addAll(other.mediaObjects_);
@@ -45823,7 +46465,7 @@ public Builder mergeFrom(
                 mediaObjectsBuilder_.dispose();
                 mediaObjectsBuilder_ = null;
                 mediaObjects_ = other.mediaObjects_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000002);
                 mediaObjectsBuilder_ =
                     com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                         ? getMediaObjectsFieldBuilder()
@@ -45862,7 +46504,7 @@ public Builder mergeFrom(
                 case 8:
                   {
                     mediaType_ = input.readEnum();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 8
                 case 18:
@@ -45934,8 +46576,8 @@ public int getMediaTypeValue() {
          * @return This builder for chaining.
          */
         public Builder setMediaTypeValue(int value) {
-
           mediaType_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -45955,10 +46597,9 @@ public Builder setMediaTypeValue(int value) {
         @java.lang.Override
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.MediaContent.ResponseMediaType
             getMediaType() {
-          @SuppressWarnings("deprecation")
           com.google.cloud.dialogflow.v2beta1.Intent.Message.MediaContent.ResponseMediaType result =
               com.google.cloud.dialogflow.v2beta1.Intent.Message.MediaContent.ResponseMediaType
-                  .valueOf(mediaType_);
+                  .forNumber(mediaType_);
           return result == null
               ? com.google.cloud.dialogflow.v2beta1.Intent.Message.MediaContent.ResponseMediaType
                   .UNRECOGNIZED
@@ -45984,7 +46625,7 @@ public Builder setMediaType(
           if (value == null) {
             throw new NullPointerException();
           }
-
+          bitField0_ |= 0x00000001;
           mediaType_ = value.getNumber();
           onChanged();
           return this;
@@ -46003,7 +46644,7 @@ public Builder setMediaType(
          * @return This builder for chaining.
          */
         public Builder clearMediaType() {
-
+          bitField0_ = (bitField0_ & ~0x00000001);
           mediaType_ = 0;
           onChanged();
           return this;
@@ -46014,12 +46655,12 @@ public Builder clearMediaType() {
             mediaObjects_ = java.util.Collections.emptyList();
 
         private void ensureMediaObjectsIsMutable() {
-          if (!((bitField0_ & 0x00000001) != 0)) {
+          if (!((bitField0_ & 0x00000002) != 0)) {
             mediaObjects_ =
                 new java.util.ArrayList<
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.MediaContent
                         .ResponseMediaObject>(mediaObjects_);
-            bitField0_ |= 0x00000001;
+            bitField0_ |= 0x00000002;
           }
         }
 
@@ -46282,7 +46923,7 @@ public Builder addAllMediaObjects(
         public Builder clearMediaObjects() {
           if (mediaObjectsBuilder_ == null) {
             mediaObjects_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
           } else {
             mediaObjectsBuilder_.clear();
@@ -46442,7 +47083,7 @@ public Builder removeMediaObjects(int index) {
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.MediaContent
                         .ResponseMediaObjectOrBuilder>(
                     mediaObjects_,
-                    ((bitField0_ & 0x00000001) != 0),
+                    ((bitField0_ & 0x00000002) != 0),
                     getParentForChildren(),
                     isClean());
             mediaObjects_ = null;
@@ -47414,7 +48055,9 @@ private UrlTypeHint(int value) {
           }
 
           public static final int URL_FIELD_NUMBER = 1;
-          private volatile java.lang.Object url_;
+
+          @SuppressWarnings("serial")
+          private volatile java.lang.Object url_ = "";
           /**
            *
            *
@@ -47463,7 +48106,7 @@ public com.google.protobuf.ByteString getUrlBytes() {
           }
 
           public static final int URL_TYPE_HINT_FIELD_NUMBER = 3;
-          private int urlTypeHint_;
+          private int urlTypeHint_ = 0;
           /**
            *
            *
@@ -47500,12 +48143,11 @@ public int getUrlTypeHintValue() {
           public com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
                   .BrowseCarouselCardItem.OpenUrlAction.UrlTypeHint
               getUrlTypeHint() {
-            @SuppressWarnings("deprecation")
             com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
                     .BrowseCarouselCardItem.OpenUrlAction.UrlTypeHint
                 result =
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
-                        .BrowseCarouselCardItem.OpenUrlAction.UrlTypeHint.valueOf(urlTypeHint_);
+                        .BrowseCarouselCardItem.OpenUrlAction.UrlTypeHint.forNumber(urlTypeHint_);
             return result == null
                 ? com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
                     .BrowseCarouselCardItem.OpenUrlAction.UrlTypeHint.UNRECOGNIZED
@@ -47764,10 +48406,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
             @java.lang.Override
             public Builder clear() {
               super.clear();
+              bitField0_ = 0;
               url_ = "";
-
               urlTypeHint_ = 0;
-
               return this;
             }
 
@@ -47807,12 +48448,26 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
                   result =
                       new com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
                           .BrowseCarouselCardItem.OpenUrlAction(this);
-              result.url_ = url_;
-              result.urlTypeHint_ = urlTypeHint_;
+              if (bitField0_ != 0) {
+                buildPartial0(result);
+              }
               onBuilt();
               return result;
             }
 
+            private void buildPartial0(
+                com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
+                        .BrowseCarouselCardItem.OpenUrlAction
+                    result) {
+              int from_bitField0_ = bitField0_;
+              if (((from_bitField0_ & 0x00000001) != 0)) {
+                result.url_ = url_;
+              }
+              if (((from_bitField0_ & 0x00000002) != 0)) {
+                result.urlTypeHint_ = urlTypeHint_;
+              }
+            }
+
             @java.lang.Override
             public Builder clone() {
               return super.clone();
@@ -47873,6 +48528,7 @@ public Builder mergeFrom(
                       .BrowseCarouselCardItem.OpenUrlAction.getDefaultInstance()) return this;
               if (!other.getUrl().isEmpty()) {
                 url_ = other.url_;
+                bitField0_ |= 0x00000001;
                 onChanged();
               }
               if (other.urlTypeHint_ != 0) {
@@ -47907,13 +48563,13 @@ public Builder mergeFrom(
                     case 10:
                       {
                         url_ = input.readStringRequireUtf8();
-
+                        bitField0_ |= 0x00000001;
                         break;
                       } // case 10
                     case 24:
                       {
                         urlTypeHint_ = input.readEnum();
-
+                        bitField0_ |= 0x00000002;
                         break;
                       } // case 24
                     default:
@@ -47933,6 +48589,8 @@ public Builder mergeFrom(
               return this;
             }
 
+            private int bitField0_;
+
             private java.lang.Object url_ = "";
             /**
              *
@@ -47994,8 +48652,8 @@ public Builder setUrl(java.lang.String value) {
               if (value == null) {
                 throw new NullPointerException();
               }
-
               url_ = value;
+              bitField0_ |= 0x00000001;
               onChanged();
               return this;
             }
@@ -48011,8 +48669,8 @@ public Builder setUrl(java.lang.String value) {
              * @return This builder for chaining.
              */
             public Builder clearUrl() {
-
               url_ = getDefaultInstance().getUrl();
+              bitField0_ = (bitField0_ & ~0x00000001);
               onChanged();
               return this;
             }
@@ -48033,8 +48691,8 @@ public Builder setUrlBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
               }
               checkByteStringIsUtf8(value);
-
               url_ = value;
+              bitField0_ |= 0x00000001;
               onChanged();
               return this;
             }
@@ -48074,8 +48732,8 @@ public int getUrlTypeHintValue() {
              * @return This builder for chaining.
              */
             public Builder setUrlTypeHintValue(int value) {
-
               urlTypeHint_ = value;
+              bitField0_ |= 0x00000002;
               onChanged();
               return this;
             }
@@ -48097,12 +48755,11 @@ public Builder setUrlTypeHintValue(int value) {
             public com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
                     .BrowseCarouselCardItem.OpenUrlAction.UrlTypeHint
                 getUrlTypeHint() {
-              @SuppressWarnings("deprecation")
               com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
                       .BrowseCarouselCardItem.OpenUrlAction.UrlTypeHint
                   result =
                       com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
-                          .BrowseCarouselCardItem.OpenUrlAction.UrlTypeHint.valueOf(urlTypeHint_);
+                          .BrowseCarouselCardItem.OpenUrlAction.UrlTypeHint.forNumber(urlTypeHint_);
               return result == null
                   ? com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
                       .BrowseCarouselCardItem.OpenUrlAction.UrlTypeHint.UNRECOGNIZED
@@ -48130,7 +48787,7 @@ public Builder setUrlTypeHint(
               if (value == null) {
                 throw new NullPointerException();
               }
-
+              bitField0_ |= 0x00000002;
               urlTypeHint_ = value.getNumber();
               onChanged();
               return this;
@@ -48150,7 +48807,7 @@ public Builder setUrlTypeHint(
              * @return This builder for chaining.
              */
             public Builder clearUrlTypeHint() {
-
+              bitField0_ = (bitField0_ & ~0x00000002);
               urlTypeHint_ = 0;
               onChanged();
               return this;
@@ -48286,11 +48943,16 @@ public boolean hasOpenUriAction() {
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
                 .BrowseCarouselCardItem.OpenUrlActionOrBuilder
             getOpenUriActionOrBuilder() {
-          return getOpenUriAction();
+          return openUriAction_ == null
+              ? com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
+                  .BrowseCarouselCardItem.OpenUrlAction.getDefaultInstance()
+              : openUriAction_;
         }
 
         public static final int TITLE_FIELD_NUMBER = 2;
-        private volatile java.lang.Object title_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object title_ = "";
         /**
          *
          *
@@ -48339,7 +49001,9 @@ public com.google.protobuf.ByteString getTitleBytes() {
         }
 
         public static final int DESCRIPTION_FIELD_NUMBER = 3;
-        private volatile java.lang.Object description_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object description_ = "";
         /**
          *
          *
@@ -48435,11 +49099,15 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Image getImage() {
         @java.lang.Override
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.ImageOrBuilder
             getImageOrBuilder() {
-          return getImage();
+          return image_ == null
+              ? com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.getDefaultInstance()
+              : image_;
         }
 
         public static final int FOOTER_FIELD_NUMBER = 5;
-        private volatile java.lang.Object footer_;
+
+        @SuppressWarnings("serial")
+        private volatile java.lang.Object footer_ = "";
         /**
          *
          *
@@ -48772,24 +49440,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           @java.lang.Override
           public Builder clear() {
             super.clear();
-            if (openUriActionBuilder_ == null) {
-              openUriAction_ = null;
-            } else {
-              openUriAction_ = null;
+            bitField0_ = 0;
+            openUriAction_ = null;
+            if (openUriActionBuilder_ != null) {
+              openUriActionBuilder_.dispose();
               openUriActionBuilder_ = null;
             }
             title_ = "";
-
             description_ = "";
-
-            if (imageBuilder_ == null) {
-              image_ = null;
-            } else {
-              image_ = null;
+            image_ = null;
+            if (imageBuilder_ != null) {
+              imageBuilder_.dispose();
               imageBuilder_ = null;
             }
             footer_ = "";
-
             return this;
           }
 
@@ -48829,23 +49493,36 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
                 result =
                     new com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
                         .BrowseCarouselCardItem(this);
-            if (openUriActionBuilder_ == null) {
-              result.openUriAction_ = openUriAction_;
-            } else {
-              result.openUriAction_ = openUriActionBuilder_.build();
+            if (bitField0_ != 0) {
+              buildPartial0(result);
             }
-            result.title_ = title_;
-            result.description_ = description_;
-            if (imageBuilder_ == null) {
-              result.image_ = image_;
-            } else {
-              result.image_ = imageBuilder_.build();
-            }
-            result.footer_ = footer_;
             onBuilt();
             return result;
           }
 
+          private void buildPartial0(
+              com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
+                      .BrowseCarouselCardItem
+                  result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+              result.openUriAction_ =
+                  openUriActionBuilder_ == null ? openUriAction_ : openUriActionBuilder_.build();
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+              result.title_ = title_;
+            }
+            if (((from_bitField0_ & 0x00000004) != 0)) {
+              result.description_ = description_;
+            }
+            if (((from_bitField0_ & 0x00000008) != 0)) {
+              result.image_ = imageBuilder_ == null ? image_ : imageBuilder_.build();
+            }
+            if (((from_bitField0_ & 0x00000010) != 0)) {
+              result.footer_ = footer_;
+            }
+          }
+
           @java.lang.Override
           public Builder clone() {
             return super.clone();
@@ -48909,10 +49586,12 @@ public Builder mergeFrom(
             }
             if (!other.getTitle().isEmpty()) {
               title_ = other.title_;
+              bitField0_ |= 0x00000002;
               onChanged();
             }
             if (!other.getDescription().isEmpty()) {
               description_ = other.description_;
+              bitField0_ |= 0x00000004;
               onChanged();
             }
             if (other.hasImage()) {
@@ -48920,6 +49599,7 @@ public Builder mergeFrom(
             }
             if (!other.getFooter().isEmpty()) {
               footer_ = other.footer_;
+              bitField0_ |= 0x00000010;
               onChanged();
             }
             this.mergeUnknownFields(other.getUnknownFields());
@@ -48952,31 +49632,31 @@ public Builder mergeFrom(
                     {
                       input.readMessage(
                           getOpenUriActionFieldBuilder().getBuilder(), extensionRegistry);
-
+                      bitField0_ |= 0x00000001;
                       break;
                     } // case 10
                   case 18:
                     {
                       title_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000002;
                       break;
                     } // case 18
                   case 26:
                     {
                       description_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000004;
                       break;
                     } // case 26
                   case 34:
                     {
                       input.readMessage(getImageFieldBuilder().getBuilder(), extensionRegistry);
-
+                      bitField0_ |= 0x00000008;
                       break;
                     } // case 34
                   case 42:
                     {
                       footer_ = input.readStringRequireUtf8();
-
+                      bitField0_ |= 0x00000010;
                       break;
                     } // case 42
                   default:
@@ -48996,6 +49676,8 @@ public Builder mergeFrom(
             return this;
           }
 
+          private int bitField0_;
+
           private com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
                   .BrowseCarouselCardItem.OpenUrlAction
               openUriAction_;
@@ -49021,7 +49703,7 @@ public Builder mergeFrom(
            * @return Whether the openUriAction field is set.
            */
           public boolean hasOpenUriAction() {
-            return openUriActionBuilder_ != null || openUriAction_ != null;
+            return ((bitField0_ & 0x00000001) != 0);
           }
           /**
            *
@@ -49068,11 +49750,11 @@ public Builder setOpenUriAction(
                 throw new NullPointerException();
               }
               openUriAction_ = value;
-              onChanged();
             } else {
               openUriActionBuilder_.setMessage(value);
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
           }
           /**
@@ -49092,11 +49774,11 @@ public Builder setOpenUriAction(
                   builderForValue) {
             if (openUriActionBuilder_ == null) {
               openUriAction_ = builderForValue.build();
-              onChanged();
             } else {
               openUriActionBuilder_.setMessage(builderForValue.build());
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
           }
           /**
@@ -49115,20 +49797,20 @@ public Builder mergeOpenUriAction(
                       .BrowseCarouselCardItem.OpenUrlAction
                   value) {
             if (openUriActionBuilder_ == null) {
-              if (openUriAction_ != null) {
-                openUriAction_ =
-                    com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
-                        .BrowseCarouselCardItem.OpenUrlAction.newBuilder(openUriAction_)
-                        .mergeFrom(value)
-                        .buildPartial();
+              if (((bitField0_ & 0x00000001) != 0)
+                  && openUriAction_ != null
+                  && openUriAction_
+                      != com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
+                          .BrowseCarouselCardItem.OpenUrlAction.getDefaultInstance()) {
+                getOpenUriActionBuilder().mergeFrom(value);
               } else {
                 openUriAction_ = value;
               }
-              onChanged();
             } else {
               openUriActionBuilder_.mergeFrom(value);
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
           }
           /**
@@ -49143,14 +49825,13 @@ public Builder mergeOpenUriAction(
            * </code>
            */
           public Builder clearOpenUriAction() {
-            if (openUriActionBuilder_ == null) {
-              openUriAction_ = null;
-              onChanged();
-            } else {
-              openUriAction_ = null;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            openUriAction_ = null;
+            if (openUriActionBuilder_ != null) {
+              openUriActionBuilder_.dispose();
               openUriActionBuilder_ = null;
             }
-
+            onChanged();
             return this;
           }
           /**
@@ -49167,7 +49848,7 @@ public Builder clearOpenUriAction() {
           public com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
                   .BrowseCarouselCardItem.OpenUrlAction.Builder
               getOpenUriActionBuilder() {
-
+            bitField0_ |= 0x00000001;
             onChanged();
             return getOpenUriActionFieldBuilder().getBuilder();
           }
@@ -49289,8 +49970,8 @@ public Builder setTitle(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             title_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -49306,8 +49987,8 @@ public Builder setTitle(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearTitle() {
-
             title_ = getDefaultInstance().getTitle();
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
             return this;
           }
@@ -49328,8 +50009,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             title_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
           }
@@ -49398,8 +50079,8 @@ public Builder setDescription(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             description_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
           }
@@ -49416,8 +50097,8 @@ public Builder setDescription(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearDescription() {
-
             description_ = getDefaultInstance().getDescription();
+            bitField0_ = (bitField0_ & ~0x00000004);
             onChanged();
             return this;
           }
@@ -49439,8 +50120,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             description_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
           }
@@ -49463,7 +50144,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
            * @return Whether the image field is set.
            */
           public boolean hasImage() {
-            return imageBuilder_ != null || image_ != null;
+            return ((bitField0_ & 0x00000008) != 0);
           }
           /**
            *
@@ -49500,11 +50181,11 @@ public Builder setImage(com.google.cloud.dialogflow.v2beta1.Intent.Message.Image
                 throw new NullPointerException();
               }
               image_ = value;
-              onChanged();
             } else {
               imageBuilder_.setMessage(value);
             }
-
+            bitField0_ |= 0x00000008;
+            onChanged();
             return this;
           }
           /**
@@ -49520,11 +50201,11 @@ public Builder setImage(
               com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.Builder builderForValue) {
             if (imageBuilder_ == null) {
               image_ = builderForValue.build();
-              onChanged();
             } else {
               imageBuilder_.setMessage(builderForValue.build());
             }
-
+            bitField0_ |= 0x00000008;
+            onChanged();
             return this;
           }
           /**
@@ -49539,19 +50220,20 @@ public Builder setImage(
           public Builder mergeImage(
               com.google.cloud.dialogflow.v2beta1.Intent.Message.Image value) {
             if (imageBuilder_ == null) {
-              if (image_ != null) {
-                image_ =
-                    com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.newBuilder(image_)
-                        .mergeFrom(value)
-                        .buildPartial();
+              if (((bitField0_ & 0x00000008) != 0)
+                  && image_ != null
+                  && image_
+                      != com.google.cloud.dialogflow.v2beta1.Intent.Message.Image
+                          .getDefaultInstance()) {
+                getImageBuilder().mergeFrom(value);
               } else {
                 image_ = value;
               }
-              onChanged();
             } else {
               imageBuilder_.mergeFrom(value);
             }
-
+            bitField0_ |= 0x00000008;
+            onChanged();
             return this;
           }
           /**
@@ -49564,14 +50246,13 @@ public Builder mergeImage(
            * <code>.google.cloud.dialogflow.v2beta1.Intent.Message.Image image = 4;</code>
            */
           public Builder clearImage() {
-            if (imageBuilder_ == null) {
-              image_ = null;
-              onChanged();
-            } else {
-              image_ = null;
+            bitField0_ = (bitField0_ & ~0x00000008);
+            image_ = null;
+            if (imageBuilder_ != null) {
+              imageBuilder_.dispose();
               imageBuilder_ = null;
             }
-
+            onChanged();
             return this;
           }
           /**
@@ -49585,7 +50266,7 @@ public Builder clearImage() {
            */
           public com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.Builder
               getImageBuilder() {
-
+            bitField0_ |= 0x00000008;
             onChanged();
             return getImageFieldBuilder().getBuilder();
           }
@@ -49698,8 +50379,8 @@ public Builder setFooter(java.lang.String value) {
             if (value == null) {
               throw new NullPointerException();
             }
-
             footer_ = value;
+            bitField0_ |= 0x00000010;
             onChanged();
             return this;
           }
@@ -49716,8 +50397,8 @@ public Builder setFooter(java.lang.String value) {
            * @return This builder for chaining.
            */
           public Builder clearFooter() {
-
             footer_ = getDefaultInstance().getFooter();
+            bitField0_ = (bitField0_ & ~0x00000010);
             onChanged();
             return this;
           }
@@ -49739,8 +50420,8 @@ public Builder setFooterBytes(com.google.protobuf.ByteString value) {
               throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             footer_ = value;
+            bitField0_ |= 0x00000010;
             onChanged();
             return this;
           }
@@ -49818,6 +50499,8 @@ public com.google.protobuf.Parser<BrowseCarouselCardItem> getParserForType() {
       }
 
       public static final int ITEMS_FIELD_NUMBER = 1;
+
+      @SuppressWarnings("serial")
       private java.util.List<
               com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
                   .BrowseCarouselCardItem>
@@ -49915,7 +50598,7 @@ public int getItemsCount() {
       }
 
       public static final int IMAGE_DISPLAY_OPTIONS_FIELD_NUMBER = 2;
-      private int imageDisplayOptions_;
+      private int imageDisplayOptions_ = 0;
       /**
        *
        *
@@ -49952,11 +50635,10 @@ public int getImageDisplayOptionsValue() {
       public com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
               .ImageDisplayOptions
           getImageDisplayOptions() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard.ImageDisplayOptions
             result =
                 com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
-                    .ImageDisplayOptions.valueOf(imageDisplayOptions_);
+                    .ImageDisplayOptions.forNumber(imageDisplayOptions_);
         return result == null
             ? com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
                 .ImageDisplayOptions.UNRECOGNIZED
@@ -50186,6 +50868,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           if (itemsBuilder_ == null) {
             items_ = java.util.Collections.emptyList();
           } else {
@@ -50194,7 +50877,6 @@ public Builder clear() {
           }
           bitField0_ = (bitField0_ & ~0x00000001);
           imageDisplayOptions_ = 0;
-
           return this;
         }
 
@@ -50226,7 +50908,16 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard bui
             buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard(this);
-          int from_bitField0_ = bitField0_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard result) {
           if (itemsBuilder_ == null) {
             if (((bitField0_ & 0x00000001) != 0)) {
               items_ = java.util.Collections.unmodifiableList(items_);
@@ -50236,9 +50927,14 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard bui
           } else {
             result.items_ = itemsBuilder_.build();
           }
-          result.imageDisplayOptions_ = imageDisplayOptions_;
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.imageDisplayOptions_ = imageDisplayOptions_;
+          }
         }
 
         @java.lang.Override
@@ -50369,7 +51065,7 @@ public Builder mergeFrom(
                 case 16:
                   {
                     imageDisplayOptions_ = input.readEnum();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 16
                 default:
@@ -50890,8 +51586,8 @@ public int getImageDisplayOptionsValue() {
          * @return This builder for chaining.
          */
         public Builder setImageDisplayOptionsValue(int value) {
-
           imageDisplayOptions_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -50913,11 +51609,10 @@ public Builder setImageDisplayOptionsValue(int value) {
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
                 .ImageDisplayOptions
             getImageDisplayOptions() {
-          @SuppressWarnings("deprecation")
           com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard.ImageDisplayOptions
               result =
                   com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
-                      .ImageDisplayOptions.valueOf(imageDisplayOptions_);
+                      .ImageDisplayOptions.forNumber(imageDisplayOptions_);
           return result == null
               ? com.google.cloud.dialogflow.v2beta1.Intent.Message.BrowseCarouselCard
                   .ImageDisplayOptions.UNRECOGNIZED
@@ -50945,7 +51640,7 @@ public Builder setImageDisplayOptions(
           if (value == null) {
             throw new NullPointerException();
           }
-
+          bitField0_ |= 0x00000002;
           imageDisplayOptions_ = value.getNumber();
           onChanged();
           return this;
@@ -50965,7 +51660,7 @@ public Builder setImageDisplayOptions(
          * @return This builder for chaining.
          */
         public Builder clearImageDisplayOptions() {
-
+          bitField0_ = (bitField0_ & ~0x00000002);
           imageDisplayOptions_ = 0;
           onChanged();
           return this;
@@ -51375,7 +52070,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int TITLE_FIELD_NUMBER = 1;
-      private volatile java.lang.Object title_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object title_ = "";
       /**
        *
        *
@@ -51424,7 +52121,9 @@ public com.google.protobuf.ByteString getTitleBytes() {
       }
 
       public static final int SUBTITLE_FIELD_NUMBER = 2;
-      private volatile java.lang.Object subtitle_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object subtitle_ = "";
       /**
        *
        *
@@ -51517,10 +52216,14 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Image getImage() {
        */
       @java.lang.Override
       public com.google.cloud.dialogflow.v2beta1.Intent.Message.ImageOrBuilder getImageOrBuilder() {
-        return getImage();
+        return image_ == null
+            ? com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.getDefaultInstance()
+            : image_;
       }
 
       public static final int COLUMN_PROPERTIES_FIELD_NUMBER = 4;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent.Message.ColumnProperties>
           columnProperties_;
       /**
@@ -51606,6 +52309,8 @@ public int getColumnPropertiesCount() {
       }
 
       public static final int ROWS_FIELD_NUMBER = 5;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCardRow> rows_;
       /**
        *
@@ -51683,6 +52388,8 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCardRow getRows(i
       }
 
       public static final int BUTTONS_FIELD_NUMBER = 6;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button>
           buttons_;
       /**
@@ -52024,14 +52731,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           title_ = "";
-
           subtitle_ = "";
-
-          if (imageBuilder_ == null) {
-            image_ = null;
-          } else {
-            image_ = null;
+          image_ = null;
+          if (imageBuilder_ != null) {
+            imageBuilder_.dispose();
             imageBuilder_ = null;
           }
           if (columnPropertiesBuilder_ == null) {
@@ -52040,21 +52745,21 @@ public Builder clear() {
             columnProperties_ = null;
             columnPropertiesBuilder_.clear();
           }
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000008);
           if (rowsBuilder_ == null) {
             rows_ = java.util.Collections.emptyList();
           } else {
             rows_ = null;
             rowsBuilder_.clear();
           }
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000010);
           if (buttonsBuilder_ == null) {
             buttons_ = java.util.Collections.emptyList();
           } else {
             buttons_ = null;
             buttonsBuilder_.clear();
           }
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000020);
           return this;
         }
 
@@ -52083,43 +52788,57 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCard build() {
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCard buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCard result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCard(this);
-          int from_bitField0_ = bitField0_;
-          result.title_ = title_;
-          result.subtitle_ = subtitle_;
-          if (imageBuilder_ == null) {
-            result.image_ = image_;
-          } else {
-            result.image_ = imageBuilder_.build();
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
           }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCard result) {
           if (columnPropertiesBuilder_ == null) {
-            if (((bitField0_ & 0x00000001) != 0)) {
+            if (((bitField0_ & 0x00000008) != 0)) {
               columnProperties_ = java.util.Collections.unmodifiableList(columnProperties_);
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000008);
             }
             result.columnProperties_ = columnProperties_;
           } else {
             result.columnProperties_ = columnPropertiesBuilder_.build();
           }
           if (rowsBuilder_ == null) {
-            if (((bitField0_ & 0x00000002) != 0)) {
+            if (((bitField0_ & 0x00000010) != 0)) {
               rows_ = java.util.Collections.unmodifiableList(rows_);
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000010);
             }
             result.rows_ = rows_;
           } else {
             result.rows_ = rowsBuilder_.build();
           }
           if (buttonsBuilder_ == null) {
-            if (((bitField0_ & 0x00000004) != 0)) {
+            if (((bitField0_ & 0x00000020) != 0)) {
               buttons_ = java.util.Collections.unmodifiableList(buttons_);
-              bitField0_ = (bitField0_ & ~0x00000004);
+              bitField0_ = (bitField0_ & ~0x00000020);
             }
             result.buttons_ = buttons_;
           } else {
             result.buttons_ = buttonsBuilder_.build();
           }
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCard result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.title_ = title_;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.subtitle_ = subtitle_;
+          }
+          if (((from_bitField0_ & 0x00000004) != 0)) {
+            result.image_ = imageBuilder_ == null ? image_ : imageBuilder_.build();
+          }
         }
 
         @java.lang.Override
@@ -52174,10 +52893,12 @@ public Builder mergeFrom(
             return this;
           if (!other.getTitle().isEmpty()) {
             title_ = other.title_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (!other.getSubtitle().isEmpty()) {
             subtitle_ = other.subtitle_;
+            bitField0_ |= 0x00000002;
             onChanged();
           }
           if (other.hasImage()) {
@@ -52187,7 +52908,7 @@ public Builder mergeFrom(
             if (!other.columnProperties_.isEmpty()) {
               if (columnProperties_.isEmpty()) {
                 columnProperties_ = other.columnProperties_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000008);
               } else {
                 ensureColumnPropertiesIsMutable();
                 columnProperties_.addAll(other.columnProperties_);
@@ -52200,7 +52921,7 @@ public Builder mergeFrom(
                 columnPropertiesBuilder_.dispose();
                 columnPropertiesBuilder_ = null;
                 columnProperties_ = other.columnProperties_;
-                bitField0_ = (bitField0_ & ~0x00000001);
+                bitField0_ = (bitField0_ & ~0x00000008);
                 columnPropertiesBuilder_ =
                     com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                         ? getColumnPropertiesFieldBuilder()
@@ -52214,7 +52935,7 @@ public Builder mergeFrom(
             if (!other.rows_.isEmpty()) {
               if (rows_.isEmpty()) {
                 rows_ = other.rows_;
-                bitField0_ = (bitField0_ & ~0x00000002);
+                bitField0_ = (bitField0_ & ~0x00000010);
               } else {
                 ensureRowsIsMutable();
                 rows_.addAll(other.rows_);
@@ -52227,7 +52948,7 @@ public Builder mergeFrom(
                 rowsBuilder_.dispose();
                 rowsBuilder_ = null;
                 rows_ = other.rows_;
-                bitField0_ = (bitField0_ & ~0x00000002);
+                bitField0_ = (bitField0_ & ~0x00000010);
                 rowsBuilder_ =
                     com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                         ? getRowsFieldBuilder()
@@ -52241,7 +52962,7 @@ public Builder mergeFrom(
             if (!other.buttons_.isEmpty()) {
               if (buttons_.isEmpty()) {
                 buttons_ = other.buttons_;
-                bitField0_ = (bitField0_ & ~0x00000004);
+                bitField0_ = (bitField0_ & ~0x00000020);
               } else {
                 ensureButtonsIsMutable();
                 buttons_.addAll(other.buttons_);
@@ -52254,7 +52975,7 @@ public Builder mergeFrom(
                 buttonsBuilder_.dispose();
                 buttonsBuilder_ = null;
                 buttons_ = other.buttons_;
-                bitField0_ = (bitField0_ & ~0x00000004);
+                bitField0_ = (bitField0_ & ~0x00000020);
                 buttonsBuilder_ =
                     com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                         ? getButtonsFieldBuilder()
@@ -52293,19 +53014,19 @@ public Builder mergeFrom(
                 case 10:
                   {
                     title_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 18:
                   {
                     subtitle_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 18
                 case 26:
                   {
                     input.readMessage(getImageFieldBuilder().getBuilder(), extensionRegistry);
-
+                    bitField0_ |= 0x00000004;
                     break;
                   } // case 26
                 case 34:
@@ -52433,8 +53154,8 @@ public Builder setTitle(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -52450,8 +53171,8 @@ public Builder setTitle(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearTitle() {
-
           title_ = getDefaultInstance().getTitle();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -52472,8 +53193,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           title_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -52539,8 +53260,8 @@ public Builder setSubtitle(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           subtitle_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -52556,8 +53277,8 @@ public Builder setSubtitle(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearSubtitle() {
-
           subtitle_ = getDefaultInstance().getSubtitle();
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -52578,8 +53299,8 @@ public Builder setSubtitleBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           subtitle_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -52602,7 +53323,7 @@ public Builder setSubtitleBytes(com.google.protobuf.ByteString value) {
          * @return Whether the image field is set.
          */
         public boolean hasImage() {
-          return imageBuilder_ != null || image_ != null;
+          return ((bitField0_ & 0x00000004) != 0);
         }
         /**
          *
@@ -52639,11 +53360,11 @@ public Builder setImage(com.google.cloud.dialogflow.v2beta1.Intent.Message.Image
               throw new NullPointerException();
             }
             image_ = value;
-            onChanged();
           } else {
             imageBuilder_.setMessage(value);
           }
-
+          bitField0_ |= 0x00000004;
+          onChanged();
           return this;
         }
         /**
@@ -52659,11 +53380,11 @@ public Builder setImage(
             com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.Builder builderForValue) {
           if (imageBuilder_ == null) {
             image_ = builderForValue.build();
-            onChanged();
           } else {
             imageBuilder_.setMessage(builderForValue.build());
           }
-
+          bitField0_ |= 0x00000004;
+          onChanged();
           return this;
         }
         /**
@@ -52677,19 +53398,20 @@ public Builder setImage(
          */
         public Builder mergeImage(com.google.cloud.dialogflow.v2beta1.Intent.Message.Image value) {
           if (imageBuilder_ == null) {
-            if (image_ != null) {
-              image_ =
-                  com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.newBuilder(image_)
-                      .mergeFrom(value)
-                      .buildPartial();
+            if (((bitField0_ & 0x00000004) != 0)
+                && image_ != null
+                && image_
+                    != com.google.cloud.dialogflow.v2beta1.Intent.Message.Image
+                        .getDefaultInstance()) {
+              getImageBuilder().mergeFrom(value);
             } else {
               image_ = value;
             }
-            onChanged();
           } else {
             imageBuilder_.mergeFrom(value);
           }
-
+          bitField0_ |= 0x00000004;
+          onChanged();
           return this;
         }
         /**
@@ -52702,14 +53424,13 @@ public Builder mergeImage(com.google.cloud.dialogflow.v2beta1.Intent.Message.Ima
          * <code>.google.cloud.dialogflow.v2beta1.Intent.Message.Image image = 3;</code>
          */
         public Builder clearImage() {
-          if (imageBuilder_ == null) {
-            image_ = null;
-            onChanged();
-          } else {
-            image_ = null;
+          bitField0_ = (bitField0_ & ~0x00000004);
+          image_ = null;
+          if (imageBuilder_ != null) {
+            imageBuilder_.dispose();
             imageBuilder_ = null;
           }
-
+          onChanged();
           return this;
         }
         /**
@@ -52722,7 +53443,7 @@ public Builder clearImage() {
          * <code>.google.cloud.dialogflow.v2beta1.Intent.Message.Image image = 3;</code>
          */
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.Builder getImageBuilder() {
-
+          bitField0_ |= 0x00000004;
           onChanged();
           return getImageFieldBuilder().getBuilder();
         }
@@ -52775,12 +53496,12 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.Builder getImage
             columnProperties_ = java.util.Collections.emptyList();
 
         private void ensureColumnPropertiesIsMutable() {
-          if (!((bitField0_ & 0x00000001) != 0)) {
+          if (!((bitField0_ & 0x00000008) != 0)) {
             columnProperties_ =
                 new java.util.ArrayList<
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.ColumnProperties>(
                     columnProperties_);
-            bitField0_ |= 0x00000001;
+            bitField0_ |= 0x00000008;
           }
         }
 
@@ -53030,7 +53751,7 @@ public Builder addAllColumnProperties(
         public Builder clearColumnProperties() {
           if (columnPropertiesBuilder_ == null) {
             columnProperties_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000008);
             onChanged();
           } else {
             columnPropertiesBuilder_.clear();
@@ -53179,7 +53900,7 @@ public Builder removeColumnProperties(int index) {
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.ColumnProperties.Builder,
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.ColumnPropertiesOrBuilder>(
                     columnProperties_,
-                    ((bitField0_ & 0x00000001) != 0),
+                    ((bitField0_ & 0x00000008) != 0),
                     getParentForChildren(),
                     isClean());
             columnProperties_ = null;
@@ -53191,11 +53912,11 @@ public Builder removeColumnProperties(int index) {
             rows_ = java.util.Collections.emptyList();
 
         private void ensureRowsIsMutable() {
-          if (!((bitField0_ & 0x00000002) != 0)) {
+          if (!((bitField0_ & 0x00000010) != 0)) {
             rows_ =
                 new java.util.ArrayList<
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCardRow>(rows_);
-            bitField0_ |= 0x00000002;
+            bitField0_ |= 0x00000010;
           }
         }
 
@@ -53433,7 +54154,7 @@ public Builder addAllRows(
         public Builder clearRows() {
           if (rowsBuilder_ == null) {
             rows_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000010);
             onChanged();
           } else {
             rowsBuilder_.clear();
@@ -53573,7 +54294,7 @@ public Builder removeRows(int index) {
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCardRow,
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCardRow.Builder,
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCardRowOrBuilder>(
-                    rows_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                    rows_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
             rows_ = null;
           }
           return rowsBuilder_;
@@ -53583,11 +54304,11 @@ public Builder removeRows(int index) {
             buttons_ = java.util.Collections.emptyList();
 
         private void ensureButtonsIsMutable() {
-          if (!((bitField0_ & 0x00000004) != 0)) {
+          if (!((bitField0_ & 0x00000020) != 0)) {
             buttons_ =
                 new java.util.ArrayList<
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button>(buttons_);
-            bitField0_ |= 0x00000004;
+            bitField0_ |= 0x00000020;
           }
         }
 
@@ -53837,7 +54558,7 @@ public Builder addAllButtons(
         public Builder clearButtons() {
           if (buttonsBuilder_ == null) {
             buttons_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000020);
             onChanged();
           } else {
             buttonsBuilder_.clear();
@@ -53985,7 +54706,7 @@ public Builder removeButtons(int index) {
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button,
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button.Builder,
                     com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.ButtonOrBuilder>(
-                    buttons_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
+                    buttons_, ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean());
             buttons_ = null;
           }
           return buttonsBuilder_;
@@ -54355,7 +55076,9 @@ private HorizontalAlignment(int value) {
       }
 
       public static final int HEADER_FIELD_NUMBER = 1;
-      private volatile java.lang.Object header_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object header_ = "";
       /**
        *
        *
@@ -54404,7 +55127,7 @@ public com.google.protobuf.ByteString getHeaderBytes() {
       }
 
       public static final int HORIZONTAL_ALIGNMENT_FIELD_NUMBER = 2;
-      private int horizontalAlignment_;
+      private int horizontalAlignment_ = 0;
       /**
        *
        *
@@ -54438,11 +55161,10 @@ public int getHorizontalAlignmentValue() {
       @java.lang.Override
       public com.google.cloud.dialogflow.v2beta1.Intent.Message.ColumnProperties.HorizontalAlignment
           getHorizontalAlignment() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.dialogflow.v2beta1.Intent.Message.ColumnProperties.HorizontalAlignment
             result =
                 com.google.cloud.dialogflow.v2beta1.Intent.Message.ColumnProperties
-                    .HorizontalAlignment.valueOf(horizontalAlignment_);
+                    .HorizontalAlignment.forNumber(horizontalAlignment_);
         return result == null
             ? com.google.cloud.dialogflow.v2beta1.Intent.Message.ColumnProperties
                 .HorizontalAlignment.UNRECOGNIZED
@@ -54668,10 +55390,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           header_ = "";
-
           horizontalAlignment_ = 0;
-
           return this;
         }
 
@@ -54702,12 +55423,24 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.ColumnProperties build
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.ColumnProperties buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.ColumnProperties result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.ColumnProperties(this);
-          result.header_ = header_;
-          result.horizontalAlignment_ = horizontalAlignment_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.ColumnProperties result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.header_ = header_;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.horizontalAlignment_ = horizontalAlignment_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -54762,6 +55495,7 @@ public Builder mergeFrom(
                   .getDefaultInstance()) return this;
           if (!other.getHeader().isEmpty()) {
             header_ = other.header_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (other.horizontalAlignment_ != 0) {
@@ -54796,13 +55530,13 @@ public Builder mergeFrom(
                 case 10:
                   {
                     header_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 case 16:
                   {
                     horizontalAlignment_ = input.readEnum();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 16
                 default:
@@ -54822,6 +55556,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object header_ = "";
         /**
          *
@@ -54883,8 +55619,8 @@ public Builder setHeader(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           header_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -54900,8 +55636,8 @@ public Builder setHeader(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearHeader() {
-
           header_ = getDefaultInstance().getHeader();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -54922,8 +55658,8 @@ public Builder setHeaderBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           header_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -54961,8 +55697,8 @@ public int getHorizontalAlignmentValue() {
          * @return This builder for chaining.
          */
         public Builder setHorizontalAlignmentValue(int value) {
-
           horizontalAlignment_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -54983,11 +55719,10 @@ public Builder setHorizontalAlignmentValue(int value) {
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.ColumnProperties
                 .HorizontalAlignment
             getHorizontalAlignment() {
-          @SuppressWarnings("deprecation")
           com.google.cloud.dialogflow.v2beta1.Intent.Message.ColumnProperties.HorizontalAlignment
               result =
                   com.google.cloud.dialogflow.v2beta1.Intent.Message.ColumnProperties
-                      .HorizontalAlignment.valueOf(horizontalAlignment_);
+                      .HorizontalAlignment.forNumber(horizontalAlignment_);
           return result == null
               ? com.google.cloud.dialogflow.v2beta1.Intent.Message.ColumnProperties
                   .HorizontalAlignment.UNRECOGNIZED
@@ -55013,7 +55748,7 @@ public Builder setHorizontalAlignment(
           if (value == null) {
             throw new NullPointerException();
           }
-
+          bitField0_ |= 0x00000002;
           horizontalAlignment_ = value.getNumber();
           onChanged();
           return this;
@@ -55032,7 +55767,7 @@ public Builder setHorizontalAlignment(
          * @return This builder for chaining.
          */
         public Builder clearHorizontalAlignment() {
-
+          bitField0_ = (bitField0_ & ~0x00000002);
           horizontalAlignment_ = 0;
           onChanged();
           return this;
@@ -55234,6 +55969,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int CELLS_FIELD_NUMBER = 1;
+
+      @SuppressWarnings("serial")
       private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCardCell>
           cells_;
       /**
@@ -55312,7 +56049,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCardCell getCells
       }
 
       public static final int DIVIDER_AFTER_FIELD_NUMBER = 2;
-      private boolean dividerAfter_;
+      private boolean dividerAfter_ = false;
       /**
        *
        *
@@ -55543,6 +56280,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           if (cellsBuilder_ == null) {
             cells_ = java.util.Collections.emptyList();
           } else {
@@ -55551,7 +56289,6 @@ public Builder clear() {
           }
           bitField0_ = (bitField0_ & ~0x00000001);
           dividerAfter_ = false;
-
           return this;
         }
 
@@ -55581,7 +56318,16 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCardRow build() {
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCardRow buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCardRow result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCardRow(this);
-          int from_bitField0_ = bitField0_;
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCardRow result) {
           if (cellsBuilder_ == null) {
             if (((bitField0_ & 0x00000001) != 0)) {
               cells_ = java.util.Collections.unmodifiableList(cells_);
@@ -55591,9 +56337,14 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCardRow buildPart
           } else {
             result.cells_ = cellsBuilder_.build();
           }
-          result.dividerAfter_ = dividerAfter_;
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCardRow result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.dividerAfter_ = dividerAfter_;
+          }
         }
 
         @java.lang.Override
@@ -55721,7 +56472,7 @@ public Builder mergeFrom(
                 case 16:
                   {
                     dividerAfter_ = input.readBool();
-
+                    bitField0_ |= 0x00000002;
                     break;
                   } // case 16
                 default:
@@ -56167,6 +56918,7 @@ public boolean getDividerAfter() {
         public Builder setDividerAfter(boolean value) {
 
           dividerAfter_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -56182,7 +56934,7 @@ public Builder setDividerAfter(boolean value) {
          * @return This builder for chaining.
          */
         public Builder clearDividerAfter() {
-
+          bitField0_ = (bitField0_ & ~0x00000002);
           dividerAfter_ = false;
           onChanged();
           return this;
@@ -56335,7 +57087,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int TEXT_FIELD_NUMBER = 1;
-      private volatile java.lang.Object text_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object text_ = "";
       /**
        *
        *
@@ -56586,8 +57340,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           text_ = "";
-
           return this;
         }
 
@@ -56617,11 +57371,21 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCardCell build()
         public com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCardCell buildPartial() {
           com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCardCell result =
               new com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCardCell(this);
-          result.text_ = text_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.TableCardCell result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.text_ = text_;
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -56675,6 +57439,7 @@ public Builder mergeFrom(
                   .getDefaultInstance()) return this;
           if (!other.getText().isEmpty()) {
             text_ = other.text_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           this.mergeUnknownFields(other.getUnknownFields());
@@ -56706,7 +57471,7 @@ public Builder mergeFrom(
                 case 10:
                   {
                     text_ = input.readStringRequireUtf8();
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 default:
@@ -56726,6 +57491,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object text_ = "";
         /**
          *
@@ -56787,8 +57554,8 @@ public Builder setText(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-
           text_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -56804,8 +57571,8 @@ public Builder setText(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearText() {
-
           text_ = getDefaultInstance().getText();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -56826,8 +57593,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
-
           text_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -58116,7 +58883,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.MediaContent getMediaC
     }
 
     public static final int PLATFORM_FIELD_NUMBER = 6;
-    private int platform_;
+    private int platform_ = 0;
     /**
      *
      *
@@ -58149,9 +58916,8 @@ public int getPlatformValue() {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.Intent.Message.Platform getPlatform() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.Intent.Message.Platform result =
-          com.google.cloud.dialogflow.v2beta1.Intent.Message.Platform.valueOf(platform_);
+          com.google.cloud.dialogflow.v2beta1.Intent.Message.Platform.forNumber(platform_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.Intent.Message.Platform.UNRECOGNIZED
           : result;
@@ -58697,6 +59463,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (textBuilder_ != null) {
           textBuilder_.clear();
         }
@@ -58758,7 +59525,6 @@ public Builder clear() {
           mediaContentBuilder_.clear();
         }
         platform_ = 0;
-
         messageCase_ = 0;
         message_ = null;
         return this;
@@ -58788,150 +59554,84 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message build() {
       public com.google.cloud.dialogflow.v2beta1.Intent.Message buildPartial() {
         com.google.cloud.dialogflow.v2beta1.Intent.Message result =
             new com.google.cloud.dialogflow.v2beta1.Intent.Message(this);
-        if (messageCase_ == 1) {
-          if (textBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = textBuilder_.build();
-          }
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
-        if (messageCase_ == 2) {
-          if (imageBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = imageBuilder_.build();
-          }
+        buildPartialOneofs(result);
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(com.google.cloud.dialogflow.v2beta1.Intent.Message result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00100000) != 0)) {
+          result.platform_ = platform_;
         }
-        if (messageCase_ == 3) {
-          if (quickRepliesBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = quickRepliesBuilder_.build();
-          }
+      }
+
+      private void buildPartialOneofs(com.google.cloud.dialogflow.v2beta1.Intent.Message result) {
+        result.messageCase_ = messageCase_;
+        result.message_ = this.message_;
+        if (messageCase_ == 1 && textBuilder_ != null) {
+          result.message_ = textBuilder_.build();
         }
-        if (messageCase_ == 4) {
-          if (cardBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = cardBuilder_.build();
-          }
+        if (messageCase_ == 2 && imageBuilder_ != null) {
+          result.message_ = imageBuilder_.build();
         }
-        if (messageCase_ == 5) {
-          if (payloadBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = payloadBuilder_.build();
-          }
+        if (messageCase_ == 3 && quickRepliesBuilder_ != null) {
+          result.message_ = quickRepliesBuilder_.build();
         }
-        if (messageCase_ == 7) {
-          if (simpleResponsesBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = simpleResponsesBuilder_.build();
-          }
+        if (messageCase_ == 4 && cardBuilder_ != null) {
+          result.message_ = cardBuilder_.build();
         }
-        if (messageCase_ == 8) {
-          if (basicCardBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = basicCardBuilder_.build();
-          }
+        if (messageCase_ == 5 && payloadBuilder_ != null) {
+          result.message_ = payloadBuilder_.build();
         }
-        if (messageCase_ == 9) {
-          if (suggestionsBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = suggestionsBuilder_.build();
-          }
+        if (messageCase_ == 7 && simpleResponsesBuilder_ != null) {
+          result.message_ = simpleResponsesBuilder_.build();
         }
-        if (messageCase_ == 10) {
-          if (linkOutSuggestionBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = linkOutSuggestionBuilder_.build();
-          }
+        if (messageCase_ == 8 && basicCardBuilder_ != null) {
+          result.message_ = basicCardBuilder_.build();
         }
-        if (messageCase_ == 11) {
-          if (listSelectBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = listSelectBuilder_.build();
-          }
+        if (messageCase_ == 9 && suggestionsBuilder_ != null) {
+          result.message_ = suggestionsBuilder_.build();
         }
-        if (messageCase_ == 12) {
-          if (carouselSelectBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = carouselSelectBuilder_.build();
-          }
+        if (messageCase_ == 10 && linkOutSuggestionBuilder_ != null) {
+          result.message_ = linkOutSuggestionBuilder_.build();
         }
-        if (messageCase_ == 13) {
-          if (telephonyPlayAudioBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = telephonyPlayAudioBuilder_.build();
-          }
+        if (messageCase_ == 11 && listSelectBuilder_ != null) {
+          result.message_ = listSelectBuilder_.build();
         }
-        if (messageCase_ == 14) {
-          if (telephonySynthesizeSpeechBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = telephonySynthesizeSpeechBuilder_.build();
-          }
+        if (messageCase_ == 12 && carouselSelectBuilder_ != null) {
+          result.message_ = carouselSelectBuilder_.build();
         }
-        if (messageCase_ == 15) {
-          if (telephonyTransferCallBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = telephonyTransferCallBuilder_.build();
-          }
+        if (messageCase_ == 13 && telephonyPlayAudioBuilder_ != null) {
+          result.message_ = telephonyPlayAudioBuilder_.build();
         }
-        if (messageCase_ == 18) {
-          if (rbmTextBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = rbmTextBuilder_.build();
-          }
+        if (messageCase_ == 14 && telephonySynthesizeSpeechBuilder_ != null) {
+          result.message_ = telephonySynthesizeSpeechBuilder_.build();
         }
-        if (messageCase_ == 19) {
-          if (rbmStandaloneRichCardBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = rbmStandaloneRichCardBuilder_.build();
-          }
+        if (messageCase_ == 15 && telephonyTransferCallBuilder_ != null) {
+          result.message_ = telephonyTransferCallBuilder_.build();
         }
-        if (messageCase_ == 20) {
-          if (rbmCarouselRichCardBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = rbmCarouselRichCardBuilder_.build();
-          }
+        if (messageCase_ == 18 && rbmTextBuilder_ != null) {
+          result.message_ = rbmTextBuilder_.build();
         }
-        if (messageCase_ == 22) {
-          if (browseCarouselCardBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = browseCarouselCardBuilder_.build();
-          }
+        if (messageCase_ == 19 && rbmStandaloneRichCardBuilder_ != null) {
+          result.message_ = rbmStandaloneRichCardBuilder_.build();
         }
-        if (messageCase_ == 23) {
-          if (tableCardBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = tableCardBuilder_.build();
-          }
+        if (messageCase_ == 20 && rbmCarouselRichCardBuilder_ != null) {
+          result.message_ = rbmCarouselRichCardBuilder_.build();
         }
-        if (messageCase_ == 24) {
-          if (mediaContentBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = mediaContentBuilder_.build();
-          }
+        if (messageCase_ == 22 && browseCarouselCardBuilder_ != null) {
+          result.message_ = browseCarouselCardBuilder_.build();
+        }
+        if (messageCase_ == 23 && tableCardBuilder_ != null) {
+          result.message_ = tableCardBuilder_.build();
+        }
+        if (messageCase_ == 24 && mediaContentBuilder_ != null) {
+          result.message_ = mediaContentBuilder_.build();
         }
-        result.platform_ = platform_;
-        result.messageCase_ = messageCase_;
-        onBuilt();
-        return result;
       }
 
       @java.lang.Override
@@ -59150,7 +59850,7 @@ public Builder mergeFrom(
               case 48:
                 {
                   platform_ = input.readEnum();
-
+                  bitField0_ |= 0x00100000;
                   break;
                 } // case 48
               case 58:
@@ -59283,6 +59983,8 @@ public Builder clearMessage() {
         return this;
       }
 
+      private int bitField0_;
+
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.cloud.dialogflow.v2beta1.Intent.Message.Text,
               com.google.cloud.dialogflow.v2beta1.Intent.Message.Text.Builder,
@@ -59490,7 +60192,6 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.TextOrBuilder getTextO
         }
         messageCase_ = 1;
         onChanged();
-        ;
         return textBuilder_;
       }
 
@@ -59703,7 +60404,6 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.ImageOrBuilder getImag
         }
         messageCase_ = 2;
         onChanged();
-        ;
         return imageBuilder_;
       }
 
@@ -59933,7 +60633,6 @@ public Builder clearQuickReplies() {
         }
         messageCase_ = 3;
         onChanged();
-        ;
         return quickRepliesBuilder_;
       }
 
@@ -60144,7 +60843,6 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.CardOrBuilder getCardO
         }
         messageCase_ = 4;
         onChanged();
-        ;
         return cardBuilder_;
       }
 
@@ -60349,7 +61047,6 @@ public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() {
         }
         messageCase_ = 5;
         onChanged();
-        ;
         return payloadBuilder_;
       }
 
@@ -60582,7 +61279,6 @@ public Builder clearSimpleResponses() {
         }
         messageCase_ = 7;
         onChanged();
-        ;
         return simpleResponsesBuilder_;
       }
 
@@ -60799,7 +61495,6 @@ public Builder clearBasicCard() {
         }
         messageCase_ = 8;
         onChanged();
-        ;
         return basicCardBuilder_;
       }
 
@@ -61019,7 +61714,6 @@ public Builder clearSuggestions() {
         }
         messageCase_ = 9;
         onChanged();
-        ;
         return suggestionsBuilder_;
       }
 
@@ -61261,7 +61955,6 @@ public Builder clearLinkOutSuggestion() {
         }
         messageCase_ = 10;
         onChanged();
-        ;
         return linkOutSuggestionBuilder_;
       }
 
@@ -61478,7 +62171,6 @@ public Builder clearListSelect() {
         }
         messageCase_ = 11;
         onChanged();
-        ;
         return listSelectBuilder_;
       }
 
@@ -61710,7 +62402,6 @@ public Builder clearCarouselSelect() {
         }
         messageCase_ = 12;
         onChanged();
-        ;
         return carouselSelectBuilder_;
       }
 
@@ -61952,7 +62643,6 @@ public Builder clearTelephonyPlayAudio() {
         }
         messageCase_ = 13;
         onChanged();
-        ;
         return telephonyPlayAudioBuilder_;
       }
 
@@ -62201,7 +62891,6 @@ public Builder clearTelephonySynthesizeSpeech() {
         }
         messageCase_ = 14;
         onChanged();
-        ;
         return telephonySynthesizeSpeechBuilder_;
       }
 
@@ -62447,7 +63136,6 @@ public Builder clearTelephonyTransferCall() {
         }
         messageCase_ = 15;
         onChanged();
-        ;
         return telephonyTransferCallBuilder_;
       }
 
@@ -62681,7 +63369,6 @@ public Builder clearRbmText() {
         }
         messageCase_ = 18;
         onChanged();
-        ;
         return rbmTextBuilder_;
       }
 
@@ -62923,7 +63610,6 @@ public Builder clearRbmStandaloneRichCard() {
         }
         messageCase_ = 19;
         onChanged();
-        ;
         return rbmStandaloneRichCardBuilder_;
       }
 
@@ -63165,7 +63851,6 @@ public Builder clearRbmCarouselRichCard() {
         }
         messageCase_ = 20;
         onChanged();
-        ;
         return rbmCarouselRichCardBuilder_;
       }
 
@@ -63407,7 +64092,6 @@ public Builder clearBrowseCarouselCard() {
         }
         messageCase_ = 22;
         onChanged();
-        ;
         return browseCarouselCardBuilder_;
       }
 
@@ -63624,7 +64308,6 @@ public Builder clearTableCard() {
         }
         messageCase_ = 23;
         onChanged();
-        ;
         return tableCardBuilder_;
       }
 
@@ -63854,7 +64537,6 @@ public Builder clearMediaContent() {
         }
         messageCase_ = 24;
         onChanged();
-        ;
         return mediaContentBuilder_;
       }
 
@@ -63891,8 +64573,8 @@ public int getPlatformValue() {
        * @return This builder for chaining.
        */
       public Builder setPlatformValue(int value) {
-
         platform_ = value;
+        bitField0_ |= 0x00100000;
         onChanged();
         return this;
       }
@@ -63911,9 +64593,8 @@ public Builder setPlatformValue(int value) {
        */
       @java.lang.Override
       public com.google.cloud.dialogflow.v2beta1.Intent.Message.Platform getPlatform() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.dialogflow.v2beta1.Intent.Message.Platform result =
-            com.google.cloud.dialogflow.v2beta1.Intent.Message.Platform.valueOf(platform_);
+            com.google.cloud.dialogflow.v2beta1.Intent.Message.Platform.forNumber(platform_);
         return result == null
             ? com.google.cloud.dialogflow.v2beta1.Intent.Message.Platform.UNRECOGNIZED
             : result;
@@ -63937,7 +64618,7 @@ public Builder setPlatform(
         if (value == null) {
           throw new NullPointerException();
         }
-
+        bitField0_ |= 0x00100000;
         platform_ = value.getNumber();
         onChanged();
         return this;
@@ -63956,7 +64637,7 @@ public Builder setPlatform(
        * @return This builder for chaining.
        */
       public Builder clearPlatform() {
-
+        bitField0_ = (bitField0_ & ~0x00100000);
         platform_ = 0;
         onChanged();
         return this;
@@ -64136,7 +64817,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int FOLLOWUP_INTENT_NAME_FIELD_NUMBER = 1;
-    private volatile java.lang.Object followupIntentName_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object followupIntentName_ = "";
     /**
      *
      *
@@ -64187,7 +64870,9 @@ public com.google.protobuf.ByteString getFollowupIntentNameBytes() {
     }
 
     public static final int PARENT_FOLLOWUP_INTENT_NAME_FIELD_NUMBER = 2;
-    private volatile java.lang.Object parentFollowupIntentName_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object parentFollowupIntentName_ = "";
     /**
      *
      *
@@ -64447,10 +65132,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         followupIntentName_ = "";
-
         parentFollowupIntentName_ = "";
-
         return this;
       }
 
@@ -64479,12 +65163,24 @@ public com.google.cloud.dialogflow.v2beta1.Intent.FollowupIntentInfo build() {
       public com.google.cloud.dialogflow.v2beta1.Intent.FollowupIntentInfo buildPartial() {
         com.google.cloud.dialogflow.v2beta1.Intent.FollowupIntentInfo result =
             new com.google.cloud.dialogflow.v2beta1.Intent.FollowupIntentInfo(this);
-        result.followupIntentName_ = followupIntentName_;
-        result.parentFollowupIntentName_ = parentFollowupIntentName_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2beta1.Intent.FollowupIntentInfo result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.followupIntentName_ = followupIntentName_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.parentFollowupIntentName_ = parentFollowupIntentName_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -64537,10 +65233,12 @@ public Builder mergeFrom(
           return this;
         if (!other.getFollowupIntentName().isEmpty()) {
           followupIntentName_ = other.followupIntentName_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getParentFollowupIntentName().isEmpty()) {
           parentFollowupIntentName_ = other.parentFollowupIntentName_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -64572,13 +65270,13 @@ public Builder mergeFrom(
               case 10:
                 {
                   followupIntentName_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
                 {
                   parentFollowupIntentName_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 18
               default:
@@ -64598,6 +65296,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object followupIntentName_ = "";
       /**
        *
@@ -64662,8 +65362,8 @@ public Builder setFollowupIntentName(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         followupIntentName_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -64680,8 +65380,8 @@ public Builder setFollowupIntentName(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearFollowupIntentName() {
-
         followupIntentName_ = getDefaultInstance().getFollowupIntentName();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -64703,8 +65403,8 @@ public Builder setFollowupIntentNameBytes(com.google.protobuf.ByteString value)
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         followupIntentName_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -64773,8 +65473,8 @@ public Builder setParentFollowupIntentName(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         parentFollowupIntentName_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -64791,8 +65491,8 @@ public Builder setParentFollowupIntentName(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearParentFollowupIntentName() {
-
         parentFollowupIntentName_ = getDefaultInstance().getParentFollowupIntentName();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -64814,8 +65514,8 @@ public Builder setParentFollowupIntentNameBytes(com.google.protobuf.ByteString v
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         parentFollowupIntentName_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -64888,7 +65588,9 @@ public com.google.protobuf.Parser<FollowupIntentInfo> getParserForType() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -64947,7 +65649,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
@@ -64996,7 +65700,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
   }
 
   public static final int WEBHOOK_STATE_FIELD_NUMBER = 6;
-  private int webhookState_;
+  private int webhookState_ = 0;
   /**
    *
    *
@@ -65029,16 +65733,15 @@ public int getWebhookStateValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.Intent.WebhookState getWebhookState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.Intent.WebhookState result =
-        com.google.cloud.dialogflow.v2beta1.Intent.WebhookState.valueOf(webhookState_);
+        com.google.cloud.dialogflow.v2beta1.Intent.WebhookState.forNumber(webhookState_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.Intent.WebhookState.UNRECOGNIZED
         : result;
   }
 
   public static final int PRIORITY_FIELD_NUMBER = 3;
-  private int priority_;
+  private int priority_ = 0;
   /**
    *
    *
@@ -65062,7 +65765,7 @@ public int getPriority() {
   }
 
   public static final int IS_FALLBACK_FIELD_NUMBER = 4;
-  private boolean isFallback_;
+  private boolean isFallback_ = false;
   /**
    *
    *
@@ -65080,7 +65783,7 @@ public boolean getIsFallback() {
   }
 
   public static final int ML_ENABLED_FIELD_NUMBER = 5;
-  private boolean mlEnabled_;
+  private boolean mlEnabled_ = false;
   /**
    *
    *
@@ -65111,7 +65814,7 @@ public boolean getMlEnabled() {
   }
 
   public static final int ML_DISABLED_FIELD_NUMBER = 19;
-  private boolean mlDisabled_;
+  private boolean mlDisabled_ = false;
   /**
    *
    *
@@ -65132,7 +65835,7 @@ public boolean getMlDisabled() {
   }
 
   public static final int LIVE_AGENT_HANDOFF_FIELD_NUMBER = 20;
-  private boolean liveAgentHandoff_;
+  private boolean liveAgentHandoff_ = false;
   /**
    *
    *
@@ -65153,7 +65856,7 @@ public boolean getLiveAgentHandoff() {
   }
 
   public static final int END_INTERACTION_FIELD_NUMBER = 21;
-  private boolean endInteraction_;
+  private boolean endInteraction_ = false;
   /**
    *
    *
@@ -65173,6 +65876,8 @@ public boolean getEndInteraction() {
   }
 
   public static final int INPUT_CONTEXT_NAMES_FIELD_NUMBER = 7;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList inputContextNames_;
   /**
    *
@@ -65254,6 +65959,8 @@ public com.google.protobuf.ByteString getInputContextNamesBytes(int index) {
   }
 
   public static final int EVENTS_FIELD_NUMBER = 8;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList events_;
   /**
    *
@@ -65327,6 +66034,8 @@ public com.google.protobuf.ByteString getEventsBytes(int index) {
   }
 
   public static final int TRAINING_PHRASES_FIELD_NUMBER = 9;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase>
       trainingPhrases_;
   /**
@@ -65415,7 +66124,9 @@ public com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase getTrainingPhra
   }
 
   public static final int ACTION_FIELD_NUMBER = 10;
-  private volatile java.lang.Object action_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object action_ = "";
   /**
    *
    *
@@ -65466,6 +66177,8 @@ public com.google.protobuf.ByteString getActionBytes() {
   }
 
   public static final int OUTPUT_CONTEXTS_FIELD_NUMBER = 11;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Context> outputContexts_;
   /**
    *
@@ -65566,7 +66279,7 @@ public com.google.cloud.dialogflow.v2beta1.ContextOrBuilder getOutputContextsOrB
   }
 
   public static final int RESET_CONTEXTS_FIELD_NUMBER = 12;
-  private boolean resetContexts_;
+  private boolean resetContexts_ = false;
   /**
    *
    *
@@ -65585,6 +66298,8 @@ public boolean getResetContexts() {
   }
 
   public static final int PARAMETERS_FIELD_NUMBER = 13;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent.Parameter> parameters_;
   /**
    *
@@ -65665,6 +66380,8 @@ public com.google.cloud.dialogflow.v2beta1.Intent.ParameterOrBuilder getParamete
   }
 
   public static final int MESSAGES_FIELD_NUMBER = 14;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent.Message> messages_;
   /**
    *
@@ -65740,7 +66457,10 @@ public com.google.cloud.dialogflow.v2beta1.Intent.MessageOrBuilder getMessagesOr
   }
 
   public static final int DEFAULT_RESPONSE_PLATFORMS_FIELD_NUMBER = 15;
+
+  @SuppressWarnings("serial")
   private java.util.List<java.lang.Integer> defaultResponsePlatforms_;
+
   private static final com.google.protobuf.Internal.ListAdapter.Converter<
           java.lang.Integer, com.google.cloud.dialogflow.v2beta1.Intent.Message.Platform>
       defaultResponsePlatforms_converter_ =
@@ -65748,9 +66468,8 @@ public com.google.cloud.dialogflow.v2beta1.Intent.MessageOrBuilder getMessagesOr
               java.lang.Integer, com.google.cloud.dialogflow.v2beta1.Intent.Message.Platform>() {
             public com.google.cloud.dialogflow.v2beta1.Intent.Message.Platform convert(
                 java.lang.Integer from) {
-              @SuppressWarnings("deprecation")
               com.google.cloud.dialogflow.v2beta1.Intent.Message.Platform result =
-                  com.google.cloud.dialogflow.v2beta1.Intent.Message.Platform.valueOf(from);
+                  com.google.cloud.dialogflow.v2beta1.Intent.Message.Platform.forNumber(from);
               return result == null
                   ? com.google.cloud.dialogflow.v2beta1.Intent.Message.Platform.UNRECOGNIZED
                   : result;
@@ -65856,7 +66575,9 @@ public int getDefaultResponsePlatformsValue(int index) {
   private int defaultResponsePlatformsMemoizedSerializedSize;
 
   public static final int ROOT_FOLLOWUP_INTENT_NAME_FIELD_NUMBER = 16;
-  private volatile java.lang.Object rootFollowupIntentName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object rootFollowupIntentName_ = "";
   /**
    *
    *
@@ -65913,7 +66634,9 @@ public com.google.protobuf.ByteString getRootFollowupIntentNameBytes() {
   }
 
   public static final int PARENT_FOLLOWUP_INTENT_NAME_FIELD_NUMBER = 17;
-  private volatile java.lang.Object parentFollowupIntentName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parentFollowupIntentName_ = "";
   /**
    *
    *
@@ -65974,6 +66697,8 @@ public com.google.protobuf.ByteString getParentFollowupIntentNameBytes() {
   }
 
   public static final int FOLLOWUP_INTENT_INFO_FIELD_NUMBER = 18;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent.FollowupIntentInfo>
       followupIntentInfo_;
   /**
@@ -66494,73 +67219,61 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       displayName_ = "";
-
       webhookState_ = 0;
-
       priority_ = 0;
-
       isFallback_ = false;
-
       mlEnabled_ = false;
-
       mlDisabled_ = false;
-
       liveAgentHandoff_ = false;
-
       endInteraction_ = false;
-
       inputContextNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000200);
       events_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000400);
       if (trainingPhrasesBuilder_ == null) {
         trainingPhrases_ = java.util.Collections.emptyList();
       } else {
         trainingPhrases_ = null;
         trainingPhrasesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000004);
+      bitField0_ = (bitField0_ & ~0x00000800);
       action_ = "";
-
       if (outputContextsBuilder_ == null) {
         outputContexts_ = java.util.Collections.emptyList();
       } else {
         outputContexts_ = null;
         outputContextsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000008);
+      bitField0_ = (bitField0_ & ~0x00002000);
       resetContexts_ = false;
-
       if (parametersBuilder_ == null) {
         parameters_ = java.util.Collections.emptyList();
       } else {
         parameters_ = null;
         parametersBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000010);
+      bitField0_ = (bitField0_ & ~0x00008000);
       if (messagesBuilder_ == null) {
         messages_ = java.util.Collections.emptyList();
       } else {
         messages_ = null;
         messagesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000020);
+      bitField0_ = (bitField0_ & ~0x00010000);
       defaultResponsePlatforms_ = java.util.Collections.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000040);
+      bitField0_ = (bitField0_ & ~0x00020000);
       rootFollowupIntentName_ = "";
-
       parentFollowupIntentName_ = "";
-
       if (followupIntentInfoBuilder_ == null) {
         followupIntentInfo_ = java.util.Collections.emptyList();
       } else {
         followupIntentInfo_ = null;
         followupIntentInfoBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000080);
+      bitField0_ = (bitField0_ & ~0x00100000);
       return this;
     }
 
@@ -66588,83 +67301,119 @@ public com.google.cloud.dialogflow.v2beta1.Intent build() {
     public com.google.cloud.dialogflow.v2beta1.Intent buildPartial() {
       com.google.cloud.dialogflow.v2beta1.Intent result =
           new com.google.cloud.dialogflow.v2beta1.Intent(this);
-      int from_bitField0_ = bitField0_;
-      result.name_ = name_;
-      result.displayName_ = displayName_;
-      result.webhookState_ = webhookState_;
-      result.priority_ = priority_;
-      result.isFallback_ = isFallback_;
-      result.mlEnabled_ = mlEnabled_;
-      result.mlDisabled_ = mlDisabled_;
-      result.liveAgentHandoff_ = liveAgentHandoff_;
-      result.endInteraction_ = endInteraction_;
-      if (((bitField0_ & 0x00000001) != 0)) {
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.cloud.dialogflow.v2beta1.Intent result) {
+      if (((bitField0_ & 0x00000200) != 0)) {
         inputContextNames_ = inputContextNames_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000200);
       }
       result.inputContextNames_ = inputContextNames_;
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (((bitField0_ & 0x00000400) != 0)) {
         events_ = events_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000400);
       }
       result.events_ = events_;
       if (trainingPhrasesBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)) {
+        if (((bitField0_ & 0x00000800) != 0)) {
           trainingPhrases_ = java.util.Collections.unmodifiableList(trainingPhrases_);
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000800);
         }
         result.trainingPhrases_ = trainingPhrases_;
       } else {
         result.trainingPhrases_ = trainingPhrasesBuilder_.build();
       }
-      result.action_ = action_;
       if (outputContextsBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)) {
+        if (((bitField0_ & 0x00002000) != 0)) {
           outputContexts_ = java.util.Collections.unmodifiableList(outputContexts_);
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00002000);
         }
         result.outputContexts_ = outputContexts_;
       } else {
         result.outputContexts_ = outputContextsBuilder_.build();
       }
-      result.resetContexts_ = resetContexts_;
       if (parametersBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)) {
+        if (((bitField0_ & 0x00008000) != 0)) {
           parameters_ = java.util.Collections.unmodifiableList(parameters_);
-          bitField0_ = (bitField0_ & ~0x00000010);
+          bitField0_ = (bitField0_ & ~0x00008000);
         }
         result.parameters_ = parameters_;
       } else {
         result.parameters_ = parametersBuilder_.build();
       }
       if (messagesBuilder_ == null) {
-        if (((bitField0_ & 0x00000020) != 0)) {
+        if (((bitField0_ & 0x00010000) != 0)) {
           messages_ = java.util.Collections.unmodifiableList(messages_);
-          bitField0_ = (bitField0_ & ~0x00000020);
+          bitField0_ = (bitField0_ & ~0x00010000);
         }
         result.messages_ = messages_;
       } else {
         result.messages_ = messagesBuilder_.build();
       }
-      if (((bitField0_ & 0x00000040) != 0)) {
+      if (((bitField0_ & 0x00020000) != 0)) {
         defaultResponsePlatforms_ =
             java.util.Collections.unmodifiableList(defaultResponsePlatforms_);
-        bitField0_ = (bitField0_ & ~0x00000040);
+        bitField0_ = (bitField0_ & ~0x00020000);
       }
       result.defaultResponsePlatforms_ = defaultResponsePlatforms_;
-      result.rootFollowupIntentName_ = rootFollowupIntentName_;
-      result.parentFollowupIntentName_ = parentFollowupIntentName_;
       if (followupIntentInfoBuilder_ == null) {
-        if (((bitField0_ & 0x00000080) != 0)) {
+        if (((bitField0_ & 0x00100000) != 0)) {
           followupIntentInfo_ = java.util.Collections.unmodifiableList(followupIntentInfo_);
-          bitField0_ = (bitField0_ & ~0x00000080);
+          bitField0_ = (bitField0_ & ~0x00100000);
         }
         result.followupIntentInfo_ = followupIntentInfo_;
       } else {
         result.followupIntentInfo_ = followupIntentInfoBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.Intent result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.displayName_ = displayName_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.webhookState_ = webhookState_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.priority_ = priority_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.isFallback_ = isFallback_;
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.mlEnabled_ = mlEnabled_;
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.mlDisabled_ = mlDisabled_;
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.liveAgentHandoff_ = liveAgentHandoff_;
+      }
+      if (((from_bitField0_ & 0x00000100) != 0)) {
+        result.endInteraction_ = endInteraction_;
+      }
+      if (((from_bitField0_ & 0x00001000) != 0)) {
+        result.action_ = action_;
+      }
+      if (((from_bitField0_ & 0x00004000) != 0)) {
+        result.resetContexts_ = resetContexts_;
+      }
+      if (((from_bitField0_ & 0x00040000) != 0)) {
+        result.rootFollowupIntentName_ = rootFollowupIntentName_;
+      }
+      if (((from_bitField0_ & 0x00080000) != 0)) {
+        result.parentFollowupIntentName_ = parentFollowupIntentName_;
+      }
     }
 
     @java.lang.Override
@@ -66714,10 +67463,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent other) {
       if (other == com.google.cloud.dialogflow.v2beta1.Intent.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.webhookState_ != 0) {
@@ -66744,7 +67495,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent other) {
       if (!other.inputContextNames_.isEmpty()) {
         if (inputContextNames_.isEmpty()) {
           inputContextNames_ = other.inputContextNames_;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000200);
         } else {
           ensureInputContextNamesIsMutable();
           inputContextNames_.addAll(other.inputContextNames_);
@@ -66754,7 +67505,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent other) {
       if (!other.events_.isEmpty()) {
         if (events_.isEmpty()) {
           events_ = other.events_;
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000400);
         } else {
           ensureEventsIsMutable();
           events_.addAll(other.events_);
@@ -66765,7 +67516,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent other) {
         if (!other.trainingPhrases_.isEmpty()) {
           if (trainingPhrases_.isEmpty()) {
             trainingPhrases_ = other.trainingPhrases_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000800);
           } else {
             ensureTrainingPhrasesIsMutable();
             trainingPhrases_.addAll(other.trainingPhrases_);
@@ -66778,7 +67529,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent other) {
             trainingPhrasesBuilder_.dispose();
             trainingPhrasesBuilder_ = null;
             trainingPhrases_ = other.trainingPhrases_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000800);
             trainingPhrasesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getTrainingPhrasesFieldBuilder()
@@ -66790,13 +67541,14 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent other) {
       }
       if (!other.getAction().isEmpty()) {
         action_ = other.action_;
+        bitField0_ |= 0x00001000;
         onChanged();
       }
       if (outputContextsBuilder_ == null) {
         if (!other.outputContexts_.isEmpty()) {
           if (outputContexts_.isEmpty()) {
             outputContexts_ = other.outputContexts_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00002000);
           } else {
             ensureOutputContextsIsMutable();
             outputContexts_.addAll(other.outputContexts_);
@@ -66809,7 +67561,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent other) {
             outputContextsBuilder_.dispose();
             outputContextsBuilder_ = null;
             outputContexts_ = other.outputContexts_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00002000);
             outputContextsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getOutputContextsFieldBuilder()
@@ -66826,7 +67578,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent other) {
         if (!other.parameters_.isEmpty()) {
           if (parameters_.isEmpty()) {
             parameters_ = other.parameters_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            bitField0_ = (bitField0_ & ~0x00008000);
           } else {
             ensureParametersIsMutable();
             parameters_.addAll(other.parameters_);
@@ -66839,7 +67591,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent other) {
             parametersBuilder_.dispose();
             parametersBuilder_ = null;
             parameters_ = other.parameters_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            bitField0_ = (bitField0_ & ~0x00008000);
             parametersBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getParametersFieldBuilder()
@@ -66853,7 +67605,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent other) {
         if (!other.messages_.isEmpty()) {
           if (messages_.isEmpty()) {
             messages_ = other.messages_;
-            bitField0_ = (bitField0_ & ~0x00000020);
+            bitField0_ = (bitField0_ & ~0x00010000);
           } else {
             ensureMessagesIsMutable();
             messages_.addAll(other.messages_);
@@ -66866,7 +67618,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent other) {
             messagesBuilder_.dispose();
             messagesBuilder_ = null;
             messages_ = other.messages_;
-            bitField0_ = (bitField0_ & ~0x00000020);
+            bitField0_ = (bitField0_ & ~0x00010000);
             messagesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getMessagesFieldBuilder()
@@ -66879,7 +67631,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent other) {
       if (!other.defaultResponsePlatforms_.isEmpty()) {
         if (defaultResponsePlatforms_.isEmpty()) {
           defaultResponsePlatforms_ = other.defaultResponsePlatforms_;
-          bitField0_ = (bitField0_ & ~0x00000040);
+          bitField0_ = (bitField0_ & ~0x00020000);
         } else {
           ensureDefaultResponsePlatformsIsMutable();
           defaultResponsePlatforms_.addAll(other.defaultResponsePlatforms_);
@@ -66888,17 +67640,19 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent other) {
       }
       if (!other.getRootFollowupIntentName().isEmpty()) {
         rootFollowupIntentName_ = other.rootFollowupIntentName_;
+        bitField0_ |= 0x00040000;
         onChanged();
       }
       if (!other.getParentFollowupIntentName().isEmpty()) {
         parentFollowupIntentName_ = other.parentFollowupIntentName_;
+        bitField0_ |= 0x00080000;
         onChanged();
       }
       if (followupIntentInfoBuilder_ == null) {
         if (!other.followupIntentInfo_.isEmpty()) {
           if (followupIntentInfo_.isEmpty()) {
             followupIntentInfo_ = other.followupIntentInfo_;
-            bitField0_ = (bitField0_ & ~0x00000080);
+            bitField0_ = (bitField0_ & ~0x00100000);
           } else {
             ensureFollowupIntentInfoIsMutable();
             followupIntentInfo_.addAll(other.followupIntentInfo_);
@@ -66911,7 +67665,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Intent other) {
             followupIntentInfoBuilder_.dispose();
             followupIntentInfoBuilder_ = null;
             followupIntentInfo_ = other.followupIntentInfo_;
-            bitField0_ = (bitField0_ & ~0x00000080);
+            bitField0_ = (bitField0_ & ~0x00100000);
             followupIntentInfoBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getFollowupIntentInfoFieldBuilder()
@@ -66950,37 +67704,37 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 displayName_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 priority_ = input.readInt32();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 24
             case 32:
               {
                 isFallback_ = input.readBool();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 32
             case 40:
               {
                 mlEnabled_ = input.readBool();
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 40
             case 48:
               {
                 webhookState_ = input.readEnum();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 48
             case 58:
@@ -67014,7 +67768,7 @@ public Builder mergeFrom(
             case 82:
               {
                 action_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00001000;
                 break;
               } // case 82
             case 90:
@@ -67033,7 +67787,7 @@ public Builder mergeFrom(
             case 96:
               {
                 resetContexts_ = input.readBool();
-
+                bitField0_ |= 0x00004000;
                 break;
               } // case 96
             case 106:
@@ -67086,13 +67840,13 @@ public Builder mergeFrom(
             case 130:
               {
                 rootFollowupIntentName_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00040000;
                 break;
               } // case 130
             case 138:
               {
                 parentFollowupIntentName_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00080000;
                 break;
               } // case 138
             case 146:
@@ -67112,19 +67866,19 @@ public Builder mergeFrom(
             case 152:
               {
                 mlDisabled_ = input.readBool();
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 152
             case 160:
               {
                 liveAgentHandoff_ = input.readBool();
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 160
             case 168:
               {
                 endInteraction_ = input.readBool();
-
+                bitField0_ |= 0x00000100;
                 break;
               } // case 168
             default:
@@ -67222,8 +67976,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -67244,8 +67998,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -67271,8 +68025,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -67338,8 +68092,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -67355,8 +68109,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
-
       displayName_ = getDefaultInstance().getDisplayName();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -67377,8 +68131,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -67416,8 +68170,8 @@ public int getWebhookStateValue() {
      * @return This builder for chaining.
      */
     public Builder setWebhookStateValue(int value) {
-
       webhookState_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -67436,9 +68190,8 @@ public Builder setWebhookStateValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.Intent.WebhookState getWebhookState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.Intent.WebhookState result =
-          com.google.cloud.dialogflow.v2beta1.Intent.WebhookState.valueOf(webhookState_);
+          com.google.cloud.dialogflow.v2beta1.Intent.WebhookState.forNumber(webhookState_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.Intent.WebhookState.UNRECOGNIZED
           : result;
@@ -67461,7 +68214,7 @@ public Builder setWebhookState(com.google.cloud.dialogflow.v2beta1.Intent.Webhoo
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000004;
       webhookState_ = value.getNumber();
       onChanged();
       return this;
@@ -67480,7 +68233,7 @@ public Builder setWebhookState(com.google.cloud.dialogflow.v2beta1.Intent.Webhoo
      * @return This builder for chaining.
      */
     public Builder clearWebhookState() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       webhookState_ = 0;
       onChanged();
       return this;
@@ -67529,6 +68282,7 @@ public int getPriority() {
     public Builder setPriority(int value) {
 
       priority_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -67550,7 +68304,7 @@ public Builder setPriority(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPriority() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       priority_ = 0;
       onChanged();
       return this;
@@ -67587,6 +68341,7 @@ public boolean getIsFallback() {
     public Builder setIsFallback(boolean value) {
 
       isFallback_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -67602,7 +68357,7 @@ public Builder setIsFallback(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearIsFallback() {
-
+      bitField0_ = (bitField0_ & ~0x00000010);
       isFallback_ = false;
       onChanged();
       return this;
@@ -67667,6 +68422,7 @@ public boolean getMlEnabled() {
     public Builder setMlEnabled(boolean value) {
 
       mlEnabled_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -67696,7 +68452,7 @@ public Builder setMlEnabled(boolean value) {
      */
     @java.lang.Deprecated
     public Builder clearMlEnabled() {
-
+      bitField0_ = (bitField0_ & ~0x00000020);
       mlEnabled_ = false;
       onChanged();
       return this;
@@ -67739,6 +68495,7 @@ public boolean getMlDisabled() {
     public Builder setMlDisabled(boolean value) {
 
       mlDisabled_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -67757,7 +68514,7 @@ public Builder setMlDisabled(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearMlDisabled() {
-
+      bitField0_ = (bitField0_ & ~0x00000040);
       mlDisabled_ = false;
       onChanged();
       return this;
@@ -67800,6 +68557,7 @@ public boolean getLiveAgentHandoff() {
     public Builder setLiveAgentHandoff(boolean value) {
 
       liveAgentHandoff_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -67818,7 +68576,7 @@ public Builder setLiveAgentHandoff(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearLiveAgentHandoff() {
-
+      bitField0_ = (bitField0_ & ~0x00000080);
       liveAgentHandoff_ = false;
       onChanged();
       return this;
@@ -67859,6 +68617,7 @@ public boolean getEndInteraction() {
     public Builder setEndInteraction(boolean value) {
 
       endInteraction_ = value;
+      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -67876,7 +68635,7 @@ public Builder setEndInteraction(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearEndInteraction() {
-
+      bitField0_ = (bitField0_ & ~0x00000100);
       endInteraction_ = false;
       onChanged();
       return this;
@@ -67886,9 +68645,9 @@ public Builder clearEndInteraction() {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureInputContextNamesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000200) != 0)) {
         inputContextNames_ = new com.google.protobuf.LazyStringArrayList(inputContextNames_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000200;
       }
     }
     /**
@@ -68071,7 +68830,7 @@ public Builder addAllInputContextNames(java.lang.Iterable<java.lang.String> valu
      */
     public Builder clearInputContextNames() {
       inputContextNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000200);
       onChanged();
       return this;
     }
@@ -68108,9 +68867,9 @@ public Builder addInputContextNamesBytes(com.google.protobuf.ByteString value) {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureEventsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000400) != 0)) {
         events_ = new com.google.protobuf.LazyStringArrayList(events_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000400;
       }
     }
     /**
@@ -68269,7 +69028,7 @@ public Builder addAllEvents(java.lang.Iterable<java.lang.String> values) {
      */
     public Builder clearEvents() {
       events_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000400);
       onChanged();
       return this;
     }
@@ -68303,11 +69062,11 @@ public Builder addEventsBytes(com.google.protobuf.ByteString value) {
         trainingPhrases_ = java.util.Collections.emptyList();
 
     private void ensureTrainingPhrasesIsMutable() {
-      if (!((bitField0_ & 0x00000004) != 0)) {
+      if (!((bitField0_ & 0x00000800) != 0)) {
         trainingPhrases_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase>(
                 trainingPhrases_);
-        bitField0_ |= 0x00000004;
+        bitField0_ |= 0x00000800;
       }
     }
 
@@ -68563,7 +69322,7 @@ public Builder addAllTrainingPhrases(
     public Builder clearTrainingPhrases() {
       if (trainingPhrasesBuilder_ == null) {
         trainingPhrases_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000800);
         onChanged();
       } else {
         trainingPhrasesBuilder_.clear();
@@ -68715,7 +69474,7 @@ public Builder removeTrainingPhrases(int index) {
                 com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Builder,
                 com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhraseOrBuilder>(
                 trainingPhrases_,
-                ((bitField0_ & 0x00000004) != 0),
+                ((bitField0_ & 0x00000800) != 0),
                 getParentForChildren(),
                 isClean());
         trainingPhrases_ = null;
@@ -68787,8 +69546,8 @@ public Builder setAction(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       action_ = value;
+      bitField0_ |= 0x00001000;
       onChanged();
       return this;
     }
@@ -68805,8 +69564,8 @@ public Builder setAction(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAction() {
-
       action_ = getDefaultInstance().getAction();
+      bitField0_ = (bitField0_ & ~0x00001000);
       onChanged();
       return this;
     }
@@ -68828,8 +69587,8 @@ public Builder setActionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       action_ = value;
+      bitField0_ |= 0x00001000;
       onChanged();
       return this;
     }
@@ -68838,10 +69597,10 @@ public Builder setActionBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureOutputContextsIsMutable() {
-      if (!((bitField0_ & 0x00000008) != 0)) {
+      if (!((bitField0_ & 0x00002000) != 0)) {
         outputContexts_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.Context>(outputContexts_);
-        bitField0_ |= 0x00000008;
+        bitField0_ |= 0x00002000;
       }
     }
 
@@ -69123,7 +69882,7 @@ public Builder addAllOutputContexts(
     public Builder clearOutputContexts() {
       if (outputContextsBuilder_ == null) {
         outputContexts_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00002000);
         onChanged();
       } else {
         outputContextsBuilder_.clear();
@@ -69289,7 +70048,7 @@ public com.google.cloud.dialogflow.v2beta1.Context.Builder addOutputContextsBuil
                 com.google.cloud.dialogflow.v2beta1.Context.Builder,
                 com.google.cloud.dialogflow.v2beta1.ContextOrBuilder>(
                 outputContexts_,
-                ((bitField0_ & 0x00000008) != 0),
+                ((bitField0_ & 0x00002000) != 0),
                 getParentForChildren(),
                 isClean());
         outputContexts_ = null;
@@ -69330,6 +70089,7 @@ public boolean getResetContexts() {
     public Builder setResetContexts(boolean value) {
 
       resetContexts_ = value;
+      bitField0_ |= 0x00004000;
       onChanged();
       return this;
     }
@@ -69346,7 +70106,7 @@ public Builder setResetContexts(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearResetContexts() {
-
+      bitField0_ = (bitField0_ & ~0x00004000);
       resetContexts_ = false;
       onChanged();
       return this;
@@ -69356,11 +70116,11 @@ public Builder clearResetContexts() {
         java.util.Collections.emptyList();
 
     private void ensureParametersIsMutable() {
-      if (!((bitField0_ & 0x00000010) != 0)) {
+      if (!((bitField0_ & 0x00008000) != 0)) {
         parameters_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.Intent.Parameter>(
                 parameters_);
-        bitField0_ |= 0x00000010;
+        bitField0_ |= 0x00008000;
       }
     }
 
@@ -69601,7 +70361,7 @@ public Builder addAllParameters(
     public Builder clearParameters() {
       if (parametersBuilder_ == null) {
         parameters_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000010);
+        bitField0_ = (bitField0_ & ~0x00008000);
         onChanged();
       } else {
         parametersBuilder_.clear();
@@ -69741,7 +70501,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Parameter.Builder addParameter
                 com.google.cloud.dialogflow.v2beta1.Intent.Parameter,
                 com.google.cloud.dialogflow.v2beta1.Intent.Parameter.Builder,
                 com.google.cloud.dialogflow.v2beta1.Intent.ParameterOrBuilder>(
-                parameters_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
+                parameters_, ((bitField0_ & 0x00008000) != 0), getParentForChildren(), isClean());
         parameters_ = null;
       }
       return parametersBuilder_;
@@ -69751,10 +70511,10 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Parameter.Builder addParameter
         java.util.Collections.emptyList();
 
     private void ensureMessagesIsMutable() {
-      if (!((bitField0_ & 0x00000020) != 0)) {
+      if (!((bitField0_ & 0x00010000) != 0)) {
         messages_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.Intent.Message>(messages_);
-        bitField0_ |= 0x00000020;
+        bitField0_ |= 0x00010000;
       }
     }
 
@@ -69983,7 +70743,7 @@ public Builder addAllMessages(
     public Builder clearMessages() {
       if (messagesBuilder_ == null) {
         messages_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000020);
+        bitField0_ = (bitField0_ & ~0x00010000);
         onChanged();
       } else {
         messagesBuilder_.clear();
@@ -70116,7 +70876,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Builder addMessagesBui
                 com.google.cloud.dialogflow.v2beta1.Intent.Message,
                 com.google.cloud.dialogflow.v2beta1.Intent.Message.Builder,
                 com.google.cloud.dialogflow.v2beta1.Intent.MessageOrBuilder>(
-                messages_, ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean());
+                messages_, ((bitField0_ & 0x00010000) != 0), getParentForChildren(), isClean());
         messages_ = null;
       }
       return messagesBuilder_;
@@ -70126,10 +70886,10 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Builder addMessagesBui
         java.util.Collections.emptyList();
 
     private void ensureDefaultResponsePlatformsIsMutable() {
-      if (!((bitField0_ & 0x00000040) != 0)) {
+      if (!((bitField0_ & 0x00020000) != 0)) {
         defaultResponsePlatforms_ =
             new java.util.ArrayList<java.lang.Integer>(defaultResponsePlatforms_);
-        bitField0_ |= 0x00000040;
+        bitField0_ |= 0x00020000;
       }
     }
     /**
@@ -70280,7 +71040,7 @@ public Builder addAllDefaultResponsePlatforms(
      */
     public Builder clearDefaultResponsePlatforms() {
       defaultResponsePlatforms_ = java.util.Collections.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000040);
+      bitField0_ = (bitField0_ & ~0x00020000);
       onChanged();
       return this;
     }
@@ -70460,8 +71220,8 @@ public Builder setRootFollowupIntentName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       rootFollowupIntentName_ = value;
+      bitField0_ |= 0x00040000;
       onChanged();
       return this;
     }
@@ -70481,8 +71241,8 @@ public Builder setRootFollowupIntentName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearRootFollowupIntentName() {
-
       rootFollowupIntentName_ = getDefaultInstance().getRootFollowupIntentName();
+      bitField0_ = (bitField0_ & ~0x00040000);
       onChanged();
       return this;
     }
@@ -70507,8 +71267,8 @@ public Builder setRootFollowupIntentNameBytes(com.google.protobuf.ByteString val
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       rootFollowupIntentName_ = value;
+      bitField0_ |= 0x00040000;
       onChanged();
       return this;
     }
@@ -70595,8 +71355,8 @@ public Builder setParentFollowupIntentName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parentFollowupIntentName_ = value;
+      bitField0_ |= 0x00080000;
       onChanged();
       return this;
     }
@@ -70619,8 +71379,8 @@ public Builder setParentFollowupIntentName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParentFollowupIntentName() {
-
       parentFollowupIntentName_ = getDefaultInstance().getParentFollowupIntentName();
+      bitField0_ = (bitField0_ & ~0x00080000);
       onChanged();
       return this;
     }
@@ -70648,8 +71408,8 @@ public Builder setParentFollowupIntentNameBytes(com.google.protobuf.ByteString v
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parentFollowupIntentName_ = value;
+      bitField0_ |= 0x00080000;
       onChanged();
       return this;
     }
@@ -70658,11 +71418,11 @@ public Builder setParentFollowupIntentNameBytes(com.google.protobuf.ByteString v
         followupIntentInfo_ = java.util.Collections.emptyList();
 
     private void ensureFollowupIntentInfoIsMutable() {
-      if (!((bitField0_ & 0x00000080) != 0)) {
+      if (!((bitField0_ & 0x00100000) != 0)) {
         followupIntentInfo_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.Intent.FollowupIntentInfo>(
                 followupIntentInfo_);
-        bitField0_ |= 0x00000080;
+        bitField0_ |= 0x00100000;
       }
     }
 
@@ -70919,7 +71679,7 @@ public Builder addAllFollowupIntentInfo(
     public Builder clearFollowupIntentInfo() {
       if (followupIntentInfoBuilder_ == null) {
         followupIntentInfo_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000080);
+        bitField0_ = (bitField0_ & ~0x00100000);
         onChanged();
       } else {
         followupIntentInfoBuilder_.clear();
@@ -71071,7 +71831,7 @@ public Builder removeFollowupIntentInfo(int index) {
                 com.google.cloud.dialogflow.v2beta1.Intent.FollowupIntentInfo.Builder,
                 com.google.cloud.dialogflow.v2beta1.Intent.FollowupIntentInfoOrBuilder>(
                 followupIntentInfo_,
-                ((bitField0_ & 0x00000080) != 0),
+                ((bitField0_ & 0x00100000) != 0),
                 getParentForChildren(),
                 isClean());
         followupIntentInfo_ = null;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentBatch.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentBatch.java
index 462610c92b4c..79ec21097120 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentBatch.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentBatch.java
@@ -68,6 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int INTENTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent> intents_;
   /**
    *
@@ -335,6 +337,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (intentsBuilder_ == null) {
         intents_ = java.util.Collections.emptyList();
       } else {
@@ -369,7 +372,16 @@ public com.google.cloud.dialogflow.v2beta1.IntentBatch build() {
     public com.google.cloud.dialogflow.v2beta1.IntentBatch buildPartial() {
       com.google.cloud.dialogflow.v2beta1.IntentBatch result =
           new com.google.cloud.dialogflow.v2beta1.IntentBatch(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.IntentBatch result) {
       if (intentsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           intents_ = java.util.Collections.unmodifiableList(intents_);
@@ -379,8 +391,10 @@ public com.google.cloud.dialogflow.v2beta1.IntentBatch buildPartial() {
       } else {
         result.intents_ = intentsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.IntentBatch result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeAnswers.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeAnswers.java
index 10c6fc1dc7f8..ccddc7aba694 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeAnswers.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeAnswers.java
@@ -455,7 +455,9 @@ private MatchConfidenceLevel(int value) {
     }
 
     public static final int SOURCE_FIELD_NUMBER = 1;
-    private volatile java.lang.Object source_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object source_ = "";
     /**
      *
      *
@@ -508,7 +510,9 @@ public com.google.protobuf.ByteString getSourceBytes() {
     }
 
     public static final int FAQ_QUESTION_FIELD_NUMBER = 2;
-    private volatile java.lang.Object faqQuestion_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object faqQuestion_ = "";
     /**
      *
      *
@@ -559,7 +563,9 @@ public com.google.protobuf.ByteString getFaqQuestionBytes() {
     }
 
     public static final int ANSWER_FIELD_NUMBER = 3;
-    private volatile java.lang.Object answer_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object answer_ = "";
     /**
      *
      *
@@ -610,7 +616,7 @@ public com.google.protobuf.ByteString getAnswerBytes() {
     }
 
     public static final int MATCH_CONFIDENCE_LEVEL_FIELD_NUMBER = 4;
-    private int matchConfidenceLevel_;
+    private int matchConfidenceLevel_ = 0;
     /**
      *
      *
@@ -656,10 +662,9 @@ public int getMatchConfidenceLevelValue() {
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer.MatchConfidenceLevel
         getMatchConfidenceLevel() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer.MatchConfidenceLevel result =
-          com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer.MatchConfidenceLevel.valueOf(
-              matchConfidenceLevel_);
+          com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer.MatchConfidenceLevel
+              .forNumber(matchConfidenceLevel_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer.MatchConfidenceLevel
               .UNRECOGNIZED
@@ -667,7 +672,7 @@ public int getMatchConfidenceLevelValue() {
     }
 
     public static final int MATCH_CONFIDENCE_FIELD_NUMBER = 5;
-    private float matchConfidence_;
+    private float matchConfidence_ = 0F;
     /**
      *
      *
@@ -933,16 +938,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         source_ = "";
-
         faqQuestion_ = "";
-
         answer_ = "";
-
         matchConfidenceLevel_ = 0;
-
         matchConfidence_ = 0F;
-
         return this;
       }
 
@@ -971,15 +972,33 @@ public com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer build() {
       public com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer buildPartial() {
         com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer result =
             new com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer(this);
-        result.source_ = source_;
-        result.faqQuestion_ = faqQuestion_;
-        result.answer_ = answer_;
-        result.matchConfidenceLevel_ = matchConfidenceLevel_;
-        result.matchConfidence_ = matchConfidence_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.source_ = source_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.faqQuestion_ = faqQuestion_;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.answer_ = answer_;
+        }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.matchConfidenceLevel_ = matchConfidenceLevel_;
+        }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.matchConfidence_ = matchConfidence_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1031,14 +1050,17 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.An
           return this;
         if (!other.getSource().isEmpty()) {
           source_ = other.source_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getFaqQuestion().isEmpty()) {
           faqQuestion_ = other.faqQuestion_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (!other.getAnswer().isEmpty()) {
           answer_ = other.answer_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
         if (other.matchConfidenceLevel_ != 0) {
@@ -1076,31 +1098,31 @@ public Builder mergeFrom(
               case 10:
                 {
                   source_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
                 {
                   faqQuestion_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 18
               case 26:
                 {
                   answer_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000004;
                   break;
                 } // case 26
               case 32:
                 {
                   matchConfidenceLevel_ = input.readEnum();
-
+                  bitField0_ |= 0x00000008;
                   break;
                 } // case 32
               case 45:
                 {
                   matchConfidence_ = input.readFloat();
-
+                  bitField0_ |= 0x00000010;
                   break;
                 } // case 45
               default:
@@ -1120,6 +1142,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object source_ = "";
       /**
        *
@@ -1187,8 +1211,8 @@ public Builder setSource(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         source_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1206,8 +1230,8 @@ public Builder setSource(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearSource() {
-
         source_ = getDefaultInstance().getSource();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1230,8 +1254,8 @@ public Builder setSourceBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         source_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1300,8 +1324,8 @@ public Builder setFaqQuestion(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         faqQuestion_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1318,8 +1342,8 @@ public Builder setFaqQuestion(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearFaqQuestion() {
-
         faqQuestion_ = getDefaultInstance().getFaqQuestion();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1341,8 +1365,8 @@ public Builder setFaqQuestionBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         faqQuestion_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1411,8 +1435,8 @@ public Builder setAnswer(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         answer_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1429,8 +1453,8 @@ public Builder setAnswer(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearAnswer() {
-
         answer_ = getDefaultInstance().getAnswer();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -1452,8 +1476,8 @@ public Builder setAnswerBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         answer_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1503,8 +1527,8 @@ public int getMatchConfidenceLevelValue() {
        * @return This builder for chaining.
        */
       public Builder setMatchConfidenceLevelValue(int value) {
-
         matchConfidenceLevel_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -1530,10 +1554,9 @@ public Builder setMatchConfidenceLevelValue(int value) {
       @java.lang.Override
       public com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer.MatchConfidenceLevel
           getMatchConfidenceLevel() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer.MatchConfidenceLevel result =
             com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer.MatchConfidenceLevel
-                .valueOf(matchConfidenceLevel_);
+                .forNumber(matchConfidenceLevel_);
         return result == null
             ? com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer.MatchConfidenceLevel
                 .UNRECOGNIZED
@@ -1564,7 +1587,7 @@ public Builder setMatchConfidenceLevel(
         if (value == null) {
           throw new NullPointerException();
         }
-
+        bitField0_ |= 0x00000008;
         matchConfidenceLevel_ = value.getNumber();
         onChanged();
         return this;
@@ -1589,7 +1612,7 @@ public Builder setMatchConfidenceLevel(
        * @return This builder for chaining.
        */
       public Builder clearMatchConfidenceLevel() {
-
+        bitField0_ = (bitField0_ & ~0x00000008);
         matchConfidenceLevel_ = 0;
         onChanged();
         return this;
@@ -1638,6 +1661,7 @@ public float getMatchConfidence() {
       public Builder setMatchConfidence(float value) {
 
         matchConfidence_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1659,7 +1683,7 @@ public Builder setMatchConfidence(float value) {
        * @return This builder for chaining.
        */
       public Builder clearMatchConfidence() {
-
+        bitField0_ = (bitField0_ & ~0x00000010);
         matchConfidence_ = 0F;
         onChanged();
         return this;
@@ -1731,6 +1755,8 @@ public com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer getDefaultIns
   }
 
   public static final int ANSWERS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer> answers_;
   /**
    *
@@ -2001,6 +2027,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (answersBuilder_ == null) {
         answers_ = java.util.Collections.emptyList();
       } else {
@@ -2035,7 +2062,16 @@ public com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers build() {
     public com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers buildPartial() {
       com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers result =
           new com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers result) {
       if (answersBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           answers_ = java.util.Collections.unmodifiableList(answers_);
@@ -2045,8 +2081,10 @@ public com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers buildPartial() {
       } else {
         result.answers_ = answersBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBase.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBase.java
index c937b4b77743..a33eb371fc6a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBase.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBase.java
@@ -77,7 +77,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -132,7 +134,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object displayName_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object displayName_ = "";
   /**
    *
    *
@@ -183,7 +187,9 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 4;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -457,12 +463,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       displayName_ = "";
-
       languageCode_ = "";
-
       return this;
     }
 
@@ -490,13 +494,26 @@ public com.google.cloud.dialogflow.v2beta1.KnowledgeBase build() {
     public com.google.cloud.dialogflow.v2beta1.KnowledgeBase buildPartial() {
       com.google.cloud.dialogflow.v2beta1.KnowledgeBase result =
           new com.google.cloud.dialogflow.v2beta1.KnowledgeBase(this);
-      result.name_ = name_;
-      result.displayName_ = displayName_;
-      result.languageCode_ = languageCode_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.KnowledgeBase result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.displayName_ = displayName_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -545,14 +562,17 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.KnowledgeBase other
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -584,19 +604,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 displayName_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 34:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 34
             default:
@@ -616,6 +636,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -686,8 +708,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -706,8 +728,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -731,8 +753,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -801,8 +823,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -819,8 +841,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
-
       displayName_ = getDefaultInstance().getDisplayName();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -842,8 +864,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       displayName_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -915,8 +937,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -934,8 +956,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -958,8 +980,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeOperationMetadata.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeOperationMetadata.java
index bd4ff6af9974..bde91bce9642 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeOperationMetadata.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeOperationMetadata.java
@@ -294,7 +294,7 @@ public OperationMetadataCase getOperationMetadataCase() {
   }
 
   public static final int STATE_FIELD_NUMBER = 1;
-  private int state_;
+  private int state_ = 0;
   /**
    *
    *
@@ -327,16 +327,17 @@ public int getStateValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata.State result =
-        com.google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata.State.valueOf(state_);
+        com.google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata.State.forNumber(state_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata.State.UNRECOGNIZED
         : result;
   }
 
   public static final int KNOWLEDGE_BASE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object knowledgeBase_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object knowledgeBase_ = "";
   /**
    *
    *
@@ -675,10 +676,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       state_ = 0;
-
       knowledgeBase_ = "";
-
       if (exportOperationMetadataBuilder_ != null) {
         exportOperationMetadataBuilder_.clear();
       }
@@ -712,20 +712,34 @@ public com.google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata build() {
     public com.google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata buildPartial() {
       com.google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata result =
           new com.google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata(this);
-      result.state_ = state_;
-      result.knowledgeBase_ = knowledgeBase_;
-      if (operationMetadataCase_ == 4) {
-        if (exportOperationMetadataBuilder_ == null) {
-          result.operationMetadata_ = operationMetadata_;
-        } else {
-          result.operationMetadata_ = exportOperationMetadataBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.operationMetadataCase_ = operationMetadataCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.state_ = state_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.knowledgeBase_ = knowledgeBase_;
+      }
+    }
+
+    private void buildPartialOneofs(
+        com.google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata result) {
+      result.operationMetadataCase_ = operationMetadataCase_;
+      result.operationMetadata_ = this.operationMetadata_;
+      if (operationMetadataCase_ == 4 && exportOperationMetadataBuilder_ != null) {
+        result.operationMetadata_ = exportOperationMetadataBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -778,6 +792,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.KnowledgeOperationM
       }
       if (!other.getKnowledgeBase().isEmpty()) {
         knowledgeBase_ = other.knowledgeBase_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       switch (other.getOperationMetadataCase()) {
@@ -820,13 +835,13 @@ public Builder mergeFrom(
             case 8:
               {
                 state_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 26:
               {
                 knowledgeBase_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 26
             case 34:
@@ -867,6 +882,8 @@ public Builder clearOperationMetadata() {
       return this;
     }
 
+    private int bitField0_;
+
     private int state_ = 0;
     /**
      *
@@ -900,8 +917,8 @@ public int getStateValue() {
      * @return This builder for chaining.
      */
     public Builder setStateValue(int value) {
-
       state_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -920,9 +937,8 @@ public Builder setStateValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata.State result =
-          com.google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata.State.valueOf(state_);
+          com.google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata.State.forNumber(state_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata.State.UNRECOGNIZED
           : result;
@@ -946,7 +962,7 @@ public Builder setState(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       state_ = value.getNumber();
       onChanged();
       return this;
@@ -965,7 +981,7 @@ public Builder setState(
      * @return This builder for chaining.
      */
     public Builder clearState() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       state_ = 0;
       onChanged();
       return this;
@@ -1032,8 +1048,8 @@ public Builder setKnowledgeBase(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       knowledgeBase_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1049,8 +1065,8 @@ public Builder setKnowledgeBase(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearKnowledgeBase() {
-
       knowledgeBase_ = getDefaultInstance().getKnowledgeBase();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1071,8 +1087,8 @@ public Builder setKnowledgeBaseBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       knowledgeBase_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1301,7 +1317,6 @@ public Builder clearExportOperationMetadata() {
       }
       operationMetadataCase_ = 4;
       onChanged();
-      ;
       return exportOperationMetadataBuilder_;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListAnswerRecordsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListAnswerRecordsRequest.java
index a8a1dfbd27bf..4fb69581be93 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListAnswerRecordsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListAnswerRecordsRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -123,7 +125,9 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int FILTER_FIELD_NUMBER = 2;
-  private volatile java.lang.Object filter_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object filter_ = "";
   /**
    *
    *
@@ -182,7 +186,7 @@ public com.google.protobuf.ByteString getFilterBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 3;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -202,7 +206,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 4;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -481,14 +487,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       filter_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -517,14 +520,30 @@ public com.google.cloud.dialogflow.v2beta1.ListAnswerRecordsRequest build() {
     public com.google.cloud.dialogflow.v2beta1.ListAnswerRecordsRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListAnswerRecordsRequest result =
           new com.google.cloud.dialogflow.v2beta1.ListAnswerRecordsRequest(this);
-      result.parent_ = parent_;
-      result.filter_ = filter_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.ListAnswerRecordsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.filter_ = filter_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -574,10 +593,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListAnswerRecordsRe
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getFilter().isEmpty()) {
         filter_ = other.filter_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -585,6 +606,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListAnswerRecordsRe
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -616,25 +638,25 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 filter_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 34:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -654,6 +676,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -721,8 +745,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -740,8 +764,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -764,8 +788,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -846,8 +870,8 @@ public Builder setFilter(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       filter_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -868,8 +892,8 @@ public Builder setFilter(java.lang.String value) {
      */
     @java.lang.Deprecated
     public Builder clearFilter() {
-
       filter_ = getDefaultInstance().getFilter();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -895,8 +919,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       filter_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -936,6 +960,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -953,7 +978,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -1029,8 +1054,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1049,8 +1074,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1074,8 +1099,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListAnswerRecordsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListAnswerRecordsResponse.java
index 2e1dc31ea02d..50646a7c5ca3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListAnswerRecordsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListAnswerRecordsResponse.java
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ANSWER_RECORDS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.AnswerRecord> answerRecords_;
   /**
    *
@@ -139,7 +141,9 @@ public com.google.cloud.dialogflow.v2beta1.AnswerRecordOrBuilder getAnswerRecord
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -406,6 +410,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (answerRecordsBuilder_ == null) {
         answerRecords_ = java.util.Collections.emptyList();
       } else {
@@ -414,7 +419,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -443,7 +447,16 @@ public com.google.cloud.dialogflow.v2beta1.ListAnswerRecordsResponse build() {
     public com.google.cloud.dialogflow.v2beta1.ListAnswerRecordsResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListAnswerRecordsResponse result =
           new com.google.cloud.dialogflow.v2beta1.ListAnswerRecordsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.ListAnswerRecordsResponse result) {
       if (answerRecordsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           answerRecords_ = java.util.Collections.unmodifiableList(answerRecords_);
@@ -453,9 +466,14 @@ public com.google.cloud.dialogflow.v2beta1.ListAnswerRecordsResponse buildPartia
       } else {
         result.answerRecords_ = answerRecordsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.ListAnswerRecordsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -534,6 +552,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListAnswerRecordsRe
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -579,7 +598,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1037,8 +1056,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1059,8 +1078,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1086,8 +1105,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsRequest.java
index 372364487da8..e51a585fef64 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -144,7 +146,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -163,7 +165,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -427,12 +431,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -460,13 +462,26 @@ public com.google.cloud.dialogflow.v2beta1.ListContextsRequest build() {
     public com.google.cloud.dialogflow.v2beta1.ListContextsRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListContextsRequest result =
           new com.google.cloud.dialogflow.v2beta1.ListContextsRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ListContextsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -515,6 +530,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListContextsRequest
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -522,6 +538,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListContextsRequest
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -553,19 +570,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -585,6 +602,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -685,8 +704,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -715,8 +734,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -750,8 +769,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -789,6 +808,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -805,7 +825,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -872,8 +892,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -889,8 +909,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -911,8 +931,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsResponse.java
index 077f749a969e..698fdb1a55a6 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsResponse.java
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONTEXTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Context> contexts_;
   /**
    *
@@ -143,7 +145,9 @@ public com.google.cloud.dialogflow.v2beta1.ContextOrBuilder getContextsOrBuilder
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -402,6 +406,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (contextsBuilder_ == null) {
         contexts_ = java.util.Collections.emptyList();
       } else {
@@ -410,7 +415,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -438,7 +442,16 @@ public com.google.cloud.dialogflow.v2beta1.ListContextsResponse build() {
     public com.google.cloud.dialogflow.v2beta1.ListContextsResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListContextsResponse result =
           new com.google.cloud.dialogflow.v2beta1.ListContextsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.ListContextsResponse result) {
       if (contextsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           contexts_ = java.util.Collections.unmodifiableList(contexts_);
@@ -448,9 +461,13 @@ public com.google.cloud.dialogflow.v2beta1.ListContextsResponse buildPartial() {
       } else {
         result.contexts_ = contextsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ListContextsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -528,6 +545,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListContextsRespons
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -572,7 +590,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1026,8 +1044,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1044,8 +1062,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1067,8 +1085,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListConversationProfilesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListConversationProfilesRequest.java
index 2679ac1ef36b..5695b1ce6562 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListConversationProfilesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListConversationProfilesRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -125,7 +127,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -144,7 +146,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -410,12 +414,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -445,13 +447,27 @@ public com.google.cloud.dialogflow.v2beta1.ListConversationProfilesRequest build
     public com.google.cloud.dialogflow.v2beta1.ListConversationProfilesRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListConversationProfilesRequest result =
           new com.google.cloud.dialogflow.v2beta1.ListConversationProfilesRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.ListConversationProfilesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -503,6 +519,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -510,6 +527,7 @@ public Builder mergeFrom(
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -541,19 +559,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -573,6 +591,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -643,8 +663,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -663,8 +683,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -688,8 +708,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -727,6 +747,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -743,7 +764,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -810,8 +831,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -827,8 +848,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -849,8 +870,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListConversationProfilesResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListConversationProfilesResponse.java
index bac980bb7d5f..8ad330de5adc 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListConversationProfilesResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListConversationProfilesResponse.java
@@ -70,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_PROFILES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.ConversationProfile>
       conversationProfiles_;
   /**
@@ -153,7 +155,9 @@ public com.google.cloud.dialogflow.v2beta1.ConversationProfile getConversationPr
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -415,6 +419,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (conversationProfilesBuilder_ == null) {
         conversationProfiles_ = java.util.Collections.emptyList();
       } else {
@@ -423,7 +428,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -453,7 +457,16 @@ public com.google.cloud.dialogflow.v2beta1.ListConversationProfilesResponse buil
     public com.google.cloud.dialogflow.v2beta1.ListConversationProfilesResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListConversationProfilesResponse result =
           new com.google.cloud.dialogflow.v2beta1.ListConversationProfilesResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.ListConversationProfilesResponse result) {
       if (conversationProfilesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           conversationProfiles_ = java.util.Collections.unmodifiableList(conversationProfiles_);
@@ -463,9 +476,14 @@ public com.google.cloud.dialogflow.v2beta1.ListConversationProfilesResponse buil
       } else {
         result.conversationProfiles_ = conversationProfilesBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.ListConversationProfilesResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -546,6 +564,7 @@ public Builder mergeFrom(
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -591,7 +610,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1100,8 +1119,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1118,8 +1137,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1141,8 +1160,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListConversationsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListConversationsRequest.java
index dee72ac1e487..799e3cce0ebc 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListConversationsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListConversationsRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -125,7 +127,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -144,7 +146,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -193,7 +197,9 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
   }
 
   public static final int FILTER_FIELD_NUMBER = 4;
-  private volatile java.lang.Object filter_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object filter_ = "";
   /**
    *
    *
@@ -494,14 +500,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       filter_ = "";
-
       return this;
     }
 
@@ -530,14 +533,30 @@ public com.google.cloud.dialogflow.v2beta1.ListConversationsRequest build() {
     public com.google.cloud.dialogflow.v2beta1.ListConversationsRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListConversationsRequest result =
           new com.google.cloud.dialogflow.v2beta1.ListConversationsRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
-      result.filter_ = filter_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.ListConversationsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.filter_ = filter_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -587,6 +606,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListConversationsRe
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -594,10 +614,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListConversationsRe
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getFilter().isEmpty()) {
         filter_ = other.filter_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -629,25 +651,25 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 filter_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -667,6 +689,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -737,8 +761,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -757,8 +781,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -782,8 +806,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -821,6 +845,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -837,7 +862,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -904,8 +929,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -921,8 +946,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -943,8 +968,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1052,8 +1077,8 @@ public Builder setFilter(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       filter_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1083,8 +1108,8 @@ public Builder setFilter(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFilter() {
-
       filter_ = getDefaultInstance().getFilter();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1119,8 +1144,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       filter_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListConversationsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListConversationsResponse.java
index ba35b94f5721..dbd3d5687d93 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListConversationsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListConversationsResponse.java
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATIONS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Conversation> conversations_;
   /**
    *
@@ -144,7 +146,9 @@ public com.google.cloud.dialogflow.v2beta1.ConversationOrBuilder getConversation
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -403,6 +407,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (conversationsBuilder_ == null) {
         conversations_ = java.util.Collections.emptyList();
       } else {
@@ -411,7 +416,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -440,7 +444,16 @@ public com.google.cloud.dialogflow.v2beta1.ListConversationsResponse build() {
     public com.google.cloud.dialogflow.v2beta1.ListConversationsResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListConversationsResponse result =
           new com.google.cloud.dialogflow.v2beta1.ListConversationsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.ListConversationsResponse result) {
       if (conversationsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           conversations_ = java.util.Collections.unmodifiableList(conversations_);
@@ -450,9 +463,14 @@ public com.google.cloud.dialogflow.v2beta1.ListConversationsResponse buildPartia
       } else {
         result.conversations_ = conversationsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.ListConversationsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -531,6 +549,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListConversationsRe
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -576,7 +595,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1040,8 +1059,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1058,8 +1077,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1081,8 +1100,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListDocumentsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListDocumentsRequest.java
index 61e40e5f3c2d..4ac8d994532c 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListDocumentsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListDocumentsRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -127,7 +129,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -146,7 +148,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -195,7 +199,9 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
   }
 
   public static final int FILTER_FIELD_NUMBER = 4;
-  private volatile java.lang.Object filter_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object filter_ = "";
   /**
    *
    *
@@ -496,14 +502,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       filter_ = "";
-
       return this;
     }
 
@@ -531,14 +534,29 @@ public com.google.cloud.dialogflow.v2beta1.ListDocumentsRequest build() {
     public com.google.cloud.dialogflow.v2beta1.ListDocumentsRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListDocumentsRequest result =
           new com.google.cloud.dialogflow.v2beta1.ListDocumentsRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
-      result.filter_ = filter_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ListDocumentsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.filter_ = filter_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -587,6 +605,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListDocumentsReques
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -594,10 +613,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListDocumentsReques
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getFilter().isEmpty()) {
         filter_ = other.filter_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -629,25 +650,25 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 filter_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -667,6 +688,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -740,8 +763,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -761,8 +784,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -787,8 +810,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -826,6 +849,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -842,7 +866,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -909,8 +933,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -926,8 +950,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -948,8 +972,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1057,8 +1081,8 @@ public Builder setFilter(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       filter_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1088,8 +1112,8 @@ public Builder setFilter(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFilter() {
-
       filter_ = getDefaultInstance().getFilter();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1124,8 +1148,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       filter_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListDocumentsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListDocumentsResponse.java
index 19576c57b685..e61f14501c1c 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListDocumentsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListDocumentsResponse.java
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int DOCUMENTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Document> documents_;
   /**
    *
@@ -138,7 +140,9 @@ public com.google.cloud.dialogflow.v2beta1.DocumentOrBuilder getDocumentsOrBuild
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -397,6 +401,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (documentsBuilder_ == null) {
         documents_ = java.util.Collections.emptyList();
       } else {
@@ -405,7 +410,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -433,7 +437,16 @@ public com.google.cloud.dialogflow.v2beta1.ListDocumentsResponse build() {
     public com.google.cloud.dialogflow.v2beta1.ListDocumentsResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListDocumentsResponse result =
           new com.google.cloud.dialogflow.v2beta1.ListDocumentsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.ListDocumentsResponse result) {
       if (documentsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           documents_ = java.util.Collections.unmodifiableList(documents_);
@@ -443,9 +456,13 @@ public com.google.cloud.dialogflow.v2beta1.ListDocumentsResponse buildPartial()
       } else {
         result.documents_ = documentsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ListDocumentsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -523,6 +540,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListDocumentsRespon
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -567,7 +585,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1004,8 +1022,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1022,8 +1040,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1045,8 +1063,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesRequest.java
index 6b4cc4ee17ad..c238bcd1626e 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -129,7 +131,9 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -186,7 +190,7 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 3;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -205,7 +209,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 4;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -478,14 +484,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       languageCode_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -513,14 +516,29 @@ public com.google.cloud.dialogflow.v2beta1.ListEntityTypesRequest build() {
     public com.google.cloud.dialogflow.v2beta1.ListEntityTypesRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListEntityTypesRequest result =
           new com.google.cloud.dialogflow.v2beta1.ListEntityTypesRequest(this);
-      result.parent_ = parent_;
-      result.languageCode_ = languageCode_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ListEntityTypesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -569,10 +587,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListEntityTypesRequ
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -580,6 +600,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListEntityTypesRequ
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -611,25 +632,25 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 34:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -649,6 +670,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -725,8 +748,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -747,8 +770,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -774,8 +797,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -853,8 +876,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -874,8 +897,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -900,8 +923,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -939,6 +962,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -955,7 +979,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -1022,8 +1046,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1039,8 +1063,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1061,8 +1085,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesResponse.java
index 235d3621caba..d01cb339928b 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesResponse.java
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ENTITY_TYPES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.EntityType> entityTypes_;
   /**
    *
@@ -144,7 +146,9 @@ public com.google.cloud.dialogflow.v2beta1.EntityTypeOrBuilder getEntityTypesOrB
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -403,6 +407,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (entityTypesBuilder_ == null) {
         entityTypes_ = java.util.Collections.emptyList();
       } else {
@@ -411,7 +416,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -439,7 +443,16 @@ public com.google.cloud.dialogflow.v2beta1.ListEntityTypesResponse build() {
     public com.google.cloud.dialogflow.v2beta1.ListEntityTypesResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListEntityTypesResponse result =
           new com.google.cloud.dialogflow.v2beta1.ListEntityTypesResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.ListEntityTypesResponse result) {
       if (entityTypesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           entityTypes_ = java.util.Collections.unmodifiableList(entityTypes_);
@@ -449,9 +462,13 @@ public com.google.cloud.dialogflow.v2beta1.ListEntityTypesResponse buildPartial(
       } else {
         result.entityTypes_ = entityTypesBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ListEntityTypesResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -529,6 +546,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListEntityTypesResp
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -573,7 +591,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1029,8 +1047,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1047,8 +1065,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1070,8 +1088,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEnvironmentsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEnvironmentsRequest.java
index fec8b543e828..976eaad3e8c2 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEnvironmentsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEnvironmentsRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -128,7 +130,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -147,7 +149,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -411,12 +415,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -444,13 +446,26 @@ public com.google.cloud.dialogflow.v2beta1.ListEnvironmentsRequest build() {
     public com.google.cloud.dialogflow.v2beta1.ListEnvironmentsRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListEnvironmentsRequest result =
           new com.google.cloud.dialogflow.v2beta1.ListEnvironmentsRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ListEnvironmentsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -499,6 +514,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListEnvironmentsReq
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -506,6 +522,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListEnvironmentsReq
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -537,19 +554,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -569,6 +586,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -645,8 +664,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -667,8 +686,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -694,8 +713,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -733,6 +752,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -749,7 +769,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -816,8 +836,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -833,8 +853,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -855,8 +875,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEnvironmentsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEnvironmentsResponse.java
index 670deead1b5c..f0bbefcf949c 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEnvironmentsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEnvironmentsResponse.java
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ENVIRONMENTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Environment> environments_;
   /**
    *
@@ -144,7 +146,9 @@ public com.google.cloud.dialogflow.v2beta1.EnvironmentOrBuilder getEnvironmentsO
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -403,6 +407,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (environmentsBuilder_ == null) {
         environments_ = java.util.Collections.emptyList();
       } else {
@@ -411,7 +416,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -440,7 +444,16 @@ public com.google.cloud.dialogflow.v2beta1.ListEnvironmentsResponse build() {
     public com.google.cloud.dialogflow.v2beta1.ListEnvironmentsResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListEnvironmentsResponse result =
           new com.google.cloud.dialogflow.v2beta1.ListEnvironmentsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.ListEnvironmentsResponse result) {
       if (environmentsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           environments_ = java.util.Collections.unmodifiableList(environments_);
@@ -450,9 +463,14 @@ public com.google.cloud.dialogflow.v2beta1.ListEnvironmentsResponse buildPartial
       } else {
         result.environments_ = environmentsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.ListEnvironmentsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -531,6 +549,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListEnvironmentsRes
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -576,7 +595,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1036,8 +1055,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1054,8 +1073,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1077,8 +1096,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsRequest.java
index 37bc6730320e..63ec9c91fe74 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsRequest.java
@@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -140,7 +142,9 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -197,7 +201,7 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
   }
 
   public static final int INTENT_VIEW_FIELD_NUMBER = 3;
-  private int intentView_;
+  private int intentView_ = 0;
   /**
    *
    *
@@ -226,14 +230,13 @@ public int getIntentViewValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.IntentView getIntentView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.IntentView result =
-        com.google.cloud.dialogflow.v2beta1.IntentView.valueOf(intentView_);
+        com.google.cloud.dialogflow.v2beta1.IntentView.forNumber(intentView_);
     return result == null ? com.google.cloud.dialogflow.v2beta1.IntentView.UNRECOGNIZED : result;
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 4;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -252,7 +255,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 5;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -536,16 +541,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       languageCode_ = "";
-
       intentView_ = 0;
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -573,15 +574,32 @@ public com.google.cloud.dialogflow.v2beta1.ListIntentsRequest build() {
     public com.google.cloud.dialogflow.v2beta1.ListIntentsRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListIntentsRequest result =
           new com.google.cloud.dialogflow.v2beta1.ListIntentsRequest(this);
-      result.parent_ = parent_;
-      result.languageCode_ = languageCode_;
-      result.intentView_ = intentView_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ListIntentsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.intentView_ = intentView_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -630,10 +648,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListIntentsRequest
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.intentView_ != 0) {
@@ -644,6 +664,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListIntentsRequest
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000010;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -675,31 +696,31 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 intentView_ = input.readEnum();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 32:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 32
             case 42:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             default:
@@ -719,6 +740,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -810,8 +833,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -837,8 +860,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -869,8 +892,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -948,8 +971,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -969,8 +992,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -995,8 +1018,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1030,8 +1053,8 @@ public int getIntentViewValue() {
      * @return This builder for chaining.
      */
     public Builder setIntentViewValue(int value) {
-
       intentView_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1048,9 +1071,8 @@ public Builder setIntentViewValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.IntentView getIntentView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.IntentView result =
-          com.google.cloud.dialogflow.v2beta1.IntentView.valueOf(intentView_);
+          com.google.cloud.dialogflow.v2beta1.IntentView.forNumber(intentView_);
       return result == null ? com.google.cloud.dialogflow.v2beta1.IntentView.UNRECOGNIZED : result;
     }
     /**
@@ -1069,7 +1091,7 @@ public Builder setIntentView(com.google.cloud.dialogflow.v2beta1.IntentView valu
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000004;
       intentView_ = value.getNumber();
       onChanged();
       return this;
@@ -1086,7 +1108,7 @@ public Builder setIntentView(com.google.cloud.dialogflow.v2beta1.IntentView valu
      * @return This builder for chaining.
      */
     public Builder clearIntentView() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       intentView_ = 0;
       onChanged();
       return this;
@@ -1125,6 +1147,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1141,7 +1164,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -1208,8 +1231,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1225,8 +1248,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000010);
       onChanged();
       return this;
     }
@@ -1247,8 +1270,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsResponse.java
index 22fce2a152fe..c23ae7725940 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsResponse.java
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int INTENTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent> intents_;
   /**
    *
@@ -143,7 +145,9 @@ public com.google.cloud.dialogflow.v2beta1.IntentOrBuilder getIntentsOrBuilder(i
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -402,6 +406,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (intentsBuilder_ == null) {
         intents_ = java.util.Collections.emptyList();
       } else {
@@ -410,7 +415,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -438,7 +442,16 @@ public com.google.cloud.dialogflow.v2beta1.ListIntentsResponse build() {
     public com.google.cloud.dialogflow.v2beta1.ListIntentsResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListIntentsResponse result =
           new com.google.cloud.dialogflow.v2beta1.ListIntentsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.ListIntentsResponse result) {
       if (intentsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           intents_ = java.util.Collections.unmodifiableList(intents_);
@@ -448,9 +461,13 @@ public com.google.cloud.dialogflow.v2beta1.ListIntentsResponse buildPartial() {
       } else {
         result.intents_ = intentsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ListIntentsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -528,6 +545,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListIntentsResponse
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -572,7 +590,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1025,8 +1043,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1043,8 +1061,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1066,8 +1084,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListKnowledgeBasesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListKnowledgeBasesRequest.java
index 79b70f9a26e1..d7176a1883f9 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListKnowledgeBasesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListKnowledgeBasesRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -125,7 +127,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -144,7 +146,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -193,7 +197,9 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
   }
 
   public static final int FILTER_FIELD_NUMBER = 4;
-  private volatile java.lang.Object filter_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object filter_ = "";
   /**
    *
    *
@@ -502,14 +508,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       filter_ = "";
-
       return this;
     }
 
@@ -538,14 +541,30 @@ public com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesRequest build() {
     public com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesRequest result =
           new com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
-      result.filter_ = filter_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.filter_ = filter_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -595,6 +614,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesR
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -602,10 +622,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesR
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getFilter().isEmpty()) {
         filter_ = other.filter_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -637,25 +659,25 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 filter_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -675,6 +697,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -745,8 +769,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -765,8 +789,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -790,8 +814,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -829,6 +853,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -845,7 +870,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -912,8 +937,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -929,8 +954,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -951,8 +976,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1072,8 +1097,8 @@ public Builder setFilter(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       filter_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1107,8 +1132,8 @@ public Builder setFilter(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFilter() {
-
       filter_ = getDefaultInstance().getFilter();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1147,8 +1172,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       filter_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListKnowledgeBasesResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListKnowledgeBasesResponse.java
index 0a0cf367f8f8..2d16946b1b83 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListKnowledgeBasesResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListKnowledgeBasesResponse.java
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int KNOWLEDGE_BASES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.KnowledgeBase> knowledgeBases_;
   /**
    *
@@ -139,7 +141,9 @@ public com.google.cloud.dialogflow.v2beta1.KnowledgeBaseOrBuilder getKnowledgeBa
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -398,6 +402,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (knowledgeBasesBuilder_ == null) {
         knowledgeBases_ = java.util.Collections.emptyList();
       } else {
@@ -406,7 +411,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -435,7 +439,16 @@ public com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesResponse build() {
     public com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesResponse result =
           new com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesResponse result) {
       if (knowledgeBasesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           knowledgeBases_ = java.util.Collections.unmodifiableList(knowledgeBases_);
@@ -445,9 +458,14 @@ public com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesResponse buildParti
       } else {
         result.knowledgeBases_ = knowledgeBasesBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -526,6 +544,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesR
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -571,7 +590,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1019,8 +1038,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1037,8 +1056,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1060,8 +1079,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListMessagesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListMessagesRequest.java
index b045643730ed..29e1737869bd 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListMessagesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListMessagesRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -127,7 +129,9 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int FILTER_FIELD_NUMBER = 4;
-  private volatile java.lang.Object filter_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object filter_ = "";
   /**
    *
    *
@@ -188,7 +192,7 @@ public com.google.protobuf.ByteString getFilterBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -207,7 +211,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -480,14 +486,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       filter_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -515,14 +518,29 @@ public com.google.cloud.dialogflow.v2beta1.ListMessagesRequest build() {
     public com.google.cloud.dialogflow.v2beta1.ListMessagesRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListMessagesRequest result =
           new com.google.cloud.dialogflow.v2beta1.ListMessagesRequest(this);
-      result.parent_ = parent_;
-      result.filter_ = filter_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ListMessagesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.filter_ = filter_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -571,10 +589,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListMessagesRequest
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getFilter().isEmpty()) {
         filter_ = other.filter_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -582,6 +602,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListMessagesRequest
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -613,25 +634,25 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 26
             case 34:
               {
                 filter_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 34
             default:
@@ -651,6 +672,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -724,8 +747,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -745,8 +768,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -771,8 +794,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -856,8 +879,8 @@ public Builder setFilter(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       filter_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -879,8 +902,8 @@ public Builder setFilter(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFilter() {
-
       filter_ = getDefaultInstance().getFilter();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -907,8 +930,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       filter_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -946,6 +969,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -962,7 +986,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -1029,8 +1053,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1046,8 +1070,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1068,8 +1092,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListMessagesResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListMessagesResponse.java
index ee134ce9fcc8..468a9152dc28 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListMessagesResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListMessagesResponse.java
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int MESSAGES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Message> messages_;
   /**
    *
@@ -148,7 +150,9 @@ public com.google.cloud.dialogflow.v2beta1.MessageOrBuilder getMessagesOrBuilder
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -407,6 +411,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (messagesBuilder_ == null) {
         messages_ = java.util.Collections.emptyList();
       } else {
@@ -415,7 +420,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -443,7 +447,16 @@ public com.google.cloud.dialogflow.v2beta1.ListMessagesResponse build() {
     public com.google.cloud.dialogflow.v2beta1.ListMessagesResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListMessagesResponse result =
           new com.google.cloud.dialogflow.v2beta1.ListMessagesResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.ListMessagesResponse result) {
       if (messagesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           messages_ = java.util.Collections.unmodifiableList(messages_);
@@ -453,9 +466,13 @@ public com.google.cloud.dialogflow.v2beta1.ListMessagesResponse buildPartial() {
       } else {
         result.messages_ = messagesBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ListMessagesResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -533,6 +550,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListMessagesRespons
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -577,7 +595,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1049,8 +1067,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1067,8 +1085,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1090,8 +1108,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListParticipantsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListParticipantsRequest.java
index fd5c4bd9969b..67217ad294f3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListParticipantsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListParticipantsRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -126,7 +128,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -145,7 +147,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -409,12 +413,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -442,13 +444,26 @@ public com.google.cloud.dialogflow.v2beta1.ListParticipantsRequest build() {
     public com.google.cloud.dialogflow.v2beta1.ListParticipantsRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListParticipantsRequest result =
           new com.google.cloud.dialogflow.v2beta1.ListParticipantsRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ListParticipantsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -497,6 +512,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListParticipantsReq
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -504,6 +520,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListParticipantsReq
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -535,19 +552,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -567,6 +584,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -640,8 +659,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -661,8 +680,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -687,8 +706,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -726,6 +745,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -742,7 +762,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -809,8 +829,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -826,8 +846,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -848,8 +868,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListParticipantsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListParticipantsResponse.java
index 7c0a5f419ffb..fa5ccb6f4000 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListParticipantsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListParticipantsResponse.java
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARTICIPANTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Participant> participants_;
   /**
    *
@@ -144,7 +146,9 @@ public com.google.cloud.dialogflow.v2beta1.ParticipantOrBuilder getParticipantsO
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -403,6 +407,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (participantsBuilder_ == null) {
         participants_ = java.util.Collections.emptyList();
       } else {
@@ -411,7 +416,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -440,7 +444,16 @@ public com.google.cloud.dialogflow.v2beta1.ListParticipantsResponse build() {
     public com.google.cloud.dialogflow.v2beta1.ListParticipantsResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListParticipantsResponse result =
           new com.google.cloud.dialogflow.v2beta1.ListParticipantsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.ListParticipantsResponse result) {
       if (participantsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           participants_ = java.util.Collections.unmodifiableList(participants_);
@@ -450,9 +463,14 @@ public com.google.cloud.dialogflow.v2beta1.ListParticipantsResponse buildPartial
       } else {
         result.participants_ = participantsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.ListParticipantsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -531,6 +549,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListParticipantsRes
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -576,7 +595,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1036,8 +1055,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1054,8 +1073,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1077,8 +1096,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesRequest.java
index 74984235877a..1a11cf7999e6 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -146,7 +148,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -165,7 +167,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -431,12 +435,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -465,13 +467,27 @@ public com.google.cloud.dialogflow.v2beta1.ListSessionEntityTypesRequest build()
     public com.google.cloud.dialogflow.v2beta1.ListSessionEntityTypesRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListSessionEntityTypesRequest result =
           new com.google.cloud.dialogflow.v2beta1.ListSessionEntityTypesRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.ListSessionEntityTypesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -522,6 +538,7 @@ public Builder mergeFrom(
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -529,6 +546,7 @@ public Builder mergeFrom(
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -560,19 +578,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -592,6 +610,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -695,8 +715,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -726,8 +746,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -762,8 +782,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -801,6 +821,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -817,7 +838,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -884,8 +905,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -901,8 +922,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -923,8 +944,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesResponse.java
index ebeeecced0c7..8084f8884805 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesResponse.java
@@ -70,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SESSION_ENTITY_TYPES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.SessionEntityType> sessionEntityTypes_;
   /**
    *
@@ -151,7 +153,9 @@ public com.google.cloud.dialogflow.v2beta1.SessionEntityType getSessionEntityTyp
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -413,6 +417,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (sessionEntityTypesBuilder_ == null) {
         sessionEntityTypes_ = java.util.Collections.emptyList();
       } else {
@@ -421,7 +426,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -451,7 +455,16 @@ public com.google.cloud.dialogflow.v2beta1.ListSessionEntityTypesResponse build(
     public com.google.cloud.dialogflow.v2beta1.ListSessionEntityTypesResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListSessionEntityTypesResponse result =
           new com.google.cloud.dialogflow.v2beta1.ListSessionEntityTypesResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.ListSessionEntityTypesResponse result) {
       if (sessionEntityTypesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           sessionEntityTypes_ = java.util.Collections.unmodifiableList(sessionEntityTypes_);
@@ -461,9 +474,14 @@ public com.google.cloud.dialogflow.v2beta1.ListSessionEntityTypesResponse buildP
       } else {
         result.sessionEntityTypes_ = sessionEntityTypesBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.ListSessionEntityTypesResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -544,6 +562,7 @@ public Builder mergeFrom(
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -589,7 +608,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1076,8 +1095,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1094,8 +1113,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1117,8 +1136,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSuggestionsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSuggestionsRequest.java
index cbcab9167b18..09f93f6c87e3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSuggestionsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSuggestionsRequest.java
@@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -124,7 +126,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -143,7 +145,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -192,7 +196,9 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
   }
 
   public static final int FILTER_FIELD_NUMBER = 4;
-  private volatile java.lang.Object filter_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object filter_ = "";
   /**
    *
    *
@@ -477,14 +483,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       filter_ = "";
-
       return this;
     }
 
@@ -512,14 +515,29 @@ public com.google.cloud.dialogflow.v2beta1.ListSuggestionsRequest build() {
     public com.google.cloud.dialogflow.v2beta1.ListSuggestionsRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListSuggestionsRequest result =
           new com.google.cloud.dialogflow.v2beta1.ListSuggestionsRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
-      result.filter_ = filter_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ListSuggestionsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.filter_ = filter_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -568,6 +586,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListSuggestionsRequ
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -575,10 +594,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListSuggestionsRequ
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getFilter().isEmpty()) {
         filter_ = other.filter_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -610,25 +631,25 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 filter_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -648,6 +669,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -715,8 +738,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -734,8 +757,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -758,8 +781,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -797,6 +820,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -813,7 +837,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -880,8 +904,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -897,8 +921,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -919,8 +943,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1004,8 +1028,8 @@ public Builder setFilter(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       filter_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1027,8 +1051,8 @@ public Builder setFilter(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFilter() {
-
       filter_ = getDefaultInstance().getFilter();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1055,8 +1079,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       filter_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSuggestionsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSuggestionsResponse.java
index 3fac6d5087a6..931b91a428f8 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSuggestionsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSuggestionsResponse.java
@@ -70,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SUGGESTIONS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Suggestion> suggestions_;
   /**
    *
@@ -150,7 +152,9 @@ public com.google.cloud.dialogflow.v2beta1.SuggestionOrBuilder getSuggestionsOrB
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -409,6 +413,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (suggestionsBuilder_ == null) {
         suggestions_ = java.util.Collections.emptyList();
       } else {
@@ -417,7 +422,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -445,7 +449,16 @@ public com.google.cloud.dialogflow.v2beta1.ListSuggestionsResponse build() {
     public com.google.cloud.dialogflow.v2beta1.ListSuggestionsResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListSuggestionsResponse result =
           new com.google.cloud.dialogflow.v2beta1.ListSuggestionsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.ListSuggestionsResponse result) {
       if (suggestionsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           suggestions_ = java.util.Collections.unmodifiableList(suggestions_);
@@ -455,9 +468,13 @@ public com.google.cloud.dialogflow.v2beta1.ListSuggestionsResponse buildPartial(
       } else {
         result.suggestions_ = suggestionsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ListSuggestionsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -535,6 +552,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListSuggestionsResp
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -579,7 +597,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1053,8 +1071,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1071,8 +1089,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1094,8 +1112,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListVersionsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListVersionsRequest.java
index 8b3218b8ca68..80d3041fc2c7 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListVersionsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListVersionsRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -128,7 +130,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -147,7 +149,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -411,12 +415,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -444,13 +446,26 @@ public com.google.cloud.dialogflow.v2beta1.ListVersionsRequest build() {
     public com.google.cloud.dialogflow.v2beta1.ListVersionsRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListVersionsRequest result =
           new com.google.cloud.dialogflow.v2beta1.ListVersionsRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ListVersionsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -499,6 +514,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListVersionsRequest
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -506,6 +522,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListVersionsRequest
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -537,19 +554,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -569,6 +586,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -645,8 +664,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -667,8 +686,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -694,8 +713,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -733,6 +752,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -749,7 +769,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -816,8 +836,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -833,8 +853,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -855,8 +875,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListVersionsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListVersionsResponse.java
index 68adfb46f3fe..1c12be94bdfa 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListVersionsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListVersionsResponse.java
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int VERSIONS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Version> versions_;
   /**
    *
@@ -143,7 +145,9 @@ public com.google.cloud.dialogflow.v2beta1.VersionOrBuilder getVersionsOrBuilder
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -402,6 +406,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (versionsBuilder_ == null) {
         versions_ = java.util.Collections.emptyList();
       } else {
@@ -410,7 +415,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -438,7 +442,16 @@ public com.google.cloud.dialogflow.v2beta1.ListVersionsResponse build() {
     public com.google.cloud.dialogflow.v2beta1.ListVersionsResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ListVersionsResponse result =
           new com.google.cloud.dialogflow.v2beta1.ListVersionsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.ListVersionsResponse result) {
       if (versionsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           versions_ = java.util.Collections.unmodifiableList(versions_);
@@ -448,9 +461,13 @@ public com.google.cloud.dialogflow.v2beta1.ListVersionsResponse buildPartial() {
       } else {
         result.versions_ = versionsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ListVersionsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -528,6 +545,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ListVersionsRespons
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -572,7 +590,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1026,8 +1044,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1044,8 +1062,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1067,8 +1085,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/LoggingConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/LoggingConfig.java
index 423b73c362e0..577a25a9c1c6 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/LoggingConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/LoggingConfig.java
@@ -66,7 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ENABLE_STACKDRIVER_LOGGING_FIELD_NUMBER = 3;
-  private boolean enableStackdriverLogging_;
+  private boolean enableStackdriverLogging_ = false;
   /**
    *
    *
@@ -283,8 +283,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       enableStackdriverLogging_ = false;
-
       return this;
     }
 
@@ -312,11 +312,20 @@ public com.google.cloud.dialogflow.v2beta1.LoggingConfig build() {
     public com.google.cloud.dialogflow.v2beta1.LoggingConfig buildPartial() {
       com.google.cloud.dialogflow.v2beta1.LoggingConfig result =
           new com.google.cloud.dialogflow.v2beta1.LoggingConfig(this);
-      result.enableStackdriverLogging_ = enableStackdriverLogging_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.LoggingConfig result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.enableStackdriverLogging_ = enableStackdriverLogging_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -395,7 +404,7 @@ public Builder mergeFrom(
             case 24:
               {
                 enableStackdriverLogging_ = input.readBool();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 24
             default:
@@ -415,6 +424,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private boolean enableStackdriverLogging_;
     /**
      *
@@ -452,6 +463,7 @@ public boolean getEnableStackdriverLogging() {
     public Builder setEnableStackdriverLogging(boolean value) {
 
       enableStackdriverLogging_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -470,7 +482,7 @@ public Builder setEnableStackdriverLogging(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearEnableStackdriverLogging() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       enableStackdriverLogging_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Message.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Message.java
index 852a1243fcd4..b0ba4ff65540 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Message.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Message.java
@@ -72,7 +72,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -125,7 +127,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int CONTENT_FIELD_NUMBER = 2;
-  private volatile java.lang.Object content_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object content_ = "";
   /**
    *
    *
@@ -174,7 +178,9 @@ public com.google.protobuf.ByteString getContentBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -227,7 +233,9 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
   }
 
   public static final int PARTICIPANT_FIELD_NUMBER = 4;
-  private volatile java.lang.Object participant_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object participant_ = "";
   /**
    *
    *
@@ -276,7 +284,7 @@ public com.google.protobuf.ByteString getParticipantBytes() {
   }
 
   public static final int PARTICIPANT_ROLE_FIELD_NUMBER = 5;
-  private int participantRole_;
+  private int participantRole_ = 0;
   /**
    *
    *
@@ -309,9 +317,8 @@ public int getParticipantRoleValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.Participant.Role getParticipantRole() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.Participant.Role result =
-        com.google.cloud.dialogflow.v2beta1.Participant.Role.valueOf(participantRole_);
+        com.google.cloud.dialogflow.v2beta1.Participant.Role.forNumber(participantRole_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.Participant.Role.UNRECOGNIZED
         : result;
@@ -363,7 +370,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
 
   public static final int SEND_TIME_FIELD_NUMBER = 9;
@@ -412,7 +419,7 @@ public com.google.protobuf.Timestamp getSendTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getSendTimeOrBuilder() {
-    return getSendTime();
+    return sendTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : sendTime_;
   }
 
   public static final int MESSAGE_ANNOTATION_FIELD_NUMBER = 7;
@@ -467,7 +474,9 @@ public com.google.cloud.dialogflow.v2beta1.MessageAnnotation getMessageAnnotatio
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.MessageAnnotationOrBuilder
       getMessageAnnotationOrBuilder() {
-    return getMessageAnnotation();
+    return messageAnnotation_ == null
+        ? com.google.cloud.dialogflow.v2beta1.MessageAnnotation.getDefaultInstance()
+        : messageAnnotation_;
   }
 
   public static final int SENTIMENT_ANALYSIS_FIELD_NUMBER = 8;
@@ -522,7 +531,9 @@ public com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult getSentimentA
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResultOrBuilder
       getSentimentAnalysisOrBuilder() {
-    return getSentimentAnalysis();
+    return sentimentAnalysis_ == null
+        ? com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult.getDefaultInstance()
+        : sentimentAnalysis_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -816,38 +827,30 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       content_ = "";
-
       languageCode_ = "";
-
       participant_ = "";
-
       participantRole_ = 0;
-
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-      if (sendTimeBuilder_ == null) {
-        sendTime_ = null;
-      } else {
-        sendTime_ = null;
+      sendTime_ = null;
+      if (sendTimeBuilder_ != null) {
+        sendTimeBuilder_.dispose();
         sendTimeBuilder_ = null;
       }
-      if (messageAnnotationBuilder_ == null) {
-        messageAnnotation_ = null;
-      } else {
-        messageAnnotation_ = null;
+      messageAnnotation_ = null;
+      if (messageAnnotationBuilder_ != null) {
+        messageAnnotationBuilder_.dispose();
         messageAnnotationBuilder_ = null;
       }
-      if (sentimentAnalysisBuilder_ == null) {
-        sentimentAnalysis_ = null;
-      } else {
-        sentimentAnalysis_ = null;
+      sentimentAnalysis_ = null;
+      if (sentimentAnalysisBuilder_ != null) {
+        sentimentAnalysisBuilder_.dispose();
         sentimentAnalysisBuilder_ = null;
       }
       return this;
@@ -877,33 +880,48 @@ public com.google.cloud.dialogflow.v2beta1.Message build() {
     public com.google.cloud.dialogflow.v2beta1.Message buildPartial() {
       com.google.cloud.dialogflow.v2beta1.Message result =
           new com.google.cloud.dialogflow.v2beta1.Message(this);
-      result.name_ = name_;
-      result.content_ = content_;
-      result.languageCode_ = languageCode_;
-      result.participant_ = participant_;
-      result.participantRole_ = participantRole_;
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (sendTimeBuilder_ == null) {
-        result.sendTime_ = sendTime_;
-      } else {
-        result.sendTime_ = sendTimeBuilder_.build();
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.Message result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
       }
-      if (messageAnnotationBuilder_ == null) {
-        result.messageAnnotation_ = messageAnnotation_;
-      } else {
-        result.messageAnnotation_ = messageAnnotationBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.content_ = content_;
       }
-      if (sentimentAnalysisBuilder_ == null) {
-        result.sentimentAnalysis_ = sentimentAnalysis_;
-      } else {
-        result.sentimentAnalysis_ = sentimentAnalysisBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.participant_ = participant_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.participantRole_ = participantRole_;
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.sendTime_ = sendTimeBuilder_ == null ? sendTime_ : sendTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.messageAnnotation_ =
+            messageAnnotationBuilder_ == null
+                ? messageAnnotation_
+                : messageAnnotationBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000100) != 0)) {
+        result.sentimentAnalysis_ =
+            sentimentAnalysisBuilder_ == null
+                ? sentimentAnalysis_
+                : sentimentAnalysisBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -953,18 +971,22 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Message other) {
       if (other == com.google.cloud.dialogflow.v2beta1.Message.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getContent().isEmpty()) {
         content_ = other.content_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getParticipant().isEmpty()) {
         participant_ = other.participant_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (other.participantRole_ != 0) {
@@ -1011,57 +1033,57 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 content_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 participant_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 40:
               {
                 participantRole_ = input.readEnum();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 40
             case 50:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 50
             case 58:
               {
                 input.readMessage(
                     getMessageAnnotationFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 58
             case 66:
               {
                 input.readMessage(
                     getSentimentAnalysisFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000100;
                 break;
               } // case 66
             case 74:
               {
                 input.readMessage(getSendTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 74
             default:
@@ -1081,6 +1103,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -1148,8 +1172,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1167,8 +1191,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1191,8 +1215,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1258,8 +1282,8 @@ public Builder setContent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       content_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1275,8 +1299,8 @@ public Builder setContent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearContent() {
-
       content_ = getDefaultInstance().getContent();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1297,8 +1321,8 @@ public Builder setContentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       content_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1370,8 +1394,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1389,8 +1413,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1413,8 +1437,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1480,8 +1504,8 @@ public Builder setParticipant(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       participant_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1497,8 +1521,8 @@ public Builder setParticipant(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParticipant() {
-
       participant_ = getDefaultInstance().getParticipant();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1519,8 +1543,8 @@ public Builder setParticipantBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       participant_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1558,8 +1582,8 @@ public int getParticipantRoleValue() {
      * @return This builder for chaining.
      */
     public Builder setParticipantRoleValue(int value) {
-
       participantRole_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1578,9 +1602,8 @@ public Builder setParticipantRoleValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.Participant.Role getParticipantRole() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.Participant.Role result =
-          com.google.cloud.dialogflow.v2beta1.Participant.Role.valueOf(participantRole_);
+          com.google.cloud.dialogflow.v2beta1.Participant.Role.forNumber(participantRole_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.Participant.Role.UNRECOGNIZED
           : result;
@@ -1603,7 +1626,7 @@ public Builder setParticipantRole(com.google.cloud.dialogflow.v2beta1.Participan
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000010;
       participantRole_ = value.getNumber();
       onChanged();
       return this;
@@ -1622,7 +1645,7 @@ public Builder setParticipantRole(com.google.cloud.dialogflow.v2beta1.Participan
      * @return This builder for chaining.
      */
     public Builder clearParticipantRole() {
-
+      bitField0_ = (bitField0_ & ~0x00000010);
       participantRole_ = 0;
       onChanged();
       return this;
@@ -1648,7 +1671,7 @@ public Builder clearParticipantRole() {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -1689,11 +1712,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1710,11 +1733,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1730,17 +1753,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
         } else {
           createTime_ = value;
         }
-        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -1755,14 +1779,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * </code>
      */
     public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1777,7 +1800,7 @@ public Builder clearCreateTime() {
      * </code>
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
@@ -1848,7 +1871,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
      * @return Whether the sendTime field is set.
      */
     public boolean hasSendTime() {
-      return sendTimeBuilder_ != null || sendTime_ != null;
+      return ((bitField0_ & 0x00000040) != 0);
     }
     /**
      *
@@ -1885,11 +1908,11 @@ public Builder setSendTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         sendTime_ = value;
-        onChanged();
       } else {
         sendTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -1905,11 +1928,11 @@ public Builder setSendTime(com.google.protobuf.Timestamp value) {
     public Builder setSendTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (sendTimeBuilder_ == null) {
         sendTime_ = builderForValue.build();
-        onChanged();
       } else {
         sendTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -1924,17 +1947,18 @@ public Builder setSendTime(com.google.protobuf.Timestamp.Builder builderForValue
      */
     public Builder mergeSendTime(com.google.protobuf.Timestamp value) {
       if (sendTimeBuilder_ == null) {
-        if (sendTime_ != null) {
-          sendTime_ =
-              com.google.protobuf.Timestamp.newBuilder(sendTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000040) != 0)
+            && sendTime_ != null
+            && sendTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getSendTimeBuilder().mergeFrom(value);
         } else {
           sendTime_ = value;
         }
-        onChanged();
       } else {
         sendTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -1948,14 +1972,13 @@ public Builder mergeSendTime(com.google.protobuf.Timestamp value) {
      * </code>
      */
     public Builder clearSendTime() {
-      if (sendTimeBuilder_ == null) {
-        sendTime_ = null;
-        onChanged();
-      } else {
-        sendTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      sendTime_ = null;
+      if (sendTimeBuilder_ != null) {
+        sendTimeBuilder_.dispose();
         sendTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1969,7 +1992,7 @@ public Builder clearSendTime() {
      * </code>
      */
     public com.google.protobuf.Timestamp.Builder getSendTimeBuilder() {
-
+      bitField0_ |= 0x00000040;
       onChanged();
       return getSendTimeFieldBuilder().getBuilder();
     }
@@ -2037,7 +2060,7 @@ public com.google.protobuf.TimestampOrBuilder getSendTimeOrBuilder() {
      * @return Whether the messageAnnotation field is set.
      */
     public boolean hasMessageAnnotation() {
-      return messageAnnotationBuilder_ != null || messageAnnotation_ != null;
+      return ((bitField0_ & 0x00000080) != 0);
     }
     /**
      *
@@ -2079,11 +2102,11 @@ public Builder setMessageAnnotation(
           throw new NullPointerException();
         }
         messageAnnotation_ = value;
-        onChanged();
       } else {
         messageAnnotationBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2101,11 +2124,11 @@ public Builder setMessageAnnotation(
         com.google.cloud.dialogflow.v2beta1.MessageAnnotation.Builder builderForValue) {
       if (messageAnnotationBuilder_ == null) {
         messageAnnotation_ = builderForValue.build();
-        onChanged();
       } else {
         messageAnnotationBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2122,19 +2145,19 @@ public Builder setMessageAnnotation(
     public Builder mergeMessageAnnotation(
         com.google.cloud.dialogflow.v2beta1.MessageAnnotation value) {
       if (messageAnnotationBuilder_ == null) {
-        if (messageAnnotation_ != null) {
-          messageAnnotation_ =
-              com.google.cloud.dialogflow.v2beta1.MessageAnnotation.newBuilder(messageAnnotation_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000080) != 0)
+            && messageAnnotation_ != null
+            && messageAnnotation_
+                != com.google.cloud.dialogflow.v2beta1.MessageAnnotation.getDefaultInstance()) {
+          getMessageAnnotationBuilder().mergeFrom(value);
         } else {
           messageAnnotation_ = value;
         }
-        onChanged();
       } else {
         messageAnnotationBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2149,14 +2172,13 @@ public Builder mergeMessageAnnotation(
      * </code>
      */
     public Builder clearMessageAnnotation() {
-      if (messageAnnotationBuilder_ == null) {
-        messageAnnotation_ = null;
-        onChanged();
-      } else {
-        messageAnnotation_ = null;
+      bitField0_ = (bitField0_ & ~0x00000080);
+      messageAnnotation_ = null;
+      if (messageAnnotationBuilder_ != null) {
+        messageAnnotationBuilder_.dispose();
         messageAnnotationBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2172,7 +2194,7 @@ public Builder clearMessageAnnotation() {
      */
     public com.google.cloud.dialogflow.v2beta1.MessageAnnotation.Builder
         getMessageAnnotationBuilder() {
-
+      bitField0_ |= 0x00000080;
       onChanged();
       return getMessageAnnotationFieldBuilder().getBuilder();
     }
@@ -2245,7 +2267,7 @@ public Builder clearMessageAnnotation() {
      * @return Whether the sentimentAnalysis field is set.
      */
     public boolean hasSentimentAnalysis() {
-      return sentimentAnalysisBuilder_ != null || sentimentAnalysis_ != null;
+      return ((bitField0_ & 0x00000100) != 0);
     }
     /**
      *
@@ -2287,11 +2309,11 @@ public Builder setSentimentAnalysis(
           throw new NullPointerException();
         }
         sentimentAnalysis_ = value;
-        onChanged();
       } else {
         sentimentAnalysisBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -2309,11 +2331,11 @@ public Builder setSentimentAnalysis(
         com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult.Builder builderForValue) {
       if (sentimentAnalysisBuilder_ == null) {
         sentimentAnalysis_ = builderForValue.build();
-        onChanged();
       } else {
         sentimentAnalysisBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -2330,20 +2352,20 @@ public Builder setSentimentAnalysis(
     public Builder mergeSentimentAnalysis(
         com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult value) {
       if (sentimentAnalysisBuilder_ == null) {
-        if (sentimentAnalysis_ != null) {
-          sentimentAnalysis_ =
-              com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult.newBuilder(
-                      sentimentAnalysis_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000100) != 0)
+            && sentimentAnalysis_ != null
+            && sentimentAnalysis_
+                != com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult
+                    .getDefaultInstance()) {
+          getSentimentAnalysisBuilder().mergeFrom(value);
         } else {
           sentimentAnalysis_ = value;
         }
-        onChanged();
       } else {
         sentimentAnalysisBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -2358,14 +2380,13 @@ public Builder mergeSentimentAnalysis(
      * </code>
      */
     public Builder clearSentimentAnalysis() {
-      if (sentimentAnalysisBuilder_ == null) {
-        sentimentAnalysis_ = null;
-        onChanged();
-      } else {
-        sentimentAnalysis_ = null;
+      bitField0_ = (bitField0_ & ~0x00000100);
+      sentimentAnalysis_ = null;
+      if (sentimentAnalysisBuilder_ != null) {
+        sentimentAnalysisBuilder_.dispose();
         sentimentAnalysisBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2381,7 +2402,7 @@ public Builder clearSentimentAnalysis() {
      */
     public com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult.Builder
         getSentimentAnalysisBuilder() {
-
+      bitField0_ |= 0x00000100;
       onChanged();
       return getSentimentAnalysisFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/MessageAnnotation.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/MessageAnnotation.java
index 40c707b9f491..3b46f2b9b322 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/MessageAnnotation.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/MessageAnnotation.java
@@ -68,6 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.AnnotatedMessagePart> parts_;
   /**
    *
@@ -148,7 +150,7 @@ public com.google.cloud.dialogflow.v2beta1.AnnotatedMessagePartOrBuilder getPart
   }
 
   public static final int CONTAIN_ENTITIES_FIELD_NUMBER = 2;
-  private boolean containEntities_;
+  private boolean containEntities_ = false;
   /**
    *
    *
@@ -374,6 +376,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (partsBuilder_ == null) {
         parts_ = java.util.Collections.emptyList();
       } else {
@@ -382,7 +385,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       containEntities_ = false;
-
       return this;
     }
 
@@ -410,7 +412,16 @@ public com.google.cloud.dialogflow.v2beta1.MessageAnnotation build() {
     public com.google.cloud.dialogflow.v2beta1.MessageAnnotation buildPartial() {
       com.google.cloud.dialogflow.v2beta1.MessageAnnotation result =
           new com.google.cloud.dialogflow.v2beta1.MessageAnnotation(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.MessageAnnotation result) {
       if (partsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           parts_ = java.util.Collections.unmodifiableList(parts_);
@@ -420,9 +431,13 @@ public com.google.cloud.dialogflow.v2beta1.MessageAnnotation buildPartial() {
       } else {
         result.parts_ = partsBuilder_.build();
       }
-      result.containEntities_ = containEntities_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.MessageAnnotation result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.containEntities_ = containEntities_;
+      }
     }
 
     @java.lang.Override
@@ -544,7 +559,7 @@ public Builder mergeFrom(
             case 16:
               {
                 containEntities_ = input.readBool();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             default:
@@ -996,6 +1011,7 @@ public boolean getContainEntities() {
     public Builder setContainEntities(boolean value) {
 
       containEntities_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1011,7 +1027,7 @@ public Builder setContainEntities(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearContainEntities() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       containEntities_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/NotificationConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/NotificationConfig.java
index d4fbfeb261b8..06a229d81d5f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/NotificationConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/NotificationConfig.java
@@ -228,7 +228,9 @@ private MessageFormat(int value) {
   }
 
   public static final int TOPIC_FIELD_NUMBER = 1;
-  private volatile java.lang.Object topic_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object topic_ = "";
   /**
    *
    *
@@ -299,7 +301,7 @@ public com.google.protobuf.ByteString getTopicBytes() {
   }
 
   public static final int MESSAGE_FORMAT_FIELD_NUMBER = 2;
-  private int messageFormat_;
+  private int messageFormat_ = 0;
   /**
    *
    *
@@ -330,9 +332,8 @@ public int getMessageFormatValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.NotificationConfig.MessageFormat getMessageFormat() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.NotificationConfig.MessageFormat result =
-        com.google.cloud.dialogflow.v2beta1.NotificationConfig.MessageFormat.valueOf(
+        com.google.cloud.dialogflow.v2beta1.NotificationConfig.MessageFormat.forNumber(
             messageFormat_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.NotificationConfig.MessageFormat.UNRECOGNIZED
@@ -552,10 +553,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       topic_ = "";
-
       messageFormat_ = 0;
-
       return this;
     }
 
@@ -583,12 +583,23 @@ public com.google.cloud.dialogflow.v2beta1.NotificationConfig build() {
     public com.google.cloud.dialogflow.v2beta1.NotificationConfig buildPartial() {
       com.google.cloud.dialogflow.v2beta1.NotificationConfig result =
           new com.google.cloud.dialogflow.v2beta1.NotificationConfig(this);
-      result.topic_ = topic_;
-      result.messageFormat_ = messageFormat_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.NotificationConfig result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.topic_ = topic_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.messageFormat_ = messageFormat_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -637,6 +648,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.NotificationConfig
         return this;
       if (!other.getTopic().isEmpty()) {
         topic_ = other.topic_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.messageFormat_ != 0) {
@@ -671,13 +683,13 @@ public Builder mergeFrom(
             case 10:
               {
                 topic_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 messageFormat_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             default:
@@ -697,6 +709,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object topic_ = "";
     /**
      *
@@ -791,8 +805,8 @@ public Builder setTopic(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       topic_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -819,8 +833,8 @@ public Builder setTopic(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTopic() {
-
       topic_ = getDefaultInstance().getTopic();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -852,8 +866,8 @@ public Builder setTopicBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       topic_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -889,8 +903,8 @@ public int getMessageFormatValue() {
      * @return This builder for chaining.
      */
     public Builder setMessageFormatValue(int value) {
-
       messageFormat_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -908,9 +922,8 @@ public Builder setMessageFormatValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.NotificationConfig.MessageFormat getMessageFormat() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.NotificationConfig.MessageFormat result =
-          com.google.cloud.dialogflow.v2beta1.NotificationConfig.MessageFormat.valueOf(
+          com.google.cloud.dialogflow.v2beta1.NotificationConfig.MessageFormat.forNumber(
               messageFormat_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.NotificationConfig.MessageFormat.UNRECOGNIZED
@@ -934,7 +947,7 @@ public Builder setMessageFormat(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       messageFormat_ = value.getNumber();
       onChanged();
       return this;
@@ -952,7 +965,7 @@ public Builder setMessageFormat(
      * @return This builder for chaining.
      */
     public Builder clearMessageFormat() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       messageFormat_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OriginalDetectIntentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OriginalDetectIntentRequest.java
index a1d237db2309..cf4fa4659109 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OriginalDetectIntentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OriginalDetectIntentRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SOURCE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object source_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object source_ = "";
   /**
    *
    *
@@ -121,7 +123,9 @@ public com.google.protobuf.ByteString getSourceBytes() {
   }
 
   public static final int VERSION_FIELD_NUMBER = 2;
-  private volatile java.lang.Object version_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object version_ = "";
   /**
    *
    *
@@ -250,7 +254,7 @@ public com.google.protobuf.Struct getPayload() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() {
-    return getPayload();
+    return payload_ == null ? com.google.protobuf.Struct.getDefaultInstance() : payload_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -475,14 +479,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       source_ = "";
-
       version_ = "";
-
-      if (payloadBuilder_ == null) {
-        payload_ = null;
-      } else {
-        payload_ = null;
+      payload_ = null;
+      if (payloadBuilder_ != null) {
+        payloadBuilder_.dispose();
         payloadBuilder_ = null;
       }
       return this;
@@ -513,17 +515,27 @@ public com.google.cloud.dialogflow.v2beta1.OriginalDetectIntentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.OriginalDetectIntentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.OriginalDetectIntentRequest result =
           new com.google.cloud.dialogflow.v2beta1.OriginalDetectIntentRequest(this);
-      result.source_ = source_;
-      result.version_ = version_;
-      if (payloadBuilder_ == null) {
-        result.payload_ = payload_;
-      } else {
-        result.payload_ = payloadBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.OriginalDetectIntentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.source_ = source_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.version_ = version_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.payload_ = payloadBuilder_ == null ? payload_ : payloadBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -574,10 +586,12 @@ public Builder mergeFrom(
         return this;
       if (!other.getSource().isEmpty()) {
         source_ = other.source_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getVersion().isEmpty()) {
         version_ = other.version_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasPayload()) {
@@ -612,19 +626,19 @@ public Builder mergeFrom(
             case 10:
               {
                 source_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 version_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getPayloadFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -644,6 +658,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object source_ = "";
     /**
      *
@@ -708,8 +724,8 @@ public Builder setSource(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       source_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -726,8 +742,8 @@ public Builder setSource(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSource() {
-
       source_ = getDefaultInstance().getSource();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -749,8 +765,8 @@ public Builder setSourceBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       source_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -819,8 +835,8 @@ public Builder setVersion(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       version_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -837,8 +853,8 @@ public Builder setVersion(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearVersion() {
-
       version_ = getDefaultInstance().getVersion();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -860,8 +876,8 @@ public Builder setVersionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       version_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -896,7 +912,7 @@ public Builder setVersionBytes(com.google.protobuf.ByteString value) {
      * @return Whether the payload field is set.
      */
     public boolean hasPayload() {
-      return payloadBuilder_ != null || payload_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -955,11 +971,11 @@ public Builder setPayload(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         payload_ = value;
-        onChanged();
       } else {
         payloadBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -986,11 +1002,11 @@ public Builder setPayload(com.google.protobuf.Struct value) {
     public Builder setPayload(com.google.protobuf.Struct.Builder builderForValue) {
       if (payloadBuilder_ == null) {
         payload_ = builderForValue.build();
-        onChanged();
       } else {
         payloadBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1016,17 +1032,18 @@ public Builder setPayload(com.google.protobuf.Struct.Builder builderForValue) {
      */
     public Builder mergePayload(com.google.protobuf.Struct value) {
       if (payloadBuilder_ == null) {
-        if (payload_ != null) {
-          payload_ =
-              com.google.protobuf.Struct.newBuilder(payload_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && payload_ != null
+            && payload_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getPayloadBuilder().mergeFrom(value);
         } else {
           payload_ = value;
         }
-        onChanged();
       } else {
         payloadBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1051,14 +1068,13 @@ public Builder mergePayload(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct payload = 3;</code>
      */
     public Builder clearPayload() {
-      if (payloadBuilder_ == null) {
-        payload_ = null;
-        onChanged();
-      } else {
-        payload_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      payload_ = null;
+      if (payloadBuilder_ != null) {
+        payloadBuilder_.dispose();
         payloadBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1083,7 +1099,7 @@ public Builder clearPayload() {
      * <code>.google.protobuf.Struct payload = 3;</code>
      */
     public com.google.protobuf.Struct.Builder getPayloadBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getPayloadFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OutputAudio.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OutputAudio.java
index 4f10259abc53..624f4d7a3872 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OutputAudio.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OutputAudio.java
@@ -115,11 +115,13 @@ public com.google.cloud.dialogflow.v2beta1.OutputAudioConfig getConfig() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.OutputAudioConfigOrBuilder getConfigOrBuilder() {
-    return getConfig();
+    return config_ == null
+        ? com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.getDefaultInstance()
+        : config_;
   }
 
   public static final int AUDIO_FIELD_NUMBER = 2;
-  private com.google.protobuf.ByteString audio_;
+  private com.google.protobuf.ByteString audio_ = com.google.protobuf.ByteString.EMPTY;
   /**
    *
    *
@@ -347,14 +349,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (configBuilder_ == null) {
-        config_ = null;
-      } else {
-        config_ = null;
+      bitField0_ = 0;
+      config_ = null;
+      if (configBuilder_ != null) {
+        configBuilder_.dispose();
         configBuilder_ = null;
       }
       audio_ = com.google.protobuf.ByteString.EMPTY;
-
       return this;
     }
 
@@ -382,16 +383,23 @@ public com.google.cloud.dialogflow.v2beta1.OutputAudio build() {
     public com.google.cloud.dialogflow.v2beta1.OutputAudio buildPartial() {
       com.google.cloud.dialogflow.v2beta1.OutputAudio result =
           new com.google.cloud.dialogflow.v2beta1.OutputAudio(this);
-      if (configBuilder_ == null) {
-        result.config_ = config_;
-      } else {
-        result.config_ = configBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.audio_ = audio_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.OutputAudio result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.config_ = configBuilder_ == null ? config_ : configBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.audio_ = audio_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -473,13 +481,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 audio_ = input.readBytes();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -499,6 +507,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2beta1.OutputAudioConfig config_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.OutputAudioConfig,
@@ -518,7 +528,7 @@ public Builder mergeFrom(
      * @return Whether the config field is set.
      */
     public boolean hasConfig() {
-      return configBuilder_ != null || config_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -557,11 +567,11 @@ public Builder setConfig(com.google.cloud.dialogflow.v2beta1.OutputAudioConfig v
           throw new NullPointerException();
         }
         config_ = value;
-        onChanged();
       } else {
         configBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -578,11 +588,11 @@ public Builder setConfig(
         com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.Builder builderForValue) {
       if (configBuilder_ == null) {
         config_ = builderForValue.build();
-        onChanged();
       } else {
         configBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -597,19 +607,19 @@ public Builder setConfig(
      */
     public Builder mergeConfig(com.google.cloud.dialogflow.v2beta1.OutputAudioConfig value) {
       if (configBuilder_ == null) {
-        if (config_ != null) {
-          config_ =
-              com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.newBuilder(config_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && config_ != null
+            && config_
+                != com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.getDefaultInstance()) {
+          getConfigBuilder().mergeFrom(value);
         } else {
           config_ = value;
         }
-        onChanged();
       } else {
         configBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -623,14 +633,13 @@ public Builder mergeConfig(com.google.cloud.dialogflow.v2beta1.OutputAudioConfig
      * <code>.google.cloud.dialogflow.v2beta1.OutputAudioConfig config = 1;</code>
      */
     public Builder clearConfig() {
-      if (configBuilder_ == null) {
-        config_ = null;
-        onChanged();
-      } else {
-        config_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      config_ = null;
+      if (configBuilder_ != null) {
+        configBuilder_.dispose();
         configBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -644,7 +653,7 @@ public Builder clearConfig() {
      * <code>.google.cloud.dialogflow.v2beta1.OutputAudioConfig config = 1;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.Builder getConfigBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getConfigFieldBuilder().getBuilder();
     }
@@ -726,8 +735,8 @@ public Builder setAudio(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       audio_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -743,7 +752,7 @@ public Builder setAudio(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearAudio() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       audio_ = getDefaultInstance().getAudio();
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OutputAudioConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OutputAudioConfig.java
index 485ec93079bb..15c3b69d0415 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OutputAudioConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OutputAudioConfig.java
@@ -70,7 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int AUDIO_ENCODING_FIELD_NUMBER = 1;
-  private int audioEncoding_;
+  private int audioEncoding_ = 0;
   /**
    *
    *
@@ -103,16 +103,15 @@ public int getAudioEncodingValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.OutputAudioEncoding getAudioEncoding() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.OutputAudioEncoding result =
-        com.google.cloud.dialogflow.v2beta1.OutputAudioEncoding.valueOf(audioEncoding_);
+        com.google.cloud.dialogflow.v2beta1.OutputAudioEncoding.forNumber(audioEncoding_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.OutputAudioEncoding.UNRECOGNIZED
         : result;
   }
 
   public static final int SAMPLE_RATE_HERTZ_FIELD_NUMBER = 2;
-  private int sampleRateHertz_;
+  private int sampleRateHertz_ = 0;
   /**
    *
    *
@@ -182,7 +181,9 @@ public com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig getSynthesizeS
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfigOrBuilder
       getSynthesizeSpeechConfigOrBuilder() {
-    return getSynthesizeSpeechConfig();
+    return synthesizeSpeechConfig_ == null
+        ? com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig.getDefaultInstance()
+        : synthesizeSpeechConfig_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -413,14 +414,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       audioEncoding_ = 0;
-
       sampleRateHertz_ = 0;
-
-      if (synthesizeSpeechConfigBuilder_ == null) {
-        synthesizeSpeechConfig_ = null;
-      } else {
-        synthesizeSpeechConfig_ = null;
+      synthesizeSpeechConfig_ = null;
+      if (synthesizeSpeechConfigBuilder_ != null) {
+        synthesizeSpeechConfigBuilder_.dispose();
         synthesizeSpeechConfigBuilder_ = null;
       }
       return this;
@@ -450,17 +449,29 @@ public com.google.cloud.dialogflow.v2beta1.OutputAudioConfig build() {
     public com.google.cloud.dialogflow.v2beta1.OutputAudioConfig buildPartial() {
       com.google.cloud.dialogflow.v2beta1.OutputAudioConfig result =
           new com.google.cloud.dialogflow.v2beta1.OutputAudioConfig(this);
-      result.audioEncoding_ = audioEncoding_;
-      result.sampleRateHertz_ = sampleRateHertz_;
-      if (synthesizeSpeechConfigBuilder_ == null) {
-        result.synthesizeSpeechConfig_ = synthesizeSpeechConfig_;
-      } else {
-        result.synthesizeSpeechConfig_ = synthesizeSpeechConfigBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.OutputAudioConfig result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.audioEncoding_ = audioEncoding_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.sampleRateHertz_ = sampleRateHertz_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.synthesizeSpeechConfig_ =
+            synthesizeSpeechConfigBuilder_ == null
+                ? synthesizeSpeechConfig_
+                : synthesizeSpeechConfigBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -545,20 +556,20 @@ public Builder mergeFrom(
             case 8:
               {
                 audioEncoding_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 16:
               {
                 sampleRateHertz_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 input.readMessage(
                     getSynthesizeSpeechConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -578,6 +589,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private int audioEncoding_ = 0;
     /**
      *
@@ -611,8 +624,8 @@ public int getAudioEncodingValue() {
      * @return This builder for chaining.
      */
     public Builder setAudioEncodingValue(int value) {
-
       audioEncoding_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -631,9 +644,8 @@ public Builder setAudioEncodingValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.OutputAudioEncoding getAudioEncoding() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.OutputAudioEncoding result =
-          com.google.cloud.dialogflow.v2beta1.OutputAudioEncoding.valueOf(audioEncoding_);
+          com.google.cloud.dialogflow.v2beta1.OutputAudioEncoding.forNumber(audioEncoding_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.OutputAudioEncoding.UNRECOGNIZED
           : result;
@@ -656,7 +668,7 @@ public Builder setAudioEncoding(com.google.cloud.dialogflow.v2beta1.OutputAudioE
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       audioEncoding_ = value.getNumber();
       onChanged();
       return this;
@@ -675,7 +687,7 @@ public Builder setAudioEncoding(com.google.cloud.dialogflow.v2beta1.OutputAudioE
      * @return This builder for chaining.
      */
     public Builder clearAudioEncoding() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       audioEncoding_ = 0;
       onChanged();
       return this;
@@ -720,6 +732,7 @@ public int getSampleRateHertz() {
     public Builder setSampleRateHertz(int value) {
 
       sampleRateHertz_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -739,7 +752,7 @@ public Builder setSampleRateHertz(int value) {
      * @return This builder for chaining.
      */
     public Builder clearSampleRateHertz() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       sampleRateHertz_ = 0;
       onChanged();
       return this;
@@ -764,7 +777,7 @@ public Builder clearSampleRateHertz() {
      * @return Whether the synthesizeSpeechConfig field is set.
      */
     public boolean hasSynthesizeSpeechConfig() {
-      return synthesizeSpeechConfigBuilder_ != null || synthesizeSpeechConfig_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -804,11 +817,11 @@ public Builder setSynthesizeSpeechConfig(
           throw new NullPointerException();
         }
         synthesizeSpeechConfig_ = value;
-        onChanged();
       } else {
         synthesizeSpeechConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -825,11 +838,11 @@ public Builder setSynthesizeSpeechConfig(
         com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig.Builder builderForValue) {
       if (synthesizeSpeechConfigBuilder_ == null) {
         synthesizeSpeechConfig_ = builderForValue.build();
-        onChanged();
       } else {
         synthesizeSpeechConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -845,20 +858,20 @@ public Builder setSynthesizeSpeechConfig(
     public Builder mergeSynthesizeSpeechConfig(
         com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig value) {
       if (synthesizeSpeechConfigBuilder_ == null) {
-        if (synthesizeSpeechConfig_ != null) {
-          synthesizeSpeechConfig_ =
-              com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig.newBuilder(
-                      synthesizeSpeechConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && synthesizeSpeechConfig_ != null
+            && synthesizeSpeechConfig_
+                != com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig
+                    .getDefaultInstance()) {
+          getSynthesizeSpeechConfigBuilder().mergeFrom(value);
         } else {
           synthesizeSpeechConfig_ = value;
         }
-        onChanged();
       } else {
         synthesizeSpeechConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -872,14 +885,13 @@ public Builder mergeSynthesizeSpeechConfig(
      * </code>
      */
     public Builder clearSynthesizeSpeechConfig() {
-      if (synthesizeSpeechConfigBuilder_ == null) {
-        synthesizeSpeechConfig_ = null;
-        onChanged();
-      } else {
-        synthesizeSpeechConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      synthesizeSpeechConfig_ = null;
+      if (synthesizeSpeechConfigBuilder_ != null) {
+        synthesizeSpeechConfigBuilder_.dispose();
         synthesizeSpeechConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -894,7 +906,7 @@ public Builder clearSynthesizeSpeechConfig() {
      */
     public com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig.Builder
         getSynthesizeSpeechConfigBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getSynthesizeSpeechConfigFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Participant.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Participant.java
index 98519065fe05..94b79ad4f752 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Participant.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Participant.java
@@ -262,7 +262,9 @@ private Role(int value) {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -315,7 +317,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int ROLE_FIELD_NUMBER = 2;
-  private int role_;
+  private int role_ = 0;
   /**
    *
    *
@@ -350,16 +352,17 @@ public int getRoleValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.Participant.Role getRole() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.Participant.Role result =
-        com.google.cloud.dialogflow.v2beta1.Participant.Role.valueOf(role_);
+        com.google.cloud.dialogflow.v2beta1.Participant.Role.forNumber(role_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.Participant.Role.UNRECOGNIZED
         : result;
   }
 
   public static final int OBFUSCATED_EXTERNAL_USER_ID_FIELD_NUMBER = 7;
-  private volatile java.lang.Object obfuscatedExternalUserId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object obfuscatedExternalUserId_ = "";
   /**
    *
    *
@@ -462,6 +465,7 @@ private static final class DocumentsMetadataFiltersDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.String>
       documentsMetadataFilters_;
 
@@ -573,8 +577,10 @@ public java.util.Map<java.lang.String, java.lang.String> getDocumentsMetadataFil
    * </code>
    */
   @java.lang.Override
-  public java.lang.String getDocumentsMetadataFiltersOrDefault(
-      java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getDocumentsMetadataFiltersOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -881,12 +887,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       role_ = 0;
-
       obfuscatedExternalUserId_ = "";
-
       internalGetMutableDocumentsMetadataFilters().clear();
       return this;
     }
@@ -915,16 +919,30 @@ public com.google.cloud.dialogflow.v2beta1.Participant build() {
     public com.google.cloud.dialogflow.v2beta1.Participant buildPartial() {
       com.google.cloud.dialogflow.v2beta1.Participant result =
           new com.google.cloud.dialogflow.v2beta1.Participant(this);
-      int from_bitField0_ = bitField0_;
-      result.name_ = name_;
-      result.role_ = role_;
-      result.obfuscatedExternalUserId_ = obfuscatedExternalUserId_;
-      result.documentsMetadataFilters_ = internalGetDocumentsMetadataFilters();
-      result.documentsMetadataFilters_.makeImmutable();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.Participant result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.role_ = role_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.obfuscatedExternalUserId_ = obfuscatedExternalUserId_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.documentsMetadataFilters_ = internalGetDocumentsMetadataFilters();
+        result.documentsMetadataFilters_.makeImmutable();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -973,6 +991,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Participant other)
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.role_ != 0) {
@@ -980,10 +999,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Participant other)
       }
       if (!other.getObfuscatedExternalUserId().isEmpty()) {
         obfuscatedExternalUserId_ = other.obfuscatedExternalUserId_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       internalGetMutableDocumentsMetadataFilters()
           .mergeFrom(other.internalGetDocumentsMetadataFilters());
+      bitField0_ |= 0x00000008;
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -1013,19 +1034,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 role_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 58:
               {
                 obfuscatedExternalUserId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 58
             case 66:
@@ -1040,6 +1061,7 @@ public Builder mergeFrom(
                     .getMutableMap()
                     .put(
                         documentsMetadataFilters__.getKey(), documentsMetadataFilters__.getValue());
+                bitField0_ |= 0x00000008;
                 break;
               } // case 66
             default:
@@ -1128,8 +1150,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1147,8 +1169,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1171,8 +1193,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1212,8 +1234,8 @@ public int getRoleValue() {
      * @return This builder for chaining.
      */
     public Builder setRoleValue(int value) {
-
       role_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1233,9 +1255,8 @@ public Builder setRoleValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.Participant.Role getRole() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.Participant.Role result =
-          com.google.cloud.dialogflow.v2beta1.Participant.Role.valueOf(role_);
+          com.google.cloud.dialogflow.v2beta1.Participant.Role.forNumber(role_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.Participant.Role.UNRECOGNIZED
           : result;
@@ -1259,7 +1280,7 @@ public Builder setRole(com.google.cloud.dialogflow.v2beta1.Participant.Role valu
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       role_ = value.getNumber();
       onChanged();
       return this;
@@ -1279,7 +1300,7 @@ public Builder setRole(com.google.cloud.dialogflow.v2beta1.Participant.Role valu
      * @return This builder for chaining.
      */
     public Builder clearRole() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       role_ = 0;
       onChanged();
       return this;
@@ -1412,8 +1433,8 @@ public Builder setObfuscatedExternalUserId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       obfuscatedExternalUserId_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1451,8 +1472,8 @@ public Builder setObfuscatedExternalUserId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearObfuscatedExternalUserId() {
-
       obfuscatedExternalUserId_ = getDefaultInstance().getObfuscatedExternalUserId();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1495,8 +1516,8 @@ public Builder setObfuscatedExternalUserIdBytes(com.google.protobuf.ByteString v
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       obfuscatedExternalUserId_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1515,8 +1536,6 @@ public Builder setObfuscatedExternalUserIdBytes(com.google.protobuf.ByteString v
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
         internalGetMutableDocumentsMetadataFilters() {
-      onChanged();
-      ;
       if (documentsMetadataFilters_ == null) {
         documentsMetadataFilters_ =
             com.google.protobuf.MapField.newMapField(
@@ -1525,6 +1544,8 @@ public Builder setObfuscatedExternalUserIdBytes(com.google.protobuf.ByteString v
       if (!documentsMetadataFilters_.isMutable()) {
         documentsMetadataFilters_ = documentsMetadataFilters_.copy();
       }
+      bitField0_ |= 0x00000008;
+      onChanged();
       return documentsMetadataFilters_;
     }
 
@@ -1627,8 +1648,10 @@ public java.util.Map<java.lang.String, java.lang.String> getDocumentsMetadataFil
      * </code>
      */
     @java.lang.Override
-    public java.lang.String getDocumentsMetadataFiltersOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getDocumentsMetadataFiltersOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1676,6 +1699,7 @@ public java.lang.String getDocumentsMetadataFiltersOrThrow(java.lang.String key)
     }
 
     public Builder clearDocumentsMetadataFilters() {
+      bitField0_ = (bitField0_ & ~0x00000008);
       internalGetMutableDocumentsMetadataFilters().getMutableMap().clear();
       return this;
     }
@@ -1715,6 +1739,7 @@ public Builder removeDocumentsMetadataFilters(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMutableDocumentsMetadataFilters() {
+      bitField0_ |= 0x00000008;
       return internalGetMutableDocumentsMetadataFilters().getMutableMap();
     }
     /**
@@ -1750,8 +1775,8 @@ public Builder putDocumentsMetadataFilters(java.lang.String key, java.lang.Strin
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableDocumentsMetadataFilters().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000008;
       return this;
     }
     /**
@@ -1783,6 +1808,7 @@ public Builder putDocumentsMetadataFilters(java.lang.String key, java.lang.Strin
     public Builder putAllDocumentsMetadataFilters(
         java.util.Map<java.lang.String, java.lang.String> values) {
       internalGetMutableDocumentsMetadataFilters().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000008;
       return this;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ParticipantOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ParticipantOrBuilder.java
index a6641be62a68..76a16b5cff62 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ParticipantOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ParticipantOrBuilder.java
@@ -260,7 +260,6 @@ public interface ParticipantOrBuilder
    * map&lt;string, string&gt; documents_metadata_filters = 8 [(.google.api.field_behavior) = OPTIONAL];
    * </code>
    */
-
   /* nullable */
   java.lang.String getDocumentsMetadataFiltersOrDefault(
       java.lang.String key,
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryInput.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryInput.java
index 9e497502f152..2906f08b4c33 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryInput.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryInput.java
@@ -587,6 +587,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (audioConfigBuilder_ != null) {
         audioConfigBuilder_.clear();
       }
@@ -628,37 +629,33 @@ public com.google.cloud.dialogflow.v2beta1.QueryInput build() {
     public com.google.cloud.dialogflow.v2beta1.QueryInput buildPartial() {
       com.google.cloud.dialogflow.v2beta1.QueryInput result =
           new com.google.cloud.dialogflow.v2beta1.QueryInput(this);
-      if (inputCase_ == 1) {
-        if (audioConfigBuilder_ == null) {
-          result.input_ = input_;
-        } else {
-          result.input_ = audioConfigBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (inputCase_ == 2) {
-        if (textBuilder_ == null) {
-          result.input_ = input_;
-        } else {
-          result.input_ = textBuilder_.build();
-        }
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.QueryInput result) {
+      int from_bitField0_ = bitField0_;
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2beta1.QueryInput result) {
+      result.inputCase_ = inputCase_;
+      result.input_ = this.input_;
+      if (inputCase_ == 1 && audioConfigBuilder_ != null) {
+        result.input_ = audioConfigBuilder_.build();
       }
-      if (inputCase_ == 3) {
-        if (eventBuilder_ == null) {
-          result.input_ = input_;
-        } else {
-          result.input_ = eventBuilder_.build();
-        }
+      if (inputCase_ == 2 && textBuilder_ != null) {
+        result.input_ = textBuilder_.build();
       }
-      if (inputCase_ == 4) {
-        if (dtmfBuilder_ == null) {
-          result.input_ = input_;
-        } else {
-          result.input_ = dtmfBuilder_.build();
-        }
+      if (inputCase_ == 3 && eventBuilder_ != null) {
+        result.input_ = eventBuilder_.build();
+      }
+      if (inputCase_ == 4 && dtmfBuilder_ != null) {
+        result.input_ = dtmfBuilder_.build();
       }
-      result.inputCase_ = inputCase_;
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -813,6 +810,8 @@ public Builder clearInput() {
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.InputAudioConfig,
             com.google.cloud.dialogflow.v2beta1.InputAudioConfig.Builder,
@@ -1020,7 +1019,6 @@ public com.google.cloud.dialogflow.v2beta1.InputAudioConfigOrBuilder getAudioCon
       }
       inputCase_ = 1;
       onChanged();
-      ;
       return audioConfigBuilder_;
     }
 
@@ -1229,7 +1227,6 @@ public com.google.cloud.dialogflow.v2beta1.TextInputOrBuilder getTextOrBuilder()
       }
       inputCase_ = 2;
       onChanged();
-      ;
       return textBuilder_;
     }
 
@@ -1439,7 +1436,6 @@ public com.google.cloud.dialogflow.v2beta1.EventInputOrBuilder getEventOrBuilder
       }
       inputCase_ = 3;
       onChanged();
-      ;
       return eventBuilder_;
     }
 
@@ -1650,7 +1646,6 @@ public com.google.cloud.dialogflow.v2beta1.TelephonyDtmfEventsOrBuilder getDtmfO
       }
       inputCase_ = 4;
       onChanged();
-      ;
       return dtmfBuilder_;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryParameters.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryParameters.java
index 4aa366528e90..9b6645f47258 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryParameters.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryParameters.java
@@ -83,7 +83,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   }
 
   public static final int TIME_ZONE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object timeZone_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object timeZone_ = "";
   /**
    *
    *
@@ -180,10 +182,12 @@ public com.google.type.LatLng getGeoLocation() {
    */
   @java.lang.Override
   public com.google.type.LatLngOrBuilder getGeoLocationOrBuilder() {
-    return getGeoLocation();
+    return geoLocation_ == null ? com.google.type.LatLng.getDefaultInstance() : geoLocation_;
   }
 
   public static final int CONTEXTS_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Context> contexts_;
   /**
    *
@@ -258,7 +262,7 @@ public com.google.cloud.dialogflow.v2beta1.ContextOrBuilder getContextsOrBuilder
   }
 
   public static final int RESET_CONTEXTS_FIELD_NUMBER = 4;
-  private boolean resetContexts_;
+  private boolean resetContexts_ = false;
   /**
    *
    *
@@ -277,6 +281,8 @@ public boolean getResetContexts() {
   }
 
   public static final int SESSION_ENTITY_TYPES_FIELD_NUMBER = 5;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.SessionEntityType> sessionEntityTypes_;
   /**
    *
@@ -417,10 +423,12 @@ public com.google.protobuf.Struct getPayload() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() {
-    return getPayload();
+    return payload_ == null ? com.google.protobuf.Struct.getDefaultInstance() : payload_;
   }
 
   public static final int KNOWLEDGE_BASE_NAMES_FIELD_NUMBER = 12;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList knowledgeBaseNames_;
   /**
    *
@@ -552,10 +560,14 @@ public boolean hasSentimentAnalysisRequestConfig() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.SentimentAnalysisRequestConfigOrBuilder
       getSentimentAnalysisRequestConfigOrBuilder() {
-    return getSentimentAnalysisRequestConfig();
+    return sentimentAnalysisRequestConfig_ == null
+        ? com.google.cloud.dialogflow.v2beta1.SentimentAnalysisRequestConfig.getDefaultInstance()
+        : sentimentAnalysisRequestConfig_;
   }
 
   public static final int SUB_AGENTS_FIELD_NUMBER = 13;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.SubAgent> subAgents_;
   /**
    *
@@ -652,6 +664,7 @@ private static final class WebhookHeadersDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<java.lang.String, java.lang.String> webhookHeaders_;
 
   private com.google.protobuf.MapField<java.lang.String, java.lang.String>
@@ -732,8 +745,10 @@ public java.util.Map<java.lang.String, java.lang.String> getWebhookHeadersMap()
    * <code>map&lt;string, string&gt; webhook_headers = 14;</code>
    */
   @java.lang.Override
-  public java.lang.String getWebhookHeadersOrDefault(
-      java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getWebhookHeadersOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -1107,12 +1122,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       timeZone_ = "";
-
-      if (geoLocationBuilder_ == null) {
-        geoLocation_ = null;
-      } else {
-        geoLocation_ = null;
+      geoLocation_ = null;
+      if (geoLocationBuilder_ != null) {
+        geoLocationBuilder_.dispose();
         geoLocationBuilder_ = null;
       }
       if (contextsBuilder_ == null) {
@@ -1121,28 +1135,25 @@ public Builder clear() {
         contexts_ = null;
         contextsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000004);
       resetContexts_ = false;
-
       if (sessionEntityTypesBuilder_ == null) {
         sessionEntityTypes_ = java.util.Collections.emptyList();
       } else {
         sessionEntityTypes_ = null;
         sessionEntityTypesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
-      if (payloadBuilder_ == null) {
-        payload_ = null;
-      } else {
-        payload_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      payload_ = null;
+      if (payloadBuilder_ != null) {
+        payloadBuilder_.dispose();
         payloadBuilder_ = null;
       }
       knowledgeBaseNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000004);
-      if (sentimentAnalysisRequestConfigBuilder_ == null) {
-        sentimentAnalysisRequestConfig_ = null;
-      } else {
-        sentimentAnalysisRequestConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      sentimentAnalysisRequestConfig_ = null;
+      if (sentimentAnalysisRequestConfigBuilder_ != null) {
+        sentimentAnalysisRequestConfigBuilder_.dispose();
         sentimentAnalysisRequestConfigBuilder_ = null;
       }
       if (subAgentsBuilder_ == null) {
@@ -1151,7 +1162,7 @@ public Builder clear() {
         subAgents_ = null;
         subAgentsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000008);
+      bitField0_ = (bitField0_ & ~0x00000100);
       internalGetMutableWebhookHeaders().clear();
       return this;
     }
@@ -1180,60 +1191,75 @@ public com.google.cloud.dialogflow.v2beta1.QueryParameters build() {
     public com.google.cloud.dialogflow.v2beta1.QueryParameters buildPartial() {
       com.google.cloud.dialogflow.v2beta1.QueryParameters result =
           new com.google.cloud.dialogflow.v2beta1.QueryParameters(this);
-      int from_bitField0_ = bitField0_;
-      result.timeZone_ = timeZone_;
-      if (geoLocationBuilder_ == null) {
-        result.geoLocation_ = geoLocation_;
-      } else {
-        result.geoLocation_ = geoLocationBuilder_.build();
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.QueryParameters result) {
       if (contextsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000004) != 0)) {
           contexts_ = java.util.Collections.unmodifiableList(contexts_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.contexts_ = contexts_;
       } else {
         result.contexts_ = contextsBuilder_.build();
       }
-      result.resetContexts_ = resetContexts_;
       if (sessionEntityTypesBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000010) != 0)) {
           sessionEntityTypes_ = java.util.Collections.unmodifiableList(sessionEntityTypes_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000010);
         }
         result.sessionEntityTypes_ = sessionEntityTypes_;
       } else {
         result.sessionEntityTypes_ = sessionEntityTypesBuilder_.build();
       }
-      if (payloadBuilder_ == null) {
-        result.payload_ = payload_;
-      } else {
-        result.payload_ = payloadBuilder_.build();
-      }
-      if (((bitField0_ & 0x00000004) != 0)) {
+      if (((bitField0_ & 0x00000040) != 0)) {
         knowledgeBaseNames_ = knowledgeBaseNames_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000040);
       }
       result.knowledgeBaseNames_ = knowledgeBaseNames_;
-      if (sentimentAnalysisRequestConfigBuilder_ == null) {
-        result.sentimentAnalysisRequestConfig_ = sentimentAnalysisRequestConfig_;
-      } else {
-        result.sentimentAnalysisRequestConfig_ = sentimentAnalysisRequestConfigBuilder_.build();
-      }
       if (subAgentsBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)) {
+        if (((bitField0_ & 0x00000100) != 0)) {
           subAgents_ = java.util.Collections.unmodifiableList(subAgents_);
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00000100);
         }
         result.subAgents_ = subAgents_;
       } else {
         result.subAgents_ = subAgentsBuilder_.build();
       }
-      result.webhookHeaders_ = internalGetWebhookHeaders();
-      result.webhookHeaders_.makeImmutable();
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.QueryParameters result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.timeZone_ = timeZone_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.geoLocation_ =
+            geoLocationBuilder_ == null ? geoLocation_ : geoLocationBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.resetContexts_ = resetContexts_;
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.payload_ = payloadBuilder_ == null ? payload_ : payloadBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.sentimentAnalysisRequestConfig_ =
+            sentimentAnalysisRequestConfigBuilder_ == null
+                ? sentimentAnalysisRequestConfig_
+                : sentimentAnalysisRequestConfigBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000200) != 0)) {
+        result.webhookHeaders_ = internalGetWebhookHeaders();
+        result.webhookHeaders_.makeImmutable();
+      }
     }
 
     @java.lang.Override
@@ -1284,6 +1310,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.QueryParameters oth
         return this;
       if (!other.getTimeZone().isEmpty()) {
         timeZone_ = other.timeZone_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasGeoLocation()) {
@@ -1293,7 +1320,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.QueryParameters oth
         if (!other.contexts_.isEmpty()) {
           if (contexts_.isEmpty()) {
             contexts_ = other.contexts_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureContextsIsMutable();
             contexts_.addAll(other.contexts_);
@@ -1306,7 +1333,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.QueryParameters oth
             contextsBuilder_.dispose();
             contextsBuilder_ = null;
             contexts_ = other.contexts_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
             contextsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getContextsFieldBuilder()
@@ -1323,7 +1350,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.QueryParameters oth
         if (!other.sessionEntityTypes_.isEmpty()) {
           if (sessionEntityTypes_.isEmpty()) {
             sessionEntityTypes_ = other.sessionEntityTypes_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
             ensureSessionEntityTypesIsMutable();
             sessionEntityTypes_.addAll(other.sessionEntityTypes_);
@@ -1336,7 +1363,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.QueryParameters oth
             sessionEntityTypesBuilder_.dispose();
             sessionEntityTypesBuilder_ = null;
             sessionEntityTypes_ = other.sessionEntityTypes_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000010);
             sessionEntityTypesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getSessionEntityTypesFieldBuilder()
@@ -1352,7 +1379,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.QueryParameters oth
       if (!other.knowledgeBaseNames_.isEmpty()) {
         if (knowledgeBaseNames_.isEmpty()) {
           knowledgeBaseNames_ = other.knowledgeBaseNames_;
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000040);
         } else {
           ensureKnowledgeBaseNamesIsMutable();
           knowledgeBaseNames_.addAll(other.knowledgeBaseNames_);
@@ -1366,7 +1393,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.QueryParameters oth
         if (!other.subAgents_.isEmpty()) {
           if (subAgents_.isEmpty()) {
             subAgents_ = other.subAgents_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000100);
           } else {
             ensureSubAgentsIsMutable();
             subAgents_.addAll(other.subAgents_);
@@ -1379,7 +1406,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.QueryParameters oth
             subAgentsBuilder_.dispose();
             subAgentsBuilder_ = null;
             subAgents_ = other.subAgents_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000100);
             subAgentsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getSubAgentsFieldBuilder()
@@ -1390,6 +1417,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.QueryParameters oth
         }
       }
       internalGetMutableWebhookHeaders().mergeFrom(other.internalGetWebhookHeaders());
+      bitField0_ |= 0x00000200;
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -1419,13 +1447,13 @@ public Builder mergeFrom(
             case 10:
               {
                 timeZone_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getGeoLocationFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
@@ -1444,7 +1472,7 @@ public Builder mergeFrom(
             case 32:
               {
                 resetContexts_ = input.readBool();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 32
             case 42:
@@ -1464,7 +1492,7 @@ public Builder mergeFrom(
             case 50:
               {
                 input.readMessage(getPayloadFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 50
             case 82:
@@ -1472,7 +1500,7 @@ public Builder mergeFrom(
                 input.readMessage(
                     getSentimentAnalysisRequestConfigFieldBuilder().getBuilder(),
                     extensionRegistry);
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 82
             case 98:
@@ -1504,6 +1532,7 @@ public Builder mergeFrom(
                 internalGetMutableWebhookHeaders()
                     .getMutableMap()
                     .put(webhookHeaders__.getKey(), webhookHeaders__.getValue());
+                bitField0_ |= 0x00000200;
                 break;
               } // case 114
             default:
@@ -1595,8 +1624,8 @@ public Builder setTimeZone(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       timeZone_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1615,8 +1644,8 @@ public Builder setTimeZone(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTimeZone() {
-
       timeZone_ = getDefaultInstance().getTimeZone();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1640,8 +1669,8 @@ public Builder setTimeZoneBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       timeZone_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1662,7 +1691,7 @@ public Builder setTimeZoneBytes(com.google.protobuf.ByteString value) {
      * @return Whether the geoLocation field is set.
      */
     public boolean hasGeoLocation() {
-      return geoLocationBuilder_ != null || geoLocation_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -1697,11 +1726,11 @@ public Builder setGeoLocation(com.google.type.LatLng value) {
           throw new NullPointerException();
         }
         geoLocation_ = value;
-        onChanged();
       } else {
         geoLocationBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1716,11 +1745,11 @@ public Builder setGeoLocation(com.google.type.LatLng value) {
     public Builder setGeoLocation(com.google.type.LatLng.Builder builderForValue) {
       if (geoLocationBuilder_ == null) {
         geoLocation_ = builderForValue.build();
-        onChanged();
       } else {
         geoLocationBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1734,17 +1763,18 @@ public Builder setGeoLocation(com.google.type.LatLng.Builder builderForValue) {
      */
     public Builder mergeGeoLocation(com.google.type.LatLng value) {
       if (geoLocationBuilder_ == null) {
-        if (geoLocation_ != null) {
-          geoLocation_ =
-              com.google.type.LatLng.newBuilder(geoLocation_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && geoLocation_ != null
+            && geoLocation_ != com.google.type.LatLng.getDefaultInstance()) {
+          getGeoLocationBuilder().mergeFrom(value);
         } else {
           geoLocation_ = value;
         }
-        onChanged();
       } else {
         geoLocationBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1757,14 +1787,13 @@ public Builder mergeGeoLocation(com.google.type.LatLng value) {
      * <code>.google.type.LatLng geo_location = 2;</code>
      */
     public Builder clearGeoLocation() {
-      if (geoLocationBuilder_ == null) {
-        geoLocation_ = null;
-        onChanged();
-      } else {
-        geoLocation_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      geoLocation_ = null;
+      if (geoLocationBuilder_ != null) {
+        geoLocationBuilder_.dispose();
         geoLocationBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1777,7 +1806,7 @@ public Builder clearGeoLocation() {
      * <code>.google.type.LatLng geo_location = 2;</code>
      */
     public com.google.type.LatLng.Builder getGeoLocationBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getGeoLocationFieldBuilder().getBuilder();
     }
@@ -1825,9 +1854,9 @@ public com.google.type.LatLngOrBuilder getGeoLocationOrBuilder() {
         java.util.Collections.emptyList();
 
     private void ensureContextsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         contexts_ = new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.Context>(contexts_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000004;
       }
     }
 
@@ -2054,7 +2083,7 @@ public Builder addAllContexts(
     public Builder clearContexts() {
       if (contextsBuilder_ == null) {
         contexts_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
       } else {
         contextsBuilder_.clear();
@@ -2183,7 +2212,7 @@ public com.google.cloud.dialogflow.v2beta1.Context.Builder addContextsBuilder(in
                 com.google.cloud.dialogflow.v2beta1.Context,
                 com.google.cloud.dialogflow.v2beta1.Context.Builder,
                 com.google.cloud.dialogflow.v2beta1.ContextOrBuilder>(
-                contexts_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                contexts_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
         contexts_ = null;
       }
       return contextsBuilder_;
@@ -2222,6 +2251,7 @@ public boolean getResetContexts() {
     public Builder setResetContexts(boolean value) {
 
       resetContexts_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2238,7 +2268,7 @@ public Builder setResetContexts(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearResetContexts() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       resetContexts_ = false;
       onChanged();
       return this;
@@ -2248,11 +2278,11 @@ public Builder clearResetContexts() {
         sessionEntityTypes_ = java.util.Collections.emptyList();
 
     private void ensureSessionEntityTypesIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         sessionEntityTypes_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.SessionEntityType>(
                 sessionEntityTypes_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000010;
       }
     }
 
@@ -2506,7 +2536,7 @@ public Builder addAllSessionEntityTypes(
     public Builder clearSessionEntityTypes() {
       if (sessionEntityTypesBuilder_ == null) {
         sessionEntityTypes_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
       } else {
         sessionEntityTypesBuilder_.clear();
@@ -2655,7 +2685,7 @@ public Builder removeSessionEntityTypes(int index) {
                 com.google.cloud.dialogflow.v2beta1.SessionEntityType.Builder,
                 com.google.cloud.dialogflow.v2beta1.SessionEntityTypeOrBuilder>(
                 sessionEntityTypes_,
-                ((bitField0_ & 0x00000002) != 0),
+                ((bitField0_ & 0x00000010) != 0),
                 getParentForChildren(),
                 isClean());
         sessionEntityTypes_ = null;
@@ -2685,7 +2715,7 @@ public Builder removeSessionEntityTypes(int index) {
      * @return Whether the payload field is set.
      */
     public boolean hasPayload() {
-      return payloadBuilder_ != null || payload_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -2728,11 +2758,11 @@ public Builder setPayload(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         payload_ = value;
-        onChanged();
       } else {
         payloadBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2751,11 +2781,11 @@ public Builder setPayload(com.google.protobuf.Struct value) {
     public Builder setPayload(com.google.protobuf.Struct.Builder builderForValue) {
       if (payloadBuilder_ == null) {
         payload_ = builderForValue.build();
-        onChanged();
       } else {
         payloadBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2773,17 +2803,18 @@ public Builder setPayload(com.google.protobuf.Struct.Builder builderForValue) {
      */
     public Builder mergePayload(com.google.protobuf.Struct value) {
       if (payloadBuilder_ == null) {
-        if (payload_ != null) {
-          payload_ =
-              com.google.protobuf.Struct.newBuilder(payload_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && payload_ != null
+            && payload_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getPayloadBuilder().mergeFrom(value);
         } else {
           payload_ = value;
         }
-        onChanged();
       } else {
         payloadBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2800,14 +2831,13 @@ public Builder mergePayload(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct payload = 6;</code>
      */
     public Builder clearPayload() {
-      if (payloadBuilder_ == null) {
-        payload_ = null;
-        onChanged();
-      } else {
-        payload_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      payload_ = null;
+      if (payloadBuilder_ != null) {
+        payloadBuilder_.dispose();
         payloadBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2824,7 +2854,7 @@ public Builder clearPayload() {
      * <code>.google.protobuf.Struct payload = 6;</code>
      */
     public com.google.protobuf.Struct.Builder getPayloadBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getPayloadFieldBuilder().getBuilder();
     }
@@ -2882,9 +2912,9 @@ public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureKnowledgeBaseNamesIsMutable() {
-      if (!((bitField0_ & 0x00000004) != 0)) {
+      if (!((bitField0_ & 0x00000040) != 0)) {
         knowledgeBaseNames_ = new com.google.protobuf.LazyStringArrayList(knowledgeBaseNames_);
-        bitField0_ |= 0x00000004;
+        bitField0_ |= 0x00000040;
       }
     }
     /**
@@ -3035,7 +3065,7 @@ public Builder addAllKnowledgeBaseNames(java.lang.Iterable<java.lang.String> val
      */
     public Builder clearKnowledgeBaseNames() {
       knowledgeBaseNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000004);
+      bitField0_ = (bitField0_ & ~0x00000040);
       onChanged();
       return this;
     }
@@ -3088,8 +3118,7 @@ public Builder addKnowledgeBaseNamesBytes(com.google.protobuf.ByteString value)
      * @return Whether the sentimentAnalysisRequestConfig field is set.
      */
     public boolean hasSentimentAnalysisRequestConfig() {
-      return sentimentAnalysisRequestConfigBuilder_ != null
-          || sentimentAnalysisRequestConfig_ != null;
+      return ((bitField0_ & 0x00000080) != 0);
     }
     /**
      *
@@ -3139,11 +3168,11 @@ public Builder setSentimentAnalysisRequestConfig(
           throw new NullPointerException();
         }
         sentimentAnalysisRequestConfig_ = value;
-        onChanged();
       } else {
         sentimentAnalysisRequestConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -3165,11 +3194,11 @@ public Builder setSentimentAnalysisRequestConfig(
             builderForValue) {
       if (sentimentAnalysisRequestConfigBuilder_ == null) {
         sentimentAnalysisRequestConfig_ = builderForValue.build();
-        onChanged();
       } else {
         sentimentAnalysisRequestConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -3189,20 +3218,20 @@ public Builder setSentimentAnalysisRequestConfig(
     public Builder mergeSentimentAnalysisRequestConfig(
         com.google.cloud.dialogflow.v2beta1.SentimentAnalysisRequestConfig value) {
       if (sentimentAnalysisRequestConfigBuilder_ == null) {
-        if (sentimentAnalysisRequestConfig_ != null) {
-          sentimentAnalysisRequestConfig_ =
-              com.google.cloud.dialogflow.v2beta1.SentimentAnalysisRequestConfig.newBuilder(
-                      sentimentAnalysisRequestConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000080) != 0)
+            && sentimentAnalysisRequestConfig_ != null
+            && sentimentAnalysisRequestConfig_
+                != com.google.cloud.dialogflow.v2beta1.SentimentAnalysisRequestConfig
+                    .getDefaultInstance()) {
+          getSentimentAnalysisRequestConfigBuilder().mergeFrom(value);
         } else {
           sentimentAnalysisRequestConfig_ = value;
         }
-        onChanged();
       } else {
         sentimentAnalysisRequestConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -3220,14 +3249,13 @@ public Builder mergeSentimentAnalysisRequestConfig(
      * </code>
      */
     public Builder clearSentimentAnalysisRequestConfig() {
-      if (sentimentAnalysisRequestConfigBuilder_ == null) {
-        sentimentAnalysisRequestConfig_ = null;
-        onChanged();
-      } else {
-        sentimentAnalysisRequestConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000080);
+      sentimentAnalysisRequestConfig_ = null;
+      if (sentimentAnalysisRequestConfigBuilder_ != null) {
+        sentimentAnalysisRequestConfigBuilder_.dispose();
         sentimentAnalysisRequestConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3246,7 +3274,7 @@ public Builder clearSentimentAnalysisRequestConfig() {
      */
     public com.google.cloud.dialogflow.v2beta1.SentimentAnalysisRequestConfig.Builder
         getSentimentAnalysisRequestConfigBuilder() {
-
+      bitField0_ |= 0x00000080;
       onChanged();
       return getSentimentAnalysisRequestConfigFieldBuilder().getBuilder();
     }
@@ -3310,10 +3338,10 @@ public Builder clearSentimentAnalysisRequestConfig() {
         java.util.Collections.emptyList();
 
     private void ensureSubAgentsIsMutable() {
-      if (!((bitField0_ & 0x00000008) != 0)) {
+      if (!((bitField0_ & 0x00000100) != 0)) {
         subAgents_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.SubAgent>(subAgents_);
-        bitField0_ |= 0x00000008;
+        bitField0_ |= 0x00000100;
       }
     }
 
@@ -3562,7 +3590,7 @@ public Builder addAllSubAgents(
     public Builder clearSubAgents() {
       if (subAgentsBuilder_ == null) {
         subAgents_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000100);
         onChanged();
       } else {
         subAgentsBuilder_.clear();
@@ -3705,7 +3733,7 @@ public com.google.cloud.dialogflow.v2beta1.SubAgent.Builder addSubAgentsBuilder(
                 com.google.cloud.dialogflow.v2beta1.SubAgent,
                 com.google.cloud.dialogflow.v2beta1.SubAgent.Builder,
                 com.google.cloud.dialogflow.v2beta1.SubAgentOrBuilder>(
-                subAgents_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
+                subAgents_, ((bitField0_ & 0x00000100) != 0), getParentForChildren(), isClean());
         subAgents_ = null;
       }
       return subAgentsBuilder_;
@@ -3724,8 +3752,6 @@ public com.google.cloud.dialogflow.v2beta1.SubAgent.Builder addSubAgentsBuilder(
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
         internalGetMutableWebhookHeaders() {
-      onChanged();
-      ;
       if (webhookHeaders_ == null) {
         webhookHeaders_ =
             com.google.protobuf.MapField.newMapField(WebhookHeadersDefaultEntryHolder.defaultEntry);
@@ -3733,6 +3759,8 @@ public com.google.cloud.dialogflow.v2beta1.SubAgent.Builder addSubAgentsBuilder(
       if (!webhookHeaders_.isMutable()) {
         webhookHeaders_ = webhookHeaders_.copy();
       }
+      bitField0_ |= 0x00000200;
+      onChanged();
       return webhookHeaders_;
     }
 
@@ -3805,8 +3833,10 @@ public java.util.Map<java.lang.String, java.lang.String> getWebhookHeadersMap()
      * <code>map&lt;string, string&gt; webhook_headers = 14;</code>
      */
     @java.lang.Override
-    public java.lang.String getWebhookHeadersOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getWebhookHeadersOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -3842,6 +3872,7 @@ public java.lang.String getWebhookHeadersOrThrow(java.lang.String key) {
     }
 
     public Builder clearWebhookHeaders() {
+      bitField0_ = (bitField0_ & ~0x00000200);
       internalGetMutableWebhookHeaders().getMutableMap().clear();
       return this;
     }
@@ -3871,6 +3902,7 @@ public Builder removeWebhookHeaders(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, java.lang.String> getMutableWebhookHeaders() {
+      bitField0_ |= 0x00000200;
       return internalGetMutableWebhookHeaders().getMutableMap();
     }
     /**
@@ -3896,8 +3928,8 @@ public Builder putWebhookHeaders(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableWebhookHeaders().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000200;
       return this;
     }
     /**
@@ -3918,6 +3950,7 @@ public Builder putWebhookHeaders(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllWebhookHeaders(java.util.Map<java.lang.String, java.lang.String> values) {
       internalGetMutableWebhookHeaders().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000200;
       return this;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryParametersOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryParametersOrBuilder.java
index b5d111d00485..44466b88a0a6 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryParametersOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryParametersOrBuilder.java
@@ -523,7 +523,6 @@ com.google.cloud.dialogflow.v2beta1.SessionEntityTypeOrBuilder getSessionEntityT
    *
    * <code>map&lt;string, string&gt; webhook_headers = 14;</code>
    */
-
   /* nullable */
   java.lang.String getWebhookHeadersOrDefault(
       java.lang.String key,
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryResult.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryResult.java
index 1dd49818ef34..ff3134491829 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryResult.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryResult.java
@@ -74,7 +74,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int QUERY_TEXT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object queryText_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object queryText_ = "";
   /**
    *
    *
@@ -137,7 +139,9 @@ public com.google.protobuf.ByteString getQueryTextBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 15;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -192,7 +196,7 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
   }
 
   public static final int SPEECH_RECOGNITION_CONFIDENCE_FIELD_NUMBER = 2;
-  private float speechRecognitionConfidence_;
+  private float speechRecognitionConfidence_ = 0F;
   /**
    *
    *
@@ -217,7 +221,9 @@ public float getSpeechRecognitionConfidence() {
   }
 
   public static final int ACTION_FIELD_NUMBER = 3;
-  private volatile java.lang.Object action_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object action_ = "";
   /**
    *
    *
@@ -347,11 +353,11 @@ public com.google.protobuf.Struct getParameters() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getParametersOrBuilder() {
-    return getParameters();
+    return parameters_ == null ? com.google.protobuf.Struct.getDefaultInstance() : parameters_;
   }
 
   public static final int ALL_REQUIRED_PARAMS_PRESENT_FIELD_NUMBER = 5;
-  private boolean allRequiredParamsPresent_;
+  private boolean allRequiredParamsPresent_ = false;
   /**
    *
    *
@@ -373,7 +379,7 @@ public boolean getAllRequiredParamsPresent() {
   }
 
   public static final int CANCELS_SLOT_FILLING_FIELD_NUMBER = 21;
-  private boolean cancelsSlotFilling_;
+  private boolean cancelsSlotFilling_ = false;
   /**
    *
    *
@@ -393,7 +399,9 @@ public boolean getCancelsSlotFilling() {
   }
 
   public static final int FULFILLMENT_TEXT_FIELD_NUMBER = 6;
-  private volatile java.lang.Object fulfillmentText_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object fulfillmentText_ = "";
   /**
    *
    *
@@ -444,6 +452,8 @@ public com.google.protobuf.ByteString getFulfillmentTextBytes() {
   }
 
   public static final int FULFILLMENT_MESSAGES_FIELD_NUMBER = 7;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent.Message> fulfillmentMessages_;
   /**
    *
@@ -515,7 +525,9 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message getFulfillmentMessages
   }
 
   public static final int WEBHOOK_SOURCE_FIELD_NUMBER = 8;
-  private volatile java.lang.Object webhookSource_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object webhookSource_ = "";
   /**
    *
    *
@@ -613,10 +625,14 @@ public com.google.protobuf.Struct getWebhookPayload() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getWebhookPayloadOrBuilder() {
-    return getWebhookPayload();
+    return webhookPayload_ == null
+        ? com.google.protobuf.Struct.getDefaultInstance()
+        : webhookPayload_;
   }
 
   public static final int OUTPUT_CONTEXTS_FIELD_NUMBER = 10;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Context> outputContexts_;
   /**
    *
@@ -752,11 +768,13 @@ public com.google.cloud.dialogflow.v2beta1.Intent getIntent() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.IntentOrBuilder getIntentOrBuilder() {
-    return getIntent();
+    return intent_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Intent.getDefaultInstance()
+        : intent_;
   }
 
   public static final int INTENT_DETECTION_CONFIDENCE_FIELD_NUMBER = 12;
-  private float intentDetectionConfidence_;
+  private float intentDetectionConfidence_ = 0F;
   /**
    *
    *
@@ -840,7 +858,9 @@ public com.google.protobuf.Struct getDiagnosticInfo() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getDiagnosticInfoOrBuilder() {
-    return getDiagnosticInfo();
+    return diagnosticInfo_ == null
+        ? com.google.protobuf.Struct.getDefaultInstance()
+        : diagnosticInfo_;
   }
 
   public static final int SENTIMENT_ANALYSIS_RESULT_FIELD_NUMBER = 17;
@@ -895,7 +915,9 @@ public com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult getSentimentA
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResultOrBuilder
       getSentimentAnalysisResultOrBuilder() {
-    return getSentimentAnalysisResult();
+    return sentimentAnalysisResult_ == null
+        ? com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult.getDefaultInstance()
+        : sentimentAnalysisResult_;
   }
 
   public static final int KNOWLEDGE_ANSWERS_FIELD_NUMBER = 18;
@@ -947,7 +969,9 @@ public com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers getKnowledgeAnswers(
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.KnowledgeAnswersOrBuilder
       getKnowledgeAnswersOrBuilder() {
-    return getKnowledgeAnswers();
+    return knowledgeAnswers_ == null
+        ? com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.getDefaultInstance()
+        : knowledgeAnswers_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -1332,39 +1356,30 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       queryText_ = "";
-
       languageCode_ = "";
-
       speechRecognitionConfidence_ = 0F;
-
       action_ = "";
-
-      if (parametersBuilder_ == null) {
-        parameters_ = null;
-      } else {
-        parameters_ = null;
+      parameters_ = null;
+      if (parametersBuilder_ != null) {
+        parametersBuilder_.dispose();
         parametersBuilder_ = null;
       }
       allRequiredParamsPresent_ = false;
-
       cancelsSlotFilling_ = false;
-
       fulfillmentText_ = "";
-
       if (fulfillmentMessagesBuilder_ == null) {
         fulfillmentMessages_ = java.util.Collections.emptyList();
       } else {
         fulfillmentMessages_ = null;
         fulfillmentMessagesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000100);
       webhookSource_ = "";
-
-      if (webhookPayloadBuilder_ == null) {
-        webhookPayload_ = null;
-      } else {
-        webhookPayload_ = null;
+      webhookPayload_ = null;
+      if (webhookPayloadBuilder_ != null) {
+        webhookPayloadBuilder_.dispose();
         webhookPayloadBuilder_ = null;
       }
       if (outputContextsBuilder_ == null) {
@@ -1373,31 +1388,26 @@ public Builder clear() {
         outputContexts_ = null;
         outputContextsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
-      if (intentBuilder_ == null) {
-        intent_ = null;
-      } else {
-        intent_ = null;
+      bitField0_ = (bitField0_ & ~0x00000800);
+      intent_ = null;
+      if (intentBuilder_ != null) {
+        intentBuilder_.dispose();
         intentBuilder_ = null;
       }
       intentDetectionConfidence_ = 0F;
-
-      if (diagnosticInfoBuilder_ == null) {
-        diagnosticInfo_ = null;
-      } else {
-        diagnosticInfo_ = null;
+      diagnosticInfo_ = null;
+      if (diagnosticInfoBuilder_ != null) {
+        diagnosticInfoBuilder_.dispose();
         diagnosticInfoBuilder_ = null;
       }
-      if (sentimentAnalysisResultBuilder_ == null) {
-        sentimentAnalysisResult_ = null;
-      } else {
-        sentimentAnalysisResult_ = null;
+      sentimentAnalysisResult_ = null;
+      if (sentimentAnalysisResultBuilder_ != null) {
+        sentimentAnalysisResultBuilder_.dispose();
         sentimentAnalysisResultBuilder_ = null;
       }
-      if (knowledgeAnswersBuilder_ == null) {
-        knowledgeAnswers_ = null;
-      } else {
-        knowledgeAnswers_ = null;
+      knowledgeAnswers_ = null;
+      if (knowledgeAnswersBuilder_ != null) {
+        knowledgeAnswersBuilder_.dispose();
         knowledgeAnswersBuilder_ = null;
       }
       return this;
@@ -1427,66 +1437,89 @@ public com.google.cloud.dialogflow.v2beta1.QueryResult build() {
     public com.google.cloud.dialogflow.v2beta1.QueryResult buildPartial() {
       com.google.cloud.dialogflow.v2beta1.QueryResult result =
           new com.google.cloud.dialogflow.v2beta1.QueryResult(this);
-      int from_bitField0_ = bitField0_;
-      result.queryText_ = queryText_;
-      result.languageCode_ = languageCode_;
-      result.speechRecognitionConfidence_ = speechRecognitionConfidence_;
-      result.action_ = action_;
-      if (parametersBuilder_ == null) {
-        result.parameters_ = parameters_;
-      } else {
-        result.parameters_ = parametersBuilder_.build();
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.allRequiredParamsPresent_ = allRequiredParamsPresent_;
-      result.cancelsSlotFilling_ = cancelsSlotFilling_;
-      result.fulfillmentText_ = fulfillmentText_;
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.QueryResult result) {
       if (fulfillmentMessagesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000100) != 0)) {
           fulfillmentMessages_ = java.util.Collections.unmodifiableList(fulfillmentMessages_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000100);
         }
         result.fulfillmentMessages_ = fulfillmentMessages_;
       } else {
         result.fulfillmentMessages_ = fulfillmentMessagesBuilder_.build();
       }
-      result.webhookSource_ = webhookSource_;
-      if (webhookPayloadBuilder_ == null) {
-        result.webhookPayload_ = webhookPayload_;
-      } else {
-        result.webhookPayload_ = webhookPayloadBuilder_.build();
-      }
       if (outputContextsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000800) != 0)) {
           outputContexts_ = java.util.Collections.unmodifiableList(outputContexts_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000800);
         }
         result.outputContexts_ = outputContexts_;
       } else {
         result.outputContexts_ = outputContextsBuilder_.build();
       }
-      if (intentBuilder_ == null) {
-        result.intent_ = intent_;
-      } else {
-        result.intent_ = intentBuilder_.build();
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.QueryResult result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.queryText_ = queryText_;
       }
-      result.intentDetectionConfidence_ = intentDetectionConfidence_;
-      if (diagnosticInfoBuilder_ == null) {
-        result.diagnosticInfo_ = diagnosticInfo_;
-      } else {
-        result.diagnosticInfo_ = diagnosticInfoBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.languageCode_ = languageCode_;
       }
-      if (sentimentAnalysisResultBuilder_ == null) {
-        result.sentimentAnalysisResult_ = sentimentAnalysisResult_;
-      } else {
-        result.sentimentAnalysisResult_ = sentimentAnalysisResultBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.speechRecognitionConfidence_ = speechRecognitionConfidence_;
       }
-      if (knowledgeAnswersBuilder_ == null) {
-        result.knowledgeAnswers_ = knowledgeAnswers_;
-      } else {
-        result.knowledgeAnswers_ = knowledgeAnswersBuilder_.build();
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.action_ = action_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.parameters_ = parametersBuilder_ == null ? parameters_ : parametersBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.allRequiredParamsPresent_ = allRequiredParamsPresent_;
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.cancelsSlotFilling_ = cancelsSlotFilling_;
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.fulfillmentText_ = fulfillmentText_;
+      }
+      if (((from_bitField0_ & 0x00000200) != 0)) {
+        result.webhookSource_ = webhookSource_;
+      }
+      if (((from_bitField0_ & 0x00000400) != 0)) {
+        result.webhookPayload_ =
+            webhookPayloadBuilder_ == null ? webhookPayload_ : webhookPayloadBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00001000) != 0)) {
+        result.intent_ = intentBuilder_ == null ? intent_ : intentBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00002000) != 0)) {
+        result.intentDetectionConfidence_ = intentDetectionConfidence_;
+      }
+      if (((from_bitField0_ & 0x00004000) != 0)) {
+        result.diagnosticInfo_ =
+            diagnosticInfoBuilder_ == null ? diagnosticInfo_ : diagnosticInfoBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00008000) != 0)) {
+        result.sentimentAnalysisResult_ =
+            sentimentAnalysisResultBuilder_ == null
+                ? sentimentAnalysisResult_
+                : sentimentAnalysisResultBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00010000) != 0)) {
+        result.knowledgeAnswers_ =
+            knowledgeAnswersBuilder_ == null ? knowledgeAnswers_ : knowledgeAnswersBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -1537,10 +1570,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.QueryResult other)
         return this;
       if (!other.getQueryText().isEmpty()) {
         queryText_ = other.queryText_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getSpeechRecognitionConfidence() != 0F) {
@@ -1548,6 +1583,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.QueryResult other)
       }
       if (!other.getAction().isEmpty()) {
         action_ = other.action_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (other.hasParameters()) {
@@ -1561,13 +1597,14 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.QueryResult other)
       }
       if (!other.getFulfillmentText().isEmpty()) {
         fulfillmentText_ = other.fulfillmentText_;
+        bitField0_ |= 0x00000080;
         onChanged();
       }
       if (fulfillmentMessagesBuilder_ == null) {
         if (!other.fulfillmentMessages_.isEmpty()) {
           if (fulfillmentMessages_.isEmpty()) {
             fulfillmentMessages_ = other.fulfillmentMessages_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000100);
           } else {
             ensureFulfillmentMessagesIsMutable();
             fulfillmentMessages_.addAll(other.fulfillmentMessages_);
@@ -1580,7 +1617,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.QueryResult other)
             fulfillmentMessagesBuilder_.dispose();
             fulfillmentMessagesBuilder_ = null;
             fulfillmentMessages_ = other.fulfillmentMessages_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000100);
             fulfillmentMessagesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getFulfillmentMessagesFieldBuilder()
@@ -1592,6 +1629,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.QueryResult other)
       }
       if (!other.getWebhookSource().isEmpty()) {
         webhookSource_ = other.webhookSource_;
+        bitField0_ |= 0x00000200;
         onChanged();
       }
       if (other.hasWebhookPayload()) {
@@ -1601,7 +1639,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.QueryResult other)
         if (!other.outputContexts_.isEmpty()) {
           if (outputContexts_.isEmpty()) {
             outputContexts_ = other.outputContexts_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000800);
           } else {
             ensureOutputContextsIsMutable();
             outputContexts_.addAll(other.outputContexts_);
@@ -1614,7 +1652,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.QueryResult other)
             outputContextsBuilder_.dispose();
             outputContextsBuilder_ = null;
             outputContexts_ = other.outputContexts_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000800);
             outputContextsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getOutputContextsFieldBuilder()
@@ -1668,37 +1706,37 @@ public Builder mergeFrom(
             case 10:
               {
                 queryText_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 21:
               {
                 speechRecognitionConfidence_ = input.readFloat();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 21
             case 26:
               {
                 action_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(getParametersFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 34
             case 40:
               {
                 allRequiredParamsPresent_ = input.readBool();
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 40
             case 50:
               {
                 fulfillmentText_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 50
             case 58:
@@ -1718,13 +1756,13 @@ public Builder mergeFrom(
             case 66:
               {
                 webhookSource_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000200;
                 break;
               } // case 66
             case 74:
               {
                 input.readMessage(getWebhookPayloadFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000400;
                 break;
               } // case 74
             case 82:
@@ -1743,45 +1781,45 @@ public Builder mergeFrom(
             case 90:
               {
                 input.readMessage(getIntentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00001000;
                 break;
               } // case 90
             case 101:
               {
                 intentDetectionConfidence_ = input.readFloat();
-
+                bitField0_ |= 0x00002000;
                 break;
               } // case 101
             case 114:
               {
                 input.readMessage(getDiagnosticInfoFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00004000;
                 break;
               } // case 114
             case 122:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 122
             case 138:
               {
                 input.readMessage(
                     getSentimentAnalysisResultFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00008000;
                 break;
               } // case 138
             case 146:
               {
                 input.readMessage(
                     getKnowledgeAnswersFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00010000;
                 break;
               } // case 146
             case 168:
               {
                 cancelsSlotFilling_ = input.readBool();
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 168
             default:
@@ -1885,8 +1923,8 @@ public Builder setQueryText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       queryText_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1909,8 +1947,8 @@ public Builder setQueryText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearQueryText() {
-
       queryText_ = getDefaultInstance().getQueryText();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1938,8 +1976,8 @@ public Builder setQueryTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       queryText_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2014,8 +2052,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -2034,8 +2072,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -2059,8 +2097,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -2110,6 +2148,7 @@ public float getSpeechRecognitionConfidence() {
     public Builder setSpeechRecognitionConfidence(float value) {
 
       speechRecognitionConfidence_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2132,7 +2171,7 @@ public Builder setSpeechRecognitionConfidence(float value) {
      * @return This builder for chaining.
      */
     public Builder clearSpeechRecognitionConfidence() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       speechRecognitionConfidence_ = 0F;
       onChanged();
       return this;
@@ -2199,8 +2238,8 @@ public Builder setAction(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       action_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2216,8 +2255,8 @@ public Builder setAction(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAction() {
-
       action_ = getDefaultInstance().getAction();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -2238,8 +2277,8 @@ public Builder setActionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       action_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2275,7 +2314,7 @@ public Builder setActionBytes(com.google.protobuf.ByteString value) {
      * @return Whether the parameters field is set.
      */
     public boolean hasParameters() {
-      return parametersBuilder_ != null || parameters_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -2336,11 +2375,11 @@ public Builder setParameters(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         parameters_ = value;
-        onChanged();
       } else {
         parametersBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2368,11 +2407,11 @@ public Builder setParameters(com.google.protobuf.Struct value) {
     public Builder setParameters(com.google.protobuf.Struct.Builder builderForValue) {
       if (parametersBuilder_ == null) {
         parameters_ = builderForValue.build();
-        onChanged();
       } else {
         parametersBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2399,17 +2438,18 @@ public Builder setParameters(com.google.protobuf.Struct.Builder builderForValue)
      */
     public Builder mergeParameters(com.google.protobuf.Struct value) {
       if (parametersBuilder_ == null) {
-        if (parameters_ != null) {
-          parameters_ =
-              com.google.protobuf.Struct.newBuilder(parameters_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && parameters_ != null
+            && parameters_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getParametersBuilder().mergeFrom(value);
         } else {
           parameters_ = value;
         }
-        onChanged();
       } else {
         parametersBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2435,14 +2475,13 @@ public Builder mergeParameters(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct parameters = 4;</code>
      */
     public Builder clearParameters() {
-      if (parametersBuilder_ == null) {
-        parameters_ = null;
-        onChanged();
-      } else {
-        parameters_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      parameters_ = null;
+      if (parametersBuilder_ != null) {
+        parametersBuilder_.dispose();
         parametersBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2468,7 +2507,7 @@ public Builder clearParameters() {
      * <code>.google.protobuf.Struct parameters = 4;</code>
      */
     public com.google.protobuf.Struct.Builder getParametersBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getParametersFieldBuilder().getBuilder();
     }
@@ -2579,6 +2618,7 @@ public boolean getAllRequiredParamsPresent() {
     public Builder setAllRequiredParamsPresent(boolean value) {
 
       allRequiredParamsPresent_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2598,7 +2638,7 @@ public Builder setAllRequiredParamsPresent(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearAllRequiredParamsPresent() {
-
+      bitField0_ = (bitField0_ & ~0x00000020);
       allRequiredParamsPresent_ = false;
       onChanged();
       return this;
@@ -2639,6 +2679,7 @@ public boolean getCancelsSlotFilling() {
     public Builder setCancelsSlotFilling(boolean value) {
 
       cancelsSlotFilling_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2656,7 +2697,7 @@ public Builder setCancelsSlotFilling(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearCancelsSlotFilling() {
-
+      bitField0_ = (bitField0_ & ~0x00000040);
       cancelsSlotFilling_ = false;
       onChanged();
       return this;
@@ -2726,8 +2767,8 @@ public Builder setFulfillmentText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       fulfillmentText_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2744,8 +2785,8 @@ public Builder setFulfillmentText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFulfillmentText() {
-
       fulfillmentText_ = getDefaultInstance().getFulfillmentText();
+      bitField0_ = (bitField0_ & ~0x00000080);
       onChanged();
       return this;
     }
@@ -2767,8 +2808,8 @@ public Builder setFulfillmentTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       fulfillmentText_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2777,11 +2818,11 @@ public Builder setFulfillmentTextBytes(com.google.protobuf.ByteString value) {
         fulfillmentMessages_ = java.util.Collections.emptyList();
 
     private void ensureFulfillmentMessagesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000100) != 0)) {
         fulfillmentMessages_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.Intent.Message>(
                 fulfillmentMessages_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000100;
       }
     }
 
@@ -3012,7 +3053,7 @@ public Builder addAllFulfillmentMessages(
     public Builder clearFulfillmentMessages() {
       if (fulfillmentMessagesBuilder_ == null) {
         fulfillmentMessages_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000100);
         onChanged();
       } else {
         fulfillmentMessagesBuilder_.clear();
@@ -3147,7 +3188,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Builder addFulfillment
                 com.google.cloud.dialogflow.v2beta1.Intent.Message.Builder,
                 com.google.cloud.dialogflow.v2beta1.Intent.MessageOrBuilder>(
                 fulfillmentMessages_,
-                ((bitField0_ & 0x00000001) != 0),
+                ((bitField0_ & 0x00000100) != 0),
                 getParentForChildren(),
                 isClean());
         fulfillmentMessages_ = null;
@@ -3219,8 +3260,8 @@ public Builder setWebhookSource(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       webhookSource_ = value;
+      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -3237,8 +3278,8 @@ public Builder setWebhookSource(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearWebhookSource() {
-
       webhookSource_ = getDefaultInstance().getWebhookSource();
+      bitField0_ = (bitField0_ & ~0x00000200);
       onChanged();
       return this;
     }
@@ -3260,8 +3301,8 @@ public Builder setWebhookSourceBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       webhookSource_ = value;
+      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -3285,7 +3326,7 @@ public Builder setWebhookSourceBytes(com.google.protobuf.ByteString value) {
      * @return Whether the webhookPayload field is set.
      */
     public boolean hasWebhookPayload() {
-      return webhookPayloadBuilder_ != null || webhookPayload_ != null;
+      return ((bitField0_ & 0x00000400) != 0);
     }
     /**
      *
@@ -3324,11 +3365,11 @@ public Builder setWebhookPayload(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         webhookPayload_ = value;
-        onChanged();
       } else {
         webhookPayloadBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000400;
+      onChanged();
       return this;
     }
     /**
@@ -3344,11 +3385,11 @@ public Builder setWebhookPayload(com.google.protobuf.Struct value) {
     public Builder setWebhookPayload(com.google.protobuf.Struct.Builder builderForValue) {
       if (webhookPayloadBuilder_ == null) {
         webhookPayload_ = builderForValue.build();
-        onChanged();
       } else {
         webhookPayloadBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000400;
+      onChanged();
       return this;
     }
     /**
@@ -3363,19 +3404,18 @@ public Builder setWebhookPayload(com.google.protobuf.Struct.Builder builderForVa
      */
     public Builder mergeWebhookPayload(com.google.protobuf.Struct value) {
       if (webhookPayloadBuilder_ == null) {
-        if (webhookPayload_ != null) {
-          webhookPayload_ =
-              com.google.protobuf.Struct.newBuilder(webhookPayload_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000400) != 0)
+            && webhookPayload_ != null
+            && webhookPayload_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getWebhookPayloadBuilder().mergeFrom(value);
         } else {
           webhookPayload_ = value;
         }
-        onChanged();
       } else {
         webhookPayloadBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000400;
+      onChanged();
       return this;
     }
     /**
@@ -3389,14 +3429,13 @@ public Builder mergeWebhookPayload(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct webhook_payload = 9;</code>
      */
     public Builder clearWebhookPayload() {
-      if (webhookPayloadBuilder_ == null) {
-        webhookPayload_ = null;
-        onChanged();
-      } else {
-        webhookPayload_ = null;
+      bitField0_ = (bitField0_ & ~0x00000400);
+      webhookPayload_ = null;
+      if (webhookPayloadBuilder_ != null) {
+        webhookPayloadBuilder_.dispose();
         webhookPayloadBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3410,7 +3449,7 @@ public Builder clearWebhookPayload() {
      * <code>.google.protobuf.Struct webhook_payload = 9;</code>
      */
     public com.google.protobuf.Struct.Builder getWebhookPayloadBuilder() {
-
+      bitField0_ |= 0x00000400;
       onChanged();
       return getWebhookPayloadFieldBuilder().getBuilder();
     }
@@ -3464,10 +3503,10 @@ public com.google.protobuf.StructOrBuilder getWebhookPayloadOrBuilder() {
         java.util.Collections.emptyList();
 
     private void ensureOutputContextsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000800) != 0)) {
         outputContexts_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.Context>(outputContexts_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000800;
       }
     }
 
@@ -3716,7 +3755,7 @@ public Builder addAllOutputContexts(
     public Builder clearOutputContexts() {
       if (outputContextsBuilder_ == null) {
         outputContexts_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000800);
         onChanged();
       } else {
         outputContextsBuilder_.clear();
@@ -3861,7 +3900,7 @@ public com.google.cloud.dialogflow.v2beta1.Context.Builder addOutputContextsBuil
                 com.google.cloud.dialogflow.v2beta1.Context.Builder,
                 com.google.cloud.dialogflow.v2beta1.ContextOrBuilder>(
                 outputContexts_,
-                ((bitField0_ & 0x00000002) != 0),
+                ((bitField0_ & 0x00000800) != 0),
                 getParentForChildren(),
                 isClean());
         outputContexts_ = null;
@@ -3889,7 +3928,7 @@ public com.google.cloud.dialogflow.v2beta1.Context.Builder addOutputContextsBuil
      * @return Whether the intent field is set.
      */
     public boolean hasIntent() {
-      return intentBuilder_ != null || intent_ != null;
+      return ((bitField0_ & 0x00001000) != 0);
     }
     /**
      *
@@ -3930,11 +3969,11 @@ public Builder setIntent(com.google.cloud.dialogflow.v2beta1.Intent value) {
           throw new NullPointerException();
         }
         intent_ = value;
-        onChanged();
       } else {
         intentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00001000;
+      onChanged();
       return this;
     }
     /**
@@ -3951,11 +3990,11 @@ public Builder setIntent(com.google.cloud.dialogflow.v2beta1.Intent value) {
     public Builder setIntent(com.google.cloud.dialogflow.v2beta1.Intent.Builder builderForValue) {
       if (intentBuilder_ == null) {
         intent_ = builderForValue.build();
-        onChanged();
       } else {
         intentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00001000;
+      onChanged();
       return this;
     }
     /**
@@ -3971,19 +4010,18 @@ public Builder setIntent(com.google.cloud.dialogflow.v2beta1.Intent.Builder buil
      */
     public Builder mergeIntent(com.google.cloud.dialogflow.v2beta1.Intent value) {
       if (intentBuilder_ == null) {
-        if (intent_ != null) {
-          intent_ =
-              com.google.cloud.dialogflow.v2beta1.Intent.newBuilder(intent_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00001000) != 0)
+            && intent_ != null
+            && intent_ != com.google.cloud.dialogflow.v2beta1.Intent.getDefaultInstance()) {
+          getIntentBuilder().mergeFrom(value);
         } else {
           intent_ = value;
         }
-        onChanged();
       } else {
         intentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00001000;
+      onChanged();
       return this;
     }
     /**
@@ -3998,14 +4036,13 @@ public Builder mergeIntent(com.google.cloud.dialogflow.v2beta1.Intent value) {
      * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 11;</code>
      */
     public Builder clearIntent() {
-      if (intentBuilder_ == null) {
-        intent_ = null;
-        onChanged();
-      } else {
-        intent_ = null;
+      bitField0_ = (bitField0_ & ~0x00001000);
+      intent_ = null;
+      if (intentBuilder_ != null) {
+        intentBuilder_.dispose();
         intentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -4020,7 +4057,7 @@ public Builder clearIntent() {
      * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 11;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.Intent.Builder getIntentBuilder() {
-
+      bitField0_ |= 0x00001000;
       onChanged();
       return getIntentFieldBuilder().getBuilder();
     }
@@ -4117,6 +4154,7 @@ public float getIntentDetectionConfidence() {
     public Builder setIntentDetectionConfidence(float value) {
 
       intentDetectionConfidence_ = value;
+      bitField0_ |= 0x00002000;
       onChanged();
       return this;
     }
@@ -4139,7 +4177,7 @@ public Builder setIntentDetectionConfidence(float value) {
      * @return This builder for chaining.
      */
     public Builder clearIntentDetectionConfidence() {
-
+      bitField0_ = (bitField0_ & ~0x00002000);
       intentDetectionConfidence_ = 0F;
       onChanged();
       return this;
@@ -4168,7 +4206,7 @@ public Builder clearIntentDetectionConfidence() {
      * @return Whether the diagnosticInfo field is set.
      */
     public boolean hasDiagnosticInfo() {
-      return diagnosticInfoBuilder_ != null || diagnosticInfo_ != null;
+      return ((bitField0_ & 0x00004000) != 0);
     }
     /**
      *
@@ -4215,11 +4253,11 @@ public Builder setDiagnosticInfo(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         diagnosticInfo_ = value;
-        onChanged();
       } else {
         diagnosticInfoBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00004000;
+      onChanged();
       return this;
     }
     /**
@@ -4239,11 +4277,11 @@ public Builder setDiagnosticInfo(com.google.protobuf.Struct value) {
     public Builder setDiagnosticInfo(com.google.protobuf.Struct.Builder builderForValue) {
       if (diagnosticInfoBuilder_ == null) {
         diagnosticInfo_ = builderForValue.build();
-        onChanged();
       } else {
         diagnosticInfoBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00004000;
+      onChanged();
       return this;
     }
     /**
@@ -4262,19 +4300,18 @@ public Builder setDiagnosticInfo(com.google.protobuf.Struct.Builder builderForVa
      */
     public Builder mergeDiagnosticInfo(com.google.protobuf.Struct value) {
       if (diagnosticInfoBuilder_ == null) {
-        if (diagnosticInfo_ != null) {
-          diagnosticInfo_ =
-              com.google.protobuf.Struct.newBuilder(diagnosticInfo_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00004000) != 0)
+            && diagnosticInfo_ != null
+            && diagnosticInfo_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getDiagnosticInfoBuilder().mergeFrom(value);
         } else {
           diagnosticInfo_ = value;
         }
-        onChanged();
       } else {
         diagnosticInfoBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00004000;
+      onChanged();
       return this;
     }
     /**
@@ -4292,14 +4329,13 @@ public Builder mergeDiagnosticInfo(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct diagnostic_info = 14;</code>
      */
     public Builder clearDiagnosticInfo() {
-      if (diagnosticInfoBuilder_ == null) {
-        diagnosticInfo_ = null;
-        onChanged();
-      } else {
-        diagnosticInfo_ = null;
+      bitField0_ = (bitField0_ & ~0x00004000);
+      diagnosticInfo_ = null;
+      if (diagnosticInfoBuilder_ != null) {
+        diagnosticInfoBuilder_.dispose();
         diagnosticInfoBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -4317,7 +4353,7 @@ public Builder clearDiagnosticInfo() {
      * <code>.google.protobuf.Struct diagnostic_info = 14;</code>
      */
     public com.google.protobuf.Struct.Builder getDiagnosticInfoBuilder() {
-
+      bitField0_ |= 0x00004000;
       onChanged();
       return getDiagnosticInfoFieldBuilder().getBuilder();
     }
@@ -4396,7 +4432,7 @@ public com.google.protobuf.StructOrBuilder getDiagnosticInfoOrBuilder() {
      * @return Whether the sentimentAnalysisResult field is set.
      */
     public boolean hasSentimentAnalysisResult() {
-      return sentimentAnalysisResultBuilder_ != null || sentimentAnalysisResult_ != null;
+      return ((bitField0_ & 0x00008000) != 0);
     }
     /**
      *
@@ -4441,11 +4477,11 @@ public Builder setSentimentAnalysisResult(
           throw new NullPointerException();
         }
         sentimentAnalysisResult_ = value;
-        onChanged();
       } else {
         sentimentAnalysisResultBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00008000;
+      onChanged();
       return this;
     }
     /**
@@ -4464,11 +4500,11 @@ public Builder setSentimentAnalysisResult(
         com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult.Builder builderForValue) {
       if (sentimentAnalysisResultBuilder_ == null) {
         sentimentAnalysisResult_ = builderForValue.build();
-        onChanged();
       } else {
         sentimentAnalysisResultBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00008000;
+      onChanged();
       return this;
     }
     /**
@@ -4486,20 +4522,20 @@ public Builder setSentimentAnalysisResult(
     public Builder mergeSentimentAnalysisResult(
         com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult value) {
       if (sentimentAnalysisResultBuilder_ == null) {
-        if (sentimentAnalysisResult_ != null) {
-          sentimentAnalysisResult_ =
-              com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult.newBuilder(
-                      sentimentAnalysisResult_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00008000) != 0)
+            && sentimentAnalysisResult_ != null
+            && sentimentAnalysisResult_
+                != com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult
+                    .getDefaultInstance()) {
+          getSentimentAnalysisResultBuilder().mergeFrom(value);
         } else {
           sentimentAnalysisResult_ = value;
         }
-        onChanged();
       } else {
         sentimentAnalysisResultBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00008000;
+      onChanged();
       return this;
     }
     /**
@@ -4515,14 +4551,13 @@ public Builder mergeSentimentAnalysisResult(
      * </code>
      */
     public Builder clearSentimentAnalysisResult() {
-      if (sentimentAnalysisResultBuilder_ == null) {
-        sentimentAnalysisResult_ = null;
-        onChanged();
-      } else {
-        sentimentAnalysisResult_ = null;
+      bitField0_ = (bitField0_ & ~0x00008000);
+      sentimentAnalysisResult_ = null;
+      if (sentimentAnalysisResultBuilder_ != null) {
+        sentimentAnalysisResultBuilder_.dispose();
         sentimentAnalysisResultBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -4539,7 +4574,7 @@ public Builder clearSentimentAnalysisResult() {
      */
     public com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult.Builder
         getSentimentAnalysisResultBuilder() {
-
+      bitField0_ |= 0x00008000;
       onChanged();
       return getSentimentAnalysisResultFieldBuilder().getBuilder();
     }
@@ -4613,7 +4648,7 @@ public Builder clearSentimentAnalysisResult() {
      * @return Whether the knowledgeAnswers field is set.
      */
     public boolean hasKnowledgeAnswers() {
-      return knowledgeAnswersBuilder_ != null || knowledgeAnswers_ != null;
+      return ((bitField0_ & 0x00010000) != 0);
     }
     /**
      *
@@ -4652,11 +4687,11 @@ public Builder setKnowledgeAnswers(com.google.cloud.dialogflow.v2beta1.Knowledge
           throw new NullPointerException();
         }
         knowledgeAnswers_ = value;
-        onChanged();
       } else {
         knowledgeAnswersBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00010000;
+      onChanged();
       return this;
     }
     /**
@@ -4673,11 +4708,11 @@ public Builder setKnowledgeAnswers(
         com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Builder builderForValue) {
       if (knowledgeAnswersBuilder_ == null) {
         knowledgeAnswers_ = builderForValue.build();
-        onChanged();
       } else {
         knowledgeAnswersBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00010000;
+      onChanged();
       return this;
     }
     /**
@@ -4693,19 +4728,19 @@ public Builder setKnowledgeAnswers(
     public Builder mergeKnowledgeAnswers(
         com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers value) {
       if (knowledgeAnswersBuilder_ == null) {
-        if (knowledgeAnswers_ != null) {
-          knowledgeAnswers_ =
-              com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.newBuilder(knowledgeAnswers_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00010000) != 0)
+            && knowledgeAnswers_ != null
+            && knowledgeAnswers_
+                != com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.getDefaultInstance()) {
+          getKnowledgeAnswersBuilder().mergeFrom(value);
         } else {
           knowledgeAnswers_ = value;
         }
-        onChanged();
       } else {
         knowledgeAnswersBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00010000;
+      onChanged();
       return this;
     }
     /**
@@ -4719,14 +4754,13 @@ public Builder mergeKnowledgeAnswers(
      * <code>.google.cloud.dialogflow.v2beta1.KnowledgeAnswers knowledge_answers = 18;</code>
      */
     public Builder clearKnowledgeAnswers() {
-      if (knowledgeAnswersBuilder_ == null) {
-        knowledgeAnswers_ = null;
-        onChanged();
-      } else {
-        knowledgeAnswers_ = null;
+      bitField0_ = (bitField0_ & ~0x00010000);
+      knowledgeAnswers_ = null;
+      if (knowledgeAnswersBuilder_ != null) {
+        knowledgeAnswersBuilder_.dispose();
         knowledgeAnswersBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -4741,7 +4775,7 @@ public Builder clearKnowledgeAnswers() {
      */
     public com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Builder
         getKnowledgeAnswersBuilder() {
-
+      bitField0_ |= 0x00010000;
       onChanged();
       return getKnowledgeAnswersFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ReloadDocumentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ReloadDocumentRequest.java
index a75fa1424df9..43ffc992a0c5 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ReloadDocumentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ReloadDocumentRequest.java
@@ -112,7 +112,9 @@ public SourceCase getSourceCase() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -223,7 +225,7 @@ public com.google.cloud.dialogflow.v2beta1.GcsSourceOrBuilder getGcsSourceOrBuil
   }
 
   public static final int IMPORT_GCS_CUSTOM_METADATA_FIELD_NUMBER = 4;
-  private boolean importGcsCustomMetadata_;
+  private boolean importGcsCustomMetadata_ = false;
   /**
    *
    *
@@ -472,13 +474,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       if (gcsSourceBuilder_ != null) {
         gcsSourceBuilder_.clear();
       }
       importGcsCustomMetadata_ = false;
-
       sourceCase_ = 0;
       source_ = null;
       return this;
@@ -508,20 +509,33 @@ public com.google.cloud.dialogflow.v2beta1.ReloadDocumentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.ReloadDocumentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ReloadDocumentRequest result =
           new com.google.cloud.dialogflow.v2beta1.ReloadDocumentRequest(this);
-      result.name_ = name_;
-      if (sourceCase_ == 3) {
-        if (gcsSourceBuilder_ == null) {
-          result.source_ = source_;
-        } else {
-          result.source_ = gcsSourceBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.importGcsCustomMetadata_ = importGcsCustomMetadata_;
-      result.sourceCase_ = sourceCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ReloadDocumentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.importGcsCustomMetadata_ = importGcsCustomMetadata_;
+      }
+    }
+
+    private void buildPartialOneofs(
+        com.google.cloud.dialogflow.v2beta1.ReloadDocumentRequest result) {
+      result.sourceCase_ = sourceCase_;
+      result.source_ = this.source_;
+      if (sourceCase_ == 3 && gcsSourceBuilder_ != null) {
+        result.source_ = gcsSourceBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -570,6 +584,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ReloadDocumentReque
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getImportGcsCustomMetadata() != false) {
@@ -615,7 +630,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 26:
@@ -627,7 +642,7 @@ public Builder mergeFrom(
             case 32:
               {
                 importGcsCustomMetadata_ = input.readBool();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 32
             default:
@@ -661,6 +676,8 @@ public Builder clearSource() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -734,8 +751,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -755,8 +772,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -781,8 +798,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1002,7 +1019,6 @@ public com.google.cloud.dialogflow.v2beta1.GcsSourceOrBuilder getGcsSourceOrBuil
       }
       sourceCase_ = 3;
       onChanged();
-      ;
       return gcsSourceBuilder_;
     }
 
@@ -1039,6 +1055,7 @@ public boolean getImportGcsCustomMetadata() {
     public Builder setImportGcsCustomMetadata(boolean value) {
 
       importGcsCustomMetadata_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1055,7 +1072,7 @@ public Builder setImportGcsCustomMetadata(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearImportGcsCustomMetadata() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       importGcsCustomMetadata_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ResponseMessage.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ResponseMessage.java
index 0ff6c677c553..98971266f4b3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ResponseMessage.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ResponseMessage.java
@@ -171,6 +171,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int TEXT_FIELD_NUMBER = 1;
+
+    @SuppressWarnings("serial")
     private com.google.protobuf.LazyStringList text_;
     /**
      *
@@ -438,6 +440,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         text_ = com.google.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
@@ -467,14 +470,25 @@ public com.google.cloud.dialogflow.v2beta1.ResponseMessage.Text build() {
       public com.google.cloud.dialogflow.v2beta1.ResponseMessage.Text buildPartial() {
         com.google.cloud.dialogflow.v2beta1.ResponseMessage.Text result =
             new com.google.cloud.dialogflow.v2beta1.ResponseMessage.Text(this);
-        int from_bitField0_ = bitField0_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(
+          com.google.cloud.dialogflow.v2beta1.ResponseMessage.Text result) {
         if (((bitField0_ & 0x00000001) != 0)) {
           text_ = text_.getUnmodifiableView();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.text_ = text_;
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ResponseMessage.Text result) {
+        int from_bitField0_ = bitField0_;
       }
 
       @java.lang.Override
@@ -963,7 +977,7 @@ public com.google.protobuf.Struct getMetadata() {
      */
     @java.lang.Override
     public com.google.protobuf.StructOrBuilder getMetadataOrBuilder() {
-      return getMetadata();
+      return metadata_ == null ? com.google.protobuf.Struct.getDefaultInstance() : metadata_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -1181,10 +1195,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (metadataBuilder_ == null) {
-          metadata_ = null;
-        } else {
-          metadata_ = null;
+        bitField0_ = 0;
+        metadata_ = null;
+        if (metadataBuilder_ != null) {
+          metadataBuilder_.dispose();
           metadataBuilder_ = null;
         }
         return this;
@@ -1217,15 +1231,21 @@ public com.google.cloud.dialogflow.v2beta1.ResponseMessage.LiveAgentHandoff buil
       public com.google.cloud.dialogflow.v2beta1.ResponseMessage.LiveAgentHandoff buildPartial() {
         com.google.cloud.dialogflow.v2beta1.ResponseMessage.LiveAgentHandoff result =
             new com.google.cloud.dialogflow.v2beta1.ResponseMessage.LiveAgentHandoff(this);
-        if (metadataBuilder_ == null) {
-          result.metadata_ = metadata_;
-        } else {
-          result.metadata_ = metadataBuilder_.build();
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2beta1.ResponseMessage.LiveAgentHandoff result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.metadata_ = metadataBuilder_ == null ? metadata_ : metadataBuilder_.build();
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1309,7 +1329,7 @@ public Builder mergeFrom(
               case 10:
                 {
                   input.readMessage(getMetadataFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               default:
@@ -1329,6 +1349,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private com.google.protobuf.Struct metadata_;
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.protobuf.Struct,
@@ -1348,7 +1370,7 @@ public Builder mergeFrom(
        * @return Whether the metadata field is set.
        */
       public boolean hasMetadata() {
-        return metadataBuilder_ != null || metadata_ != null;
+        return ((bitField0_ & 0x00000001) != 0);
       }
       /**
        *
@@ -1385,11 +1407,11 @@ public Builder setMetadata(com.google.protobuf.Struct value) {
             throw new NullPointerException();
           }
           metadata_ = value;
-          onChanged();
         } else {
           metadataBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1405,11 +1427,11 @@ public Builder setMetadata(com.google.protobuf.Struct value) {
       public Builder setMetadata(com.google.protobuf.Struct.Builder builderForValue) {
         if (metadataBuilder_ == null) {
           metadata_ = builderForValue.build();
-          onChanged();
         } else {
           metadataBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1424,17 +1446,18 @@ public Builder setMetadata(com.google.protobuf.Struct.Builder builderForValue) {
        */
       public Builder mergeMetadata(com.google.protobuf.Struct value) {
         if (metadataBuilder_ == null) {
-          if (metadata_ != null) {
-            metadata_ =
-                com.google.protobuf.Struct.newBuilder(metadata_).mergeFrom(value).buildPartial();
+          if (((bitField0_ & 0x00000001) != 0)
+              && metadata_ != null
+              && metadata_ != com.google.protobuf.Struct.getDefaultInstance()) {
+            getMetadataBuilder().mergeFrom(value);
           } else {
             metadata_ = value;
           }
-          onChanged();
         } else {
           metadataBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1448,14 +1471,13 @@ public Builder mergeMetadata(com.google.protobuf.Struct value) {
        * <code>.google.protobuf.Struct metadata = 1;</code>
        */
       public Builder clearMetadata() {
-        if (metadataBuilder_ == null) {
-          metadata_ = null;
-          onChanged();
-        } else {
-          metadata_ = null;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        metadata_ = null;
+        if (metadataBuilder_ != null) {
+          metadataBuilder_.dispose();
           metadataBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -1469,7 +1491,7 @@ public Builder clearMetadata() {
        * <code>.google.protobuf.Struct metadata = 1;</code>
        */
       public com.google.protobuf.Struct.Builder getMetadataBuilder() {
-
+        bitField0_ |= 0x00000001;
         onChanged();
         return getMetadataFieldBuilder().getBuilder();
       }
@@ -2440,7 +2462,7 @@ public com.google.protobuf.ByteString getUriBytes() {
       }
 
       public static final int ALLOW_PLAYBACK_INTERRUPTION_FIELD_NUMBER = 3;
-      private boolean allowPlaybackInterruption_;
+      private boolean allowPlaybackInterruption_ = false;
       /**
        *
        *
@@ -2709,8 +2731,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           allowPlaybackInterruption_ = false;
-
           contentCase_ = 0;
           content_ = null;
           return this;
@@ -2744,18 +2766,28 @@ public com.google.cloud.dialogflow.v2beta1.ResponseMessage.MixedAudio.Segment bu
             buildPartial() {
           com.google.cloud.dialogflow.v2beta1.ResponseMessage.MixedAudio.Segment result =
               new com.google.cloud.dialogflow.v2beta1.ResponseMessage.MixedAudio.Segment(this);
-          if (contentCase_ == 1) {
-            result.content_ = content_;
+          if (bitField0_ != 0) {
+            buildPartial0(result);
           }
-          if (contentCase_ == 2) {
-            result.content_ = content_;
-          }
-          result.allowPlaybackInterruption_ = allowPlaybackInterruption_;
-          result.contentCase_ = contentCase_;
+          buildPartialOneofs(result);
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.cloud.dialogflow.v2beta1.ResponseMessage.MixedAudio.Segment result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000004) != 0)) {
+            result.allowPlaybackInterruption_ = allowPlaybackInterruption_;
+          }
+        }
+
+        private void buildPartialOneofs(
+            com.google.cloud.dialogflow.v2beta1.ResponseMessage.MixedAudio.Segment result) {
+          result.contentCase_ = contentCase_;
+          result.content_ = this.content_;
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -2871,7 +2903,7 @@ public Builder mergeFrom(
                 case 24:
                   {
                     allowPlaybackInterruption_ = input.readBool();
-
+                    bitField0_ |= 0x00000004;
                     break;
                   } // case 24
                 default:
@@ -2905,6 +2937,8 @@ public Builder clearContent() {
           return this;
         }
 
+        private int bitField0_;
+
         /**
          *
          *
@@ -3156,6 +3190,7 @@ public boolean getAllowPlaybackInterruption() {
         public Builder setAllowPlaybackInterruption(boolean value) {
 
           allowPlaybackInterruption_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -3173,7 +3208,7 @@ public Builder setAllowPlaybackInterruption(boolean value) {
          * @return This builder for chaining.
          */
         public Builder clearAllowPlaybackInterruption() {
-
+          bitField0_ = (bitField0_ & ~0x00000004);
           allowPlaybackInterruption_ = false;
           onChanged();
           return this;
@@ -3248,6 +3283,8 @@ public com.google.protobuf.Parser<Segment> getParserForType() {
     }
 
     public static final int SEGMENTS_FIELD_NUMBER = 1;
+
+    @SuppressWarnings("serial")
     private java.util.List<com.google.cloud.dialogflow.v2beta1.ResponseMessage.MixedAudio.Segment>
         segments_;
     /**
@@ -3536,6 +3573,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (segmentsBuilder_ == null) {
           segments_ = java.util.Collections.emptyList();
         } else {
@@ -3571,7 +3609,16 @@ public com.google.cloud.dialogflow.v2beta1.ResponseMessage.MixedAudio build() {
       public com.google.cloud.dialogflow.v2beta1.ResponseMessage.MixedAudio buildPartial() {
         com.google.cloud.dialogflow.v2beta1.ResponseMessage.MixedAudio result =
             new com.google.cloud.dialogflow.v2beta1.ResponseMessage.MixedAudio(this);
-        int from_bitField0_ = bitField0_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(
+          com.google.cloud.dialogflow.v2beta1.ResponseMessage.MixedAudio result) {
         if (segmentsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             segments_ = java.util.Collections.unmodifiableList(segments_);
@@ -3581,8 +3628,11 @@ public com.google.cloud.dialogflow.v2beta1.ResponseMessage.MixedAudio buildParti
         } else {
           result.segments_ = segmentsBuilder_.build();
         }
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2beta1.ResponseMessage.MixedAudio result) {
+        int from_bitField0_ = bitField0_;
       }
 
       @java.lang.Override
@@ -4762,6 +4812,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         endpointCase_ = 0;
         endpoint_ = null;
         return this;
@@ -4795,17 +4846,25 @@ public com.google.cloud.dialogflow.v2beta1.ResponseMessage.TelephonyTransferCall
           buildPartial() {
         com.google.cloud.dialogflow.v2beta1.ResponseMessage.TelephonyTransferCall result =
             new com.google.cloud.dialogflow.v2beta1.ResponseMessage.TelephonyTransferCall(this);
-        if (endpointCase_ == 1) {
-          result.endpoint_ = endpoint_;
-        }
-        if (endpointCase_ == 2) {
-          result.endpoint_ = endpoint_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
-        result.endpointCase_ = endpointCase_;
+        buildPartialOneofs(result);
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2beta1.ResponseMessage.TelephonyTransferCall result) {
+        int from_bitField0_ = bitField0_;
+      }
+
+      private void buildPartialOneofs(
+          com.google.cloud.dialogflow.v2beta1.ResponseMessage.TelephonyTransferCall result) {
+        result.endpointCase_ = endpointCase_;
+        result.endpoint_ = this.endpoint_;
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -4949,6 +5008,8 @@ public Builder clearEndpoint() {
         return this;
       }
 
+      private int bitField0_;
+
       /**
        *
        *
@@ -5979,6 +6040,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (textBuilder_ != null) {
         textBuilder_.clear();
       }
@@ -6026,51 +6088,39 @@ public com.google.cloud.dialogflow.v2beta1.ResponseMessage build() {
     public com.google.cloud.dialogflow.v2beta1.ResponseMessage buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ResponseMessage result =
           new com.google.cloud.dialogflow.v2beta1.ResponseMessage(this);
-      if (messageCase_ == 1) {
-        if (textBuilder_ == null) {
-          result.message_ = message_;
-        } else {
-          result.message_ = textBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (messageCase_ == 2) {
-        if (payloadBuilder_ == null) {
-          result.message_ = message_;
-        } else {
-          result.message_ = payloadBuilder_.build();
-        }
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ResponseMessage result) {
+      int from_bitField0_ = bitField0_;
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2beta1.ResponseMessage result) {
+      result.messageCase_ = messageCase_;
+      result.message_ = this.message_;
+      if (messageCase_ == 1 && textBuilder_ != null) {
+        result.message_ = textBuilder_.build();
       }
-      if (messageCase_ == 3) {
-        if (liveAgentHandoffBuilder_ == null) {
-          result.message_ = message_;
-        } else {
-          result.message_ = liveAgentHandoffBuilder_.build();
-        }
+      if (messageCase_ == 2 && payloadBuilder_ != null) {
+        result.message_ = payloadBuilder_.build();
       }
-      if (messageCase_ == 4) {
-        if (endInteractionBuilder_ == null) {
-          result.message_ = message_;
-        } else {
-          result.message_ = endInteractionBuilder_.build();
-        }
+      if (messageCase_ == 3 && liveAgentHandoffBuilder_ != null) {
+        result.message_ = liveAgentHandoffBuilder_.build();
       }
-      if (messageCase_ == 5) {
-        if (mixedAudioBuilder_ == null) {
-          result.message_ = message_;
-        } else {
-          result.message_ = mixedAudioBuilder_.build();
-        }
+      if (messageCase_ == 4 && endInteractionBuilder_ != null) {
+        result.message_ = endInteractionBuilder_.build();
       }
-      if (messageCase_ == 6) {
-        if (telephonyTransferCallBuilder_ == null) {
-          result.message_ = message_;
-        } else {
-          result.message_ = telephonyTransferCallBuilder_.build();
-        }
+      if (messageCase_ == 5 && mixedAudioBuilder_ != null) {
+        result.message_ = mixedAudioBuilder_.build();
+      }
+      if (messageCase_ == 6 && telephonyTransferCallBuilder_ != null) {
+        result.message_ = telephonyTransferCallBuilder_.build();
       }
-      result.messageCase_ = messageCase_;
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -6250,6 +6300,8 @@ public Builder clearMessage() {
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.ResponseMessage.Text,
             com.google.cloud.dialogflow.v2beta1.ResponseMessage.Text.Builder,
@@ -6457,7 +6509,6 @@ public com.google.cloud.dialogflow.v2beta1.ResponseMessage.TextOrBuilder getText
       }
       messageCase_ = 1;
       onChanged();
-      ;
       return textBuilder_;
     }
 
@@ -6662,7 +6713,6 @@ public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() {
       }
       messageCase_ = 2;
       onChanged();
-      ;
       return payloadBuilder_;
     }
 
@@ -6904,7 +6954,6 @@ public Builder clearLiveAgentHandoff() {
       }
       messageCase_ = 3;
       onChanged();
-      ;
       return liveAgentHandoffBuilder_;
     }
 
@@ -7144,7 +7193,6 @@ public Builder clearEndInteraction() {
       }
       messageCase_ = 4;
       onChanged();
-      ;
       return endInteractionBuilder_;
     }
 
@@ -7370,7 +7418,6 @@ public Builder clearMixedAudio() {
       }
       messageCase_ = 5;
       onChanged();
-      ;
       return mixedAudioBuilder_;
     }
 
@@ -7624,7 +7671,6 @@ public Builder clearTelephonyTransferCall() {
       }
       messageCase_ = 6;
       onChanged();
-      ;
       return telephonyTransferCallBuilder_;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/RestoreAgentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/RestoreAgentRequest.java
index a02bdb58d1a8..4ecbaf357b61 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/RestoreAgentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/RestoreAgentRequest.java
@@ -115,7 +115,9 @@ public AgentCase getAgentCase() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -529,8 +531,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       agentCase_ = 0;
       agent_ = null;
       return this;
@@ -560,18 +562,27 @@ public com.google.cloud.dialogflow.v2beta1.RestoreAgentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.RestoreAgentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.RestoreAgentRequest result =
           new com.google.cloud.dialogflow.v2beta1.RestoreAgentRequest(this);
-      result.parent_ = parent_;
-      if (agentCase_ == 2) {
-        result.agent_ = agent_;
-      }
-      if (agentCase_ == 3) {
-        result.agent_ = agent_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.agentCase_ = agentCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.RestoreAgentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+    }
+
+    private void buildPartialOneofs(
+        com.google.cloud.dialogflow.v2beta1.RestoreAgentRequest result) {
+      result.agentCase_ = agentCase_;
+      result.agent_ = this.agent_;
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -620,6 +631,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.RestoreAgentRequest
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       switch (other.getAgentCase()) {
@@ -669,7 +681,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -716,6 +728,8 @@ public Builder clearAgent() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -789,8 +803,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -810,8 +824,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -836,8 +850,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsRequest.java
index b50e9753ee8d..9de1777a3394 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -126,7 +128,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -145,7 +147,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -409,12 +413,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -442,13 +444,26 @@ public com.google.cloud.dialogflow.v2beta1.SearchAgentsRequest build() {
     public com.google.cloud.dialogflow.v2beta1.SearchAgentsRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SearchAgentsRequest result =
           new com.google.cloud.dialogflow.v2beta1.SearchAgentsRequest(this);
-      result.parent_ = parent_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.SearchAgentsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -497,6 +512,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.SearchAgentsRequest
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -504,6 +520,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.SearchAgentsRequest
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -535,19 +552,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -567,6 +584,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -640,8 +659,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -661,8 +680,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -687,8 +706,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -726,6 +745,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -742,7 +762,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -809,8 +829,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -826,8 +846,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -848,8 +868,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsResponse.java
index c5b501028991..33c9e411a871 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsResponse.java
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int AGENTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Agent> agents_;
   /**
    *
@@ -143,7 +145,9 @@ public com.google.cloud.dialogflow.v2beta1.AgentOrBuilder getAgentsOrBuilder(int
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -402,6 +406,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (agentsBuilder_ == null) {
         agents_ = java.util.Collections.emptyList();
       } else {
@@ -410,7 +415,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -438,7 +442,16 @@ public com.google.cloud.dialogflow.v2beta1.SearchAgentsResponse build() {
     public com.google.cloud.dialogflow.v2beta1.SearchAgentsResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SearchAgentsResponse result =
           new com.google.cloud.dialogflow.v2beta1.SearchAgentsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.SearchAgentsResponse result) {
       if (agentsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           agents_ = java.util.Collections.unmodifiableList(agents_);
@@ -448,9 +461,13 @@ public com.google.cloud.dialogflow.v2beta1.SearchAgentsResponse buildPartial() {
       } else {
         result.agents_ = agentsBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.SearchAgentsResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -528,6 +545,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.SearchAgentsRespons
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -572,7 +590,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -1025,8 +1043,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1043,8 +1061,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1066,8 +1084,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Sentiment.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Sentiment.java
index 5123b64de720..62edb350dbf0 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Sentiment.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Sentiment.java
@@ -69,7 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SCORE_FIELD_NUMBER = 1;
-  private float score_;
+  private float score_ = 0F;
   /**
    *
    *
@@ -88,7 +88,7 @@ public float getScore() {
   }
 
   public static final int MAGNITUDE_FIELD_NUMBER = 2;
-  private float magnitude_;
+  private float magnitude_ = 0F;
   /**
    *
    *
@@ -317,10 +317,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       score_ = 0F;
-
       magnitude_ = 0F;
-
       return this;
     }
 
@@ -348,12 +347,23 @@ public com.google.cloud.dialogflow.v2beta1.Sentiment build() {
     public com.google.cloud.dialogflow.v2beta1.Sentiment buildPartial() {
       com.google.cloud.dialogflow.v2beta1.Sentiment result =
           new com.google.cloud.dialogflow.v2beta1.Sentiment(this);
-      result.score_ = score_;
-      result.magnitude_ = magnitude_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.Sentiment result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.score_ = score_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.magnitude_ = magnitude_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -434,13 +444,13 @@ public Builder mergeFrom(
             case 13:
               {
                 score_ = input.readFloat();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 13
             case 21:
               {
                 magnitude_ = input.readFloat();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 21
             default:
@@ -460,6 +470,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private float score_;
     /**
      *
@@ -493,6 +505,7 @@ public float getScore() {
     public Builder setScore(float value) {
 
       score_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -509,7 +522,7 @@ public Builder setScore(float value) {
      * @return This builder for chaining.
      */
     public Builder clearScore() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       score_ = 0F;
       onChanged();
       return this;
@@ -548,6 +561,7 @@ public float getMagnitude() {
     public Builder setMagnitude(float value) {
 
       magnitude_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -564,7 +578,7 @@ public Builder setMagnitude(float value) {
      * @return This builder for chaining.
      */
     public Builder clearMagnitude() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       magnitude_ = 0F;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SentimentAnalysisRequestConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SentimentAnalysisRequestConfig.java
index 0263277eb6af..fccf06b1cfad 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SentimentAnalysisRequestConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SentimentAnalysisRequestConfig.java
@@ -67,7 +67,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ANALYZE_QUERY_TEXT_SENTIMENT_FIELD_NUMBER = 1;
-  private boolean analyzeQueryTextSentiment_;
+  private boolean analyzeQueryTextSentiment_ = false;
   /**
    *
    *
@@ -286,8 +286,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       analyzeQueryTextSentiment_ = false;
-
       return this;
     }
 
@@ -317,11 +317,21 @@ public com.google.cloud.dialogflow.v2beta1.SentimentAnalysisRequestConfig build(
     public com.google.cloud.dialogflow.v2beta1.SentimentAnalysisRequestConfig buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SentimentAnalysisRequestConfig result =
           new com.google.cloud.dialogflow.v2beta1.SentimentAnalysisRequestConfig(this);
-      result.analyzeQueryTextSentiment_ = analyzeQueryTextSentiment_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.SentimentAnalysisRequestConfig result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.analyzeQueryTextSentiment_ = analyzeQueryTextSentiment_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -403,7 +413,7 @@ public Builder mergeFrom(
             case 8:
               {
                 analyzeQueryTextSentiment_ = input.readBool();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             default:
@@ -423,6 +433,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private boolean analyzeQueryTextSentiment_;
     /**
      *
@@ -458,6 +470,7 @@ public boolean getAnalyzeQueryTextSentiment() {
     public Builder setAnalyzeQueryTextSentiment(boolean value) {
 
       analyzeQueryTextSentiment_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -475,7 +488,7 @@ public Builder setAnalyzeQueryTextSentiment(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearAnalyzeQueryTextSentiment() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       analyzeQueryTextSentiment_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SentimentAnalysisResult.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SentimentAnalysisResult.java
index 7b7168f79e44..a10518f12397 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SentimentAnalysisResult.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SentimentAnalysisResult.java
@@ -119,7 +119,9 @@ public com.google.cloud.dialogflow.v2beta1.Sentiment getQueryTextSentiment() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.SentimentOrBuilder getQueryTextSentimentOrBuilder() {
-    return getQueryTextSentiment();
+    return queryTextSentiment_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Sentiment.getDefaultInstance()
+        : queryTextSentiment_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -334,10 +336,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (queryTextSentimentBuilder_ == null) {
-        queryTextSentiment_ = null;
-      } else {
-        queryTextSentiment_ = null;
+      bitField0_ = 0;
+      queryTextSentiment_ = null;
+      if (queryTextSentimentBuilder_ != null) {
+        queryTextSentimentBuilder_.dispose();
         queryTextSentimentBuilder_ = null;
       }
       return this;
@@ -367,15 +369,23 @@ public com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult build() {
     public com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult result =
           new com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult(this);
-      if (queryTextSentimentBuilder_ == null) {
-        result.queryTextSentiment_ = queryTextSentiment_;
-      } else {
-        result.queryTextSentiment_ = queryTextSentimentBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.queryTextSentiment_ =
+            queryTextSentimentBuilder_ == null
+                ? queryTextSentiment_
+                : queryTextSentimentBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -455,7 +465,7 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getQueryTextSentimentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -475,6 +485,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2beta1.Sentiment queryTextSentiment_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.Sentiment,
@@ -493,7 +505,7 @@ public Builder mergeFrom(
      * @return Whether the queryTextSentiment field is set.
      */
     public boolean hasQueryTextSentiment() {
-      return queryTextSentimentBuilder_ != null || queryTextSentiment_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -530,11 +542,11 @@ public Builder setQueryTextSentiment(com.google.cloud.dialogflow.v2beta1.Sentime
           throw new NullPointerException();
         }
         queryTextSentiment_ = value;
-        onChanged();
       } else {
         queryTextSentimentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -550,11 +562,11 @@ public Builder setQueryTextSentiment(
         com.google.cloud.dialogflow.v2beta1.Sentiment.Builder builderForValue) {
       if (queryTextSentimentBuilder_ == null) {
         queryTextSentiment_ = builderForValue.build();
-        onChanged();
       } else {
         queryTextSentimentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -568,19 +580,19 @@ public Builder setQueryTextSentiment(
      */
     public Builder mergeQueryTextSentiment(com.google.cloud.dialogflow.v2beta1.Sentiment value) {
       if (queryTextSentimentBuilder_ == null) {
-        if (queryTextSentiment_ != null) {
-          queryTextSentiment_ =
-              com.google.cloud.dialogflow.v2beta1.Sentiment.newBuilder(queryTextSentiment_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && queryTextSentiment_ != null
+            && queryTextSentiment_
+                != com.google.cloud.dialogflow.v2beta1.Sentiment.getDefaultInstance()) {
+          getQueryTextSentimentBuilder().mergeFrom(value);
         } else {
           queryTextSentiment_ = value;
         }
-        onChanged();
       } else {
         queryTextSentimentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -593,14 +605,13 @@ public Builder mergeQueryTextSentiment(com.google.cloud.dialogflow.v2beta1.Senti
      * <code>.google.cloud.dialogflow.v2beta1.Sentiment query_text_sentiment = 1;</code>
      */
     public Builder clearQueryTextSentiment() {
-      if (queryTextSentimentBuilder_ == null) {
-        queryTextSentiment_ = null;
-        onChanged();
-      } else {
-        queryTextSentiment_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      queryTextSentiment_ = null;
+      if (queryTextSentimentBuilder_ != null) {
+        queryTextSentimentBuilder_.dispose();
         queryTextSentimentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -613,7 +624,7 @@ public Builder clearQueryTextSentiment() {
      * <code>.google.cloud.dialogflow.v2beta1.Sentiment query_text_sentiment = 1;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.Sentiment.Builder getQueryTextSentimentBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getQueryTextSentimentFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityType.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityType.java
index b408e3223936..2fb04f9edbd3 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityType.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityType.java
@@ -254,7 +254,9 @@ private EntityOverrideMode(int value) {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -333,7 +335,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int ENTITY_OVERRIDE_MODE_FIELD_NUMBER = 2;
-  private int entityOverrideMode_;
+  private int entityOverrideMode_ = 0;
   /**
    *
    *
@@ -369,9 +371,8 @@ public int getEntityOverrideModeValue() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.SessionEntityType.EntityOverrideMode
       getEntityOverrideMode() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.SessionEntityType.EntityOverrideMode result =
-        com.google.cloud.dialogflow.v2beta1.SessionEntityType.EntityOverrideMode.valueOf(
+        com.google.cloud.dialogflow.v2beta1.SessionEntityType.EntityOverrideMode.forNumber(
             entityOverrideMode_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.SessionEntityType.EntityOverrideMode.UNRECOGNIZED
@@ -379,6 +380,8 @@ public int getEntityOverrideModeValue() {
   }
 
   public static final int ENTITIES_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.EntityType.Entity> entities_;
   /**
    *
@@ -683,17 +686,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       entityOverrideMode_ = 0;
-
       if (entitiesBuilder_ == null) {
         entities_ = java.util.Collections.emptyList();
       } else {
         entities_ = null;
         entitiesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000004);
       return this;
     }
 
@@ -721,20 +723,35 @@ public com.google.cloud.dialogflow.v2beta1.SessionEntityType build() {
     public com.google.cloud.dialogflow.v2beta1.SessionEntityType buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SessionEntityType result =
           new com.google.cloud.dialogflow.v2beta1.SessionEntityType(this);
-      int from_bitField0_ = bitField0_;
-      result.name_ = name_;
-      result.entityOverrideMode_ = entityOverrideMode_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.SessionEntityType result) {
       if (entitiesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000004) != 0)) {
           entities_ = java.util.Collections.unmodifiableList(entities_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.entities_ = entities_;
       } else {
         result.entities_ = entitiesBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.SessionEntityType result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.entityOverrideMode_ = entityOverrideMode_;
+      }
     }
 
     @java.lang.Override
@@ -785,6 +802,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.SessionEntityType o
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.entityOverrideMode_ != 0) {
@@ -794,7 +812,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.SessionEntityType o
         if (!other.entities_.isEmpty()) {
           if (entities_.isEmpty()) {
             entities_ = other.entities_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureEntitiesIsMutable();
             entities_.addAll(other.entities_);
@@ -807,7 +825,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.SessionEntityType o
             entitiesBuilder_.dispose();
             entitiesBuilder_ = null;
             entities_ = other.entities_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
             entitiesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getEntitiesFieldBuilder()
@@ -846,13 +864,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 entityOverrideMode_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
@@ -994,8 +1012,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1026,8 +1044,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1063,8 +1081,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1104,8 +1122,8 @@ public int getEntityOverrideModeValue() {
      * @return This builder for chaining.
      */
     public Builder setEntityOverrideModeValue(int value) {
-
       entityOverrideMode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1126,9 +1144,8 @@ public Builder setEntityOverrideModeValue(int value) {
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.SessionEntityType.EntityOverrideMode
         getEntityOverrideMode() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.SessionEntityType.EntityOverrideMode result =
-          com.google.cloud.dialogflow.v2beta1.SessionEntityType.EntityOverrideMode.valueOf(
+          com.google.cloud.dialogflow.v2beta1.SessionEntityType.EntityOverrideMode.forNumber(
               entityOverrideMode_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.SessionEntityType.EntityOverrideMode.UNRECOGNIZED
@@ -1154,7 +1171,7 @@ public Builder setEntityOverrideMode(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       entityOverrideMode_ = value.getNumber();
       onChanged();
       return this;
@@ -1174,7 +1191,7 @@ public Builder setEntityOverrideMode(
      * @return This builder for chaining.
      */
     public Builder clearEntityOverrideMode() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       entityOverrideMode_ = 0;
       onChanged();
       return this;
@@ -1184,11 +1201,11 @@ public Builder clearEntityOverrideMode() {
         java.util.Collections.emptyList();
 
     private void ensureEntitiesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         entities_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.EntityType.Entity>(
                 entities_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000004;
       }
     }
 
@@ -1418,7 +1435,7 @@ public Builder addAllEntities(
     public Builder clearEntities() {
       if (entitiesBuilder_ == null) {
         entities_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
       } else {
         entitiesBuilder_.clear();
@@ -1551,7 +1568,7 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder addEntities
                 com.google.cloud.dialogflow.v2beta1.EntityType.Entity,
                 com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder,
                 com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder>(
-                entities_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                entities_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
         entities_ = null;
       }
       return entitiesBuilder_;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SetAgentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SetAgentRequest.java
index d734d0a8e407..435d2b7cdef6 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SetAgentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SetAgentRequest.java
@@ -114,7 +114,7 @@ public com.google.cloud.dialogflow.v2beta1.Agent getAgent() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.AgentOrBuilder getAgentOrBuilder() {
-    return getAgent();
+    return agent_ == null ? com.google.cloud.dialogflow.v2beta1.Agent.getDefaultInstance() : agent_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -160,7 +160,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -379,16 +379,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (agentBuilder_ == null) {
-        agent_ = null;
-      } else {
-        agent_ = null;
+      bitField0_ = 0;
+      agent_ = null;
+      if (agentBuilder_ != null) {
+        agentBuilder_.dispose();
         agentBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -418,20 +417,23 @@ public com.google.cloud.dialogflow.v2beta1.SetAgentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.SetAgentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SetAgentRequest result =
           new com.google.cloud.dialogflow.v2beta1.SetAgentRequest(this);
-      if (agentBuilder_ == null) {
-        result.agent_ = agent_;
-      } else {
-        result.agent_ = agentBuilder_.build();
-      }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.SetAgentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.agent_ = agentBuilder_ == null ? agent_ : agentBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -513,13 +515,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getAgentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -539,6 +541,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2beta1.Agent agent_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.Agent,
@@ -559,7 +563,7 @@ public Builder mergeFrom(
      * @return Whether the agent field is set.
      */
     public boolean hasAgent() {
-      return agentBuilder_ != null || agent_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -600,11 +604,11 @@ public Builder setAgent(com.google.cloud.dialogflow.v2beta1.Agent value) {
           throw new NullPointerException();
         }
         agent_ = value;
-        onChanged();
       } else {
         agentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -621,11 +625,11 @@ public Builder setAgent(com.google.cloud.dialogflow.v2beta1.Agent value) {
     public Builder setAgent(com.google.cloud.dialogflow.v2beta1.Agent.Builder builderForValue) {
       if (agentBuilder_ == null) {
         agent_ = builderForValue.build();
-        onChanged();
       } else {
         agentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -641,19 +645,18 @@ public Builder setAgent(com.google.cloud.dialogflow.v2beta1.Agent.Builder builde
      */
     public Builder mergeAgent(com.google.cloud.dialogflow.v2beta1.Agent value) {
       if (agentBuilder_ == null) {
-        if (agent_ != null) {
-          agent_ =
-              com.google.cloud.dialogflow.v2beta1.Agent.newBuilder(agent_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && agent_ != null
+            && agent_ != com.google.cloud.dialogflow.v2beta1.Agent.getDefaultInstance()) {
+          getAgentBuilder().mergeFrom(value);
         } else {
           agent_ = value;
         }
-        onChanged();
       } else {
         agentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -668,14 +671,13 @@ public Builder mergeAgent(com.google.cloud.dialogflow.v2beta1.Agent value) {
      * </code>
      */
     public Builder clearAgent() {
-      if (agentBuilder_ == null) {
-        agent_ = null;
-        onChanged();
-      } else {
-        agent_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      agent_ = null;
+      if (agentBuilder_ != null) {
+        agentBuilder_.dispose();
         agentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -690,7 +692,7 @@ public Builder clearAgent() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Agent.Builder getAgentBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getAgentFieldBuilder().getBuilder();
     }
@@ -760,7 +762,7 @@ public com.google.cloud.dialogflow.v2beta1.AgentOrBuilder getAgentOrBuilder() {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -797,11 +799,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -816,11 +818,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -834,17 +836,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -857,14 +860,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * <code>.google.protobuf.FieldMask update_mask = 2;</code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -877,7 +879,7 @@ public Builder clearUpdateMask() {
      * <code>.google.protobuf.FieldMask update_mask = 2;</code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SetSuggestionFeatureConfigOperationMetadata.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SetSuggestionFeatureConfigOperationMetadata.java
index bbb03a38ce48..414e6d9e5d04 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SetSuggestionFeatureConfigOperationMetadata.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SetSuggestionFeatureConfigOperationMetadata.java
@@ -74,7 +74,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_PROFILE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object conversationProfile_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversationProfile_ = "";
   /**
    *
    *
@@ -127,7 +129,7 @@ public com.google.protobuf.ByteString getConversationProfileBytes() {
   }
 
   public static final int PARTICIPANT_ROLE_FIELD_NUMBER = 2;
-  private int participantRole_;
+  private int participantRole_ = 0;
   /**
    *
    *
@@ -162,16 +164,15 @@ public int getParticipantRoleValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.Participant.Role getParticipantRole() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.Participant.Role result =
-        com.google.cloud.dialogflow.v2beta1.Participant.Role.valueOf(participantRole_);
+        com.google.cloud.dialogflow.v2beta1.Participant.Role.forNumber(participantRole_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.Participant.Role.UNRECOGNIZED
         : result;
   }
 
   public static final int SUGGESTION_FEATURE_TYPE_FIELD_NUMBER = 3;
-  private int suggestionFeatureType_;
+  private int suggestionFeatureType_ = 0;
   /**
    *
    *
@@ -204,9 +205,9 @@ public int getSuggestionFeatureTypeValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type getSuggestionFeatureType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type result =
-        com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.valueOf(suggestionFeatureType_);
+        com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.forNumber(
+            suggestionFeatureType_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.UNRECOGNIZED
         : result;
@@ -255,7 +256,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -506,16 +507,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       conversationProfile_ = "";
-
       participantRole_ = 0;
-
       suggestionFeatureType_ = 0;
-
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
       return this;
@@ -549,18 +547,30 @@ public com.google.cloud.dialogflow.v2beta1.SetSuggestionFeatureConfigOperationMe
         buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SetSuggestionFeatureConfigOperationMetadata result =
           new com.google.cloud.dialogflow.v2beta1.SetSuggestionFeatureConfigOperationMetadata(this);
-      result.conversationProfile_ = conversationProfile_;
-      result.participantRole_ = participantRole_;
-      result.suggestionFeatureType_ = suggestionFeatureType_;
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.SetSuggestionFeatureConfigOperationMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversationProfile_ = conversationProfile_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.participantRole_ = participantRole_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.suggestionFeatureType_ = suggestionFeatureType_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -615,6 +625,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getConversationProfile().isEmpty()) {
         conversationProfile_ = other.conversationProfile_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.participantRole_ != 0) {
@@ -655,25 +666,25 @@ public Builder mergeFrom(
             case 10:
               {
                 conversationProfile_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 participantRole_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 24:
               {
                 suggestionFeatureType_ = input.readEnum();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 34:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -693,6 +704,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object conversationProfile_ = "";
     /**
      *
@@ -760,8 +773,8 @@ public Builder setConversationProfile(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversationProfile_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -779,8 +792,8 @@ public Builder setConversationProfile(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationProfile() {
-
       conversationProfile_ = getDefaultInstance().getConversationProfile();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -803,8 +816,8 @@ public Builder setConversationProfileBytes(com.google.protobuf.ByteString value)
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversationProfile_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -844,8 +857,8 @@ public int getParticipantRoleValue() {
      * @return This builder for chaining.
      */
     public Builder setParticipantRoleValue(int value) {
-
       participantRole_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -865,9 +878,8 @@ public Builder setParticipantRoleValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.Participant.Role getParticipantRole() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.Participant.Role result =
-          com.google.cloud.dialogflow.v2beta1.Participant.Role.valueOf(participantRole_);
+          com.google.cloud.dialogflow.v2beta1.Participant.Role.forNumber(participantRole_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.Participant.Role.UNRECOGNIZED
           : result;
@@ -891,7 +903,7 @@ public Builder setParticipantRole(com.google.cloud.dialogflow.v2beta1.Participan
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       participantRole_ = value.getNumber();
       onChanged();
       return this;
@@ -911,7 +923,7 @@ public Builder setParticipantRole(com.google.cloud.dialogflow.v2beta1.Participan
      * @return This builder for chaining.
      */
     public Builder clearParticipantRole() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       participantRole_ = 0;
       onChanged();
       return this;
@@ -950,8 +962,8 @@ public int getSuggestionFeatureTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setSuggestionFeatureTypeValue(int value) {
-
       suggestionFeatureType_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -970,9 +982,8 @@ public Builder setSuggestionFeatureTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type getSuggestionFeatureType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type result =
-          com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.valueOf(
+          com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.forNumber(
               suggestionFeatureType_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.UNRECOGNIZED
@@ -997,7 +1008,7 @@ public Builder setSuggestionFeatureType(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000004;
       suggestionFeatureType_ = value.getNumber();
       onChanged();
       return this;
@@ -1016,7 +1027,7 @@ public Builder setSuggestionFeatureType(
      * @return This builder for chaining.
      */
     public Builder clearSuggestionFeatureType() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       suggestionFeatureType_ = 0;
       onChanged();
       return this;
@@ -1040,7 +1051,7 @@ public Builder clearSuggestionFeatureType() {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1077,11 +1088,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1096,11 +1107,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1114,17 +1125,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
         } else {
           createTime_ = value;
         }
-        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1137,14 +1149,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * <code>.google.protobuf.Timestamp create_time = 4;</code>
      */
     public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1157,7 +1168,7 @@ public Builder clearCreateTime() {
      * <code>.google.protobuf.Timestamp create_time = 4;</code>
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SetSuggestionFeatureConfigRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SetSuggestionFeatureConfigRequest.java
index 9cdef599480d..4f5463b39c64 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SetSuggestionFeatureConfigRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SetSuggestionFeatureConfigRequest.java
@@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_PROFILE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object conversationProfile_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversationProfile_ = "";
   /**
    *
    *
@@ -124,7 +126,7 @@ public com.google.protobuf.ByteString getConversationProfileBytes() {
   }
 
   public static final int PARTICIPANT_ROLE_FIELD_NUMBER = 2;
-  private int participantRole_;
+  private int participantRole_ = 0;
   /**
    *
    *
@@ -159,9 +161,8 @@ public int getParticipantRoleValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.Participant.Role getParticipantRole() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.Participant.Role result =
-        com.google.cloud.dialogflow.v2beta1.Participant.Role.valueOf(participantRole_);
+        com.google.cloud.dialogflow.v2beta1.Participant.Role.forNumber(participantRole_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.Participant.Role.UNRECOGNIZED
         : result;
@@ -223,7 +224,10 @@ public boolean hasSuggestionFeatureConfig() {
   public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
           .SuggestionFeatureConfigOrBuilder
       getSuggestionFeatureConfigOrBuilder() {
-    return getSuggestionFeatureConfig();
+    return suggestionFeatureConfig_ == null
+        ? com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionFeatureConfig
+            .getDefaultInstance()
+        : suggestionFeatureConfig_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -453,14 +457,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       conversationProfile_ = "";
-
       participantRole_ = 0;
-
-      if (suggestionFeatureConfigBuilder_ == null) {
-        suggestionFeatureConfig_ = null;
-      } else {
-        suggestionFeatureConfig_ = null;
+      suggestionFeatureConfig_ = null;
+      if (suggestionFeatureConfigBuilder_ != null) {
+        suggestionFeatureConfigBuilder_.dispose();
         suggestionFeatureConfigBuilder_ = null;
       }
       return this;
@@ -492,17 +494,30 @@ public com.google.cloud.dialogflow.v2beta1.SetSuggestionFeatureConfigRequest bui
     public com.google.cloud.dialogflow.v2beta1.SetSuggestionFeatureConfigRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SetSuggestionFeatureConfigRequest result =
           new com.google.cloud.dialogflow.v2beta1.SetSuggestionFeatureConfigRequest(this);
-      result.conversationProfile_ = conversationProfile_;
-      result.participantRole_ = participantRole_;
-      if (suggestionFeatureConfigBuilder_ == null) {
-        result.suggestionFeatureConfig_ = suggestionFeatureConfig_;
-      } else {
-        result.suggestionFeatureConfig_ = suggestionFeatureConfigBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.SetSuggestionFeatureConfigRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversationProfile_ = conversationProfile_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.participantRole_ = participantRole_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.suggestionFeatureConfig_ =
+            suggestionFeatureConfigBuilder_ == null
+                ? suggestionFeatureConfig_
+                : suggestionFeatureConfigBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -554,6 +569,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getConversationProfile().isEmpty()) {
         conversationProfile_ = other.conversationProfile_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.participantRole_ != 0) {
@@ -591,20 +607,20 @@ public Builder mergeFrom(
             case 10:
               {
                 conversationProfile_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 participantRole_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 input.readMessage(
                     getSuggestionFeatureConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -624,6 +640,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object conversationProfile_ = "";
     /**
      *
@@ -691,8 +709,8 @@ public Builder setConversationProfile(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversationProfile_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -710,8 +728,8 @@ public Builder setConversationProfile(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversationProfile() {
-
       conversationProfile_ = getDefaultInstance().getConversationProfile();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -734,8 +752,8 @@ public Builder setConversationProfileBytes(com.google.protobuf.ByteString value)
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversationProfile_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -775,8 +793,8 @@ public int getParticipantRoleValue() {
      * @return This builder for chaining.
      */
     public Builder setParticipantRoleValue(int value) {
-
       participantRole_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -796,9 +814,8 @@ public Builder setParticipantRoleValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.Participant.Role getParticipantRole() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.Participant.Role result =
-          com.google.cloud.dialogflow.v2beta1.Participant.Role.valueOf(participantRole_);
+          com.google.cloud.dialogflow.v2beta1.Participant.Role.forNumber(participantRole_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.Participant.Role.UNRECOGNIZED
           : result;
@@ -822,7 +839,7 @@ public Builder setParticipantRole(com.google.cloud.dialogflow.v2beta1.Participan
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       participantRole_ = value.getNumber();
       onChanged();
       return this;
@@ -842,7 +859,7 @@ public Builder setParticipantRole(com.google.cloud.dialogflow.v2beta1.Participan
      * @return This builder for chaining.
      */
     public Builder clearParticipantRole() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       participantRole_ = 0;
       onChanged();
       return this;
@@ -871,7 +888,7 @@ public Builder clearParticipantRole() {
      * @return Whether the suggestionFeatureConfig field is set.
      */
     public boolean hasSuggestionFeatureConfig() {
-      return suggestionFeatureConfigBuilder_ != null || suggestionFeatureConfig_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -916,11 +933,11 @@ public Builder setSuggestionFeatureConfig(
           throw new NullPointerException();
         }
         suggestionFeatureConfig_ = value;
-        onChanged();
       } else {
         suggestionFeatureConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -940,11 +957,11 @@ public Builder setSuggestionFeatureConfig(
             builderForValue) {
       if (suggestionFeatureConfigBuilder_ == null) {
         suggestionFeatureConfig_ = builderForValue.build();
-        onChanged();
       } else {
         suggestionFeatureConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -962,20 +979,20 @@ public Builder mergeSuggestionFeatureConfig(
         com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionFeatureConfig
             value) {
       if (suggestionFeatureConfigBuilder_ == null) {
-        if (suggestionFeatureConfig_ != null) {
-          suggestionFeatureConfig_ =
-              com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionFeatureConfig
-                  .newBuilder(suggestionFeatureConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && suggestionFeatureConfig_ != null
+            && suggestionFeatureConfig_
+                != com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig
+                    .SuggestionFeatureConfig.getDefaultInstance()) {
+          getSuggestionFeatureConfigBuilder().mergeFrom(value);
         } else {
           suggestionFeatureConfig_ = value;
         }
-        onChanged();
       } else {
         suggestionFeatureConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -990,14 +1007,13 @@ public Builder mergeSuggestionFeatureConfig(
      * </code>
      */
     public Builder clearSuggestionFeatureConfig() {
-      if (suggestionFeatureConfigBuilder_ == null) {
-        suggestionFeatureConfig_ = null;
-        onChanged();
-      } else {
-        suggestionFeatureConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      suggestionFeatureConfig_ = null;
+      if (suggestionFeatureConfigBuilder_ != null) {
+        suggestionFeatureConfigBuilder_.dispose();
         suggestionFeatureConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1014,7 +1030,7 @@ public Builder clearSuggestionFeatureConfig() {
     public com.google.cloud.dialogflow.v2beta1.HumanAgentAssistantConfig.SuggestionFeatureConfig
             .Builder
         getSuggestionFeatureConfigBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getSuggestionFeatureConfigFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SmartReplyAnswer.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SmartReplyAnswer.java
index 38d0d9345851..8fbc4f2ced7c 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SmartReplyAnswer.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SmartReplyAnswer.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int REPLY_FIELD_NUMBER = 1;
-  private volatile java.lang.Object reply_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object reply_ = "";
   /**
    *
    *
@@ -118,7 +120,7 @@ public com.google.protobuf.ByteString getReplyBytes() {
   }
 
   public static final int CONFIDENCE_FIELD_NUMBER = 2;
-  private float confidence_;
+  private float confidence_ = 0F;
   /**
    *
    *
@@ -139,7 +141,9 @@ public float getConfidence() {
   }
 
   public static final int ANSWER_RECORD_FIELD_NUMBER = 3;
-  private volatile java.lang.Object answerRecord_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object answerRecord_ = "";
   /**
    *
    *
@@ -407,12 +411,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       reply_ = "";
-
       confidence_ = 0F;
-
       answerRecord_ = "";
-
       return this;
     }
 
@@ -440,13 +442,26 @@ public com.google.cloud.dialogflow.v2beta1.SmartReplyAnswer build() {
     public com.google.cloud.dialogflow.v2beta1.SmartReplyAnswer buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SmartReplyAnswer result =
           new com.google.cloud.dialogflow.v2beta1.SmartReplyAnswer(this);
-      result.reply_ = reply_;
-      result.confidence_ = confidence_;
-      result.answerRecord_ = answerRecord_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.SmartReplyAnswer result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.reply_ = reply_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.confidence_ = confidence_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.answerRecord_ = answerRecord_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -495,6 +510,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.SmartReplyAnswer ot
         return this;
       if (!other.getReply().isEmpty()) {
         reply_ = other.reply_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getConfidence() != 0F) {
@@ -502,6 +518,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.SmartReplyAnswer ot
       }
       if (!other.getAnswerRecord().isEmpty()) {
         answerRecord_ = other.answerRecord_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -533,19 +550,19 @@ public Builder mergeFrom(
             case 10:
               {
                 reply_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 21:
               {
                 confidence_ = input.readFloat();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 21
             case 26:
               {
                 answerRecord_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -565,6 +582,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object reply_ = "";
     /**
      *
@@ -626,8 +645,8 @@ public Builder setReply(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       reply_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -643,8 +662,8 @@ public Builder setReply(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearReply() {
-
       reply_ = getDefaultInstance().getReply();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -665,8 +684,8 @@ public Builder setReplyBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       reply_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -708,6 +727,7 @@ public float getConfidence() {
     public Builder setConfidence(float value) {
 
       confidence_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -726,7 +746,7 @@ public Builder setConfidence(float value) {
      * @return This builder for chaining.
      */
     public Builder clearConfidence() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       confidence_ = 0F;
       onChanged();
       return this;
@@ -799,8 +819,8 @@ public Builder setAnswerRecord(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       answerRecord_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -818,8 +838,8 @@ public Builder setAnswerRecord(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAnswerRecord() {
-
       answerRecord_ = getDefaultInstance().getAnswerRecord();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -842,8 +862,8 @@ public Builder setAnswerRecordBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       answerRecord_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SpeechContext.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SpeechContext.java
index f4971cac90a8..b8596509c821 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SpeechContext.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SpeechContext.java
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PHRASES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList phrases_;
   /**
    *
@@ -166,7 +168,7 @@ public com.google.protobuf.ByteString getPhrasesBytes(int index) {
   }
 
   public static final int BOOST_FIELD_NUMBER = 2;
-  private float boost_;
+  private float boost_ = 0F;
   /**
    *
    *
@@ -404,10 +406,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       phrases_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000001);
       boost_ = 0F;
-
       return this;
     }
 
@@ -435,15 +437,28 @@ public com.google.cloud.dialogflow.v2beta1.SpeechContext build() {
     public com.google.cloud.dialogflow.v2beta1.SpeechContext buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SpeechContext result =
           new com.google.cloud.dialogflow.v2beta1.SpeechContext(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.SpeechContext result) {
       if (((bitField0_ & 0x00000001) != 0)) {
         phrases_ = phrases_.getUnmodifiableView();
         bitField0_ = (bitField0_ & ~0x00000001);
       }
       result.phrases_ = phrases_;
-      result.boost_ = boost_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.SpeechContext result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.boost_ = boost_;
+      }
     }
 
     @java.lang.Override
@@ -541,7 +556,7 @@ public Builder mergeFrom(
             case 21:
               {
                 boost_ = input.readFloat();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 21
             default:
@@ -855,6 +870,7 @@ public float getBoost() {
     public Builder setBoost(float value) {
 
       boost_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -876,7 +892,7 @@ public Builder setBoost(float value) {
      * @return This builder for chaining.
      */
     public Builder clearBoost() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       boost_ = 0F;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SpeechToTextConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SpeechToTextConfig.java
index 42aff0df8859..daa531a6b69a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SpeechToTextConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SpeechToTextConfig.java
@@ -70,7 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SPEECH_MODEL_VARIANT_FIELD_NUMBER = 1;
-  private int speechModelVariant_;
+  private int speechModelVariant_ = 0;
   /**
    *
    *
@@ -115,16 +115,17 @@ public int getSpeechModelVariantValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.SpeechModelVariant getSpeechModelVariant() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.SpeechModelVariant result =
-        com.google.cloud.dialogflow.v2beta1.SpeechModelVariant.valueOf(speechModelVariant_);
+        com.google.cloud.dialogflow.v2beta1.SpeechModelVariant.forNumber(speechModelVariant_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.SpeechModelVariant.UNRECOGNIZED
         : result;
   }
 
   public static final int MODEL_FIELD_NUMBER = 2;
-  private volatile java.lang.Object model_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object model_ = "";
   /**
    *
    *
@@ -396,10 +397,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       speechModelVariant_ = 0;
-
       model_ = "";
-
       return this;
     }
 
@@ -427,12 +427,23 @@ public com.google.cloud.dialogflow.v2beta1.SpeechToTextConfig build() {
     public com.google.cloud.dialogflow.v2beta1.SpeechToTextConfig buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SpeechToTextConfig result =
           new com.google.cloud.dialogflow.v2beta1.SpeechToTextConfig(this);
-      result.speechModelVariant_ = speechModelVariant_;
-      result.model_ = model_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.SpeechToTextConfig result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.speechModelVariant_ = speechModelVariant_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.model_ = model_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -484,6 +495,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.SpeechToTextConfig
       }
       if (!other.getModel().isEmpty()) {
         model_ = other.model_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -515,13 +527,13 @@ public Builder mergeFrom(
             case 8:
               {
                 speechModelVariant_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 18:
               {
                 model_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -541,6 +553,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private int speechModelVariant_ = 0;
     /**
      *
@@ -586,8 +600,8 @@ public int getSpeechModelVariantValue() {
      * @return This builder for chaining.
      */
     public Builder setSpeechModelVariantValue(int value) {
-
       speechModelVariant_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -612,9 +626,8 @@ public Builder setSpeechModelVariantValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.SpeechModelVariant getSpeechModelVariant() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.SpeechModelVariant result =
-          com.google.cloud.dialogflow.v2beta1.SpeechModelVariant.valueOf(speechModelVariant_);
+          com.google.cloud.dialogflow.v2beta1.SpeechModelVariant.forNumber(speechModelVariant_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.SpeechModelVariant.UNRECOGNIZED
           : result;
@@ -644,7 +657,7 @@ public Builder setSpeechModelVariant(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       speechModelVariant_ = value.getNumber();
       onChanged();
       return this;
@@ -669,7 +682,7 @@ public Builder setSpeechModelVariant(
      * @return This builder for chaining.
      */
     public Builder clearSpeechModelVariant() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       speechModelVariant_ = 0;
       onChanged();
       return this;
@@ -754,8 +767,8 @@ public Builder setModel(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       model_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -777,8 +790,8 @@ public Builder setModel(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearModel() {
-
       model_ = getDefaultInstance().getModel();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -805,8 +818,8 @@ public Builder setModelBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       model_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SpeechWordInfo.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SpeechWordInfo.java
index 5360343d1fc9..a34dd2da587c 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SpeechWordInfo.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SpeechWordInfo.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int WORD_FIELD_NUMBER = 3;
-  private volatile java.lang.Object word_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object word_ = "";
   /**
    *
    *
@@ -165,7 +167,7 @@ public com.google.protobuf.Duration getStartOffset() {
    */
   @java.lang.Override
   public com.google.protobuf.DurationOrBuilder getStartOffsetOrBuilder() {
-    return getStartOffset();
+    return startOffset_ == null ? com.google.protobuf.Duration.getDefaultInstance() : startOffset_;
   }
 
   public static final int END_OFFSET_FIELD_NUMBER = 2;
@@ -217,11 +219,11 @@ public com.google.protobuf.Duration getEndOffset() {
    */
   @java.lang.Override
   public com.google.protobuf.DurationOrBuilder getEndOffsetOrBuilder() {
-    return getEndOffset();
+    return endOffset_ == null ? com.google.protobuf.Duration.getDefaultInstance() : endOffset_;
   }
 
   public static final int CONFIDENCE_FIELD_NUMBER = 4;
-  private float confidence_;
+  private float confidence_ = 0F;
   /**
    *
    *
@@ -478,22 +480,19 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       word_ = "";
-
-      if (startOffsetBuilder_ == null) {
-        startOffset_ = null;
-      } else {
-        startOffset_ = null;
+      startOffset_ = null;
+      if (startOffsetBuilder_ != null) {
+        startOffsetBuilder_.dispose();
         startOffsetBuilder_ = null;
       }
-      if (endOffsetBuilder_ == null) {
-        endOffset_ = null;
-      } else {
-        endOffset_ = null;
+      endOffset_ = null;
+      if (endOffsetBuilder_ != null) {
+        endOffsetBuilder_.dispose();
         endOffsetBuilder_ = null;
       }
       confidence_ = 0F;
-
       return this;
     }
 
@@ -521,22 +520,30 @@ public com.google.cloud.dialogflow.v2beta1.SpeechWordInfo build() {
     public com.google.cloud.dialogflow.v2beta1.SpeechWordInfo buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SpeechWordInfo result =
           new com.google.cloud.dialogflow.v2beta1.SpeechWordInfo(this);
-      result.word_ = word_;
-      if (startOffsetBuilder_ == null) {
-        result.startOffset_ = startOffset_;
-      } else {
-        result.startOffset_ = startOffsetBuilder_.build();
-      }
-      if (endOffsetBuilder_ == null) {
-        result.endOffset_ = endOffset_;
-      } else {
-        result.endOffset_ = endOffsetBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.confidence_ = confidence_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.SpeechWordInfo result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.word_ = word_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.startOffset_ =
+            startOffsetBuilder_ == null ? startOffset_ : startOffsetBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.endOffset_ = endOffsetBuilder_ == null ? endOffset_ : endOffsetBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.confidence_ = confidence_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -585,6 +592,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.SpeechWordInfo othe
         return this;
       if (!other.getWord().isEmpty()) {
         word_ = other.word_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasStartOffset()) {
@@ -625,25 +633,25 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getStartOffsetFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getEndOffsetFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 18
             case 26:
               {
                 word_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 26
             case 37:
               {
                 confidence_ = input.readFloat();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 37
             default:
@@ -663,6 +671,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object word_ = "";
     /**
      *
@@ -724,8 +734,8 @@ public Builder setWord(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       word_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -741,8 +751,8 @@ public Builder setWord(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearWord() {
-
       word_ = getDefaultInstance().getWord();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -763,8 +773,8 @@ public Builder setWordBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       word_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -789,7 +799,7 @@ public Builder setWordBytes(com.google.protobuf.ByteString value) {
      * @return Whether the startOffset field is set.
      */
     public boolean hasStartOffset() {
-      return startOffsetBuilder_ != null || startOffset_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -830,11 +840,11 @@ public Builder setStartOffset(com.google.protobuf.Duration value) {
           throw new NullPointerException();
         }
         startOffset_ = value;
-        onChanged();
       } else {
         startOffsetBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -851,11 +861,11 @@ public Builder setStartOffset(com.google.protobuf.Duration value) {
     public Builder setStartOffset(com.google.protobuf.Duration.Builder builderForValue) {
       if (startOffsetBuilder_ == null) {
         startOffset_ = builderForValue.build();
-        onChanged();
       } else {
         startOffsetBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -871,17 +881,18 @@ public Builder setStartOffset(com.google.protobuf.Duration.Builder builderForVal
      */
     public Builder mergeStartOffset(com.google.protobuf.Duration value) {
       if (startOffsetBuilder_ == null) {
-        if (startOffset_ != null) {
-          startOffset_ =
-              com.google.protobuf.Duration.newBuilder(startOffset_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && startOffset_ != null
+            && startOffset_ != com.google.protobuf.Duration.getDefaultInstance()) {
+          getStartOffsetBuilder().mergeFrom(value);
         } else {
           startOffset_ = value;
         }
-        onChanged();
       } else {
         startOffsetBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -896,14 +907,13 @@ public Builder mergeStartOffset(com.google.protobuf.Duration value) {
      * <code>.google.protobuf.Duration start_offset = 1;</code>
      */
     public Builder clearStartOffset() {
-      if (startOffsetBuilder_ == null) {
-        startOffset_ = null;
-        onChanged();
-      } else {
-        startOffset_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      startOffset_ = null;
+      if (startOffsetBuilder_ != null) {
+        startOffsetBuilder_.dispose();
         startOffsetBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -918,7 +928,7 @@ public Builder clearStartOffset() {
      * <code>.google.protobuf.Duration start_offset = 1;</code>
      */
     public com.google.protobuf.Duration.Builder getStartOffsetBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getStartOffsetFieldBuilder().getBuilder();
     }
@@ -990,7 +1000,7 @@ public com.google.protobuf.DurationOrBuilder getStartOffsetOrBuilder() {
      * @return Whether the endOffset field is set.
      */
     public boolean hasEndOffset() {
-      return endOffsetBuilder_ != null || endOffset_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1029,11 +1039,11 @@ public Builder setEndOffset(com.google.protobuf.Duration value) {
           throw new NullPointerException();
         }
         endOffset_ = value;
-        onChanged();
       } else {
         endOffsetBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1050,11 +1060,11 @@ public Builder setEndOffset(com.google.protobuf.Duration value) {
     public Builder setEndOffset(com.google.protobuf.Duration.Builder builderForValue) {
       if (endOffsetBuilder_ == null) {
         endOffset_ = builderForValue.build();
-        onChanged();
       } else {
         endOffsetBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1070,17 +1080,18 @@ public Builder setEndOffset(com.google.protobuf.Duration.Builder builderForValue
      */
     public Builder mergeEndOffset(com.google.protobuf.Duration value) {
       if (endOffsetBuilder_ == null) {
-        if (endOffset_ != null) {
-          endOffset_ =
-              com.google.protobuf.Duration.newBuilder(endOffset_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && endOffset_ != null
+            && endOffset_ != com.google.protobuf.Duration.getDefaultInstance()) {
+          getEndOffsetBuilder().mergeFrom(value);
         } else {
           endOffset_ = value;
         }
-        onChanged();
       } else {
         endOffsetBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1095,14 +1106,13 @@ public Builder mergeEndOffset(com.google.protobuf.Duration value) {
      * <code>.google.protobuf.Duration end_offset = 2;</code>
      */
     public Builder clearEndOffset() {
-      if (endOffsetBuilder_ == null) {
-        endOffset_ = null;
-        onChanged();
-      } else {
-        endOffset_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      endOffset_ = null;
+      if (endOffsetBuilder_ != null) {
+        endOffsetBuilder_.dispose();
         endOffsetBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1117,7 +1127,7 @@ public Builder clearEndOffset() {
      * <code>.google.protobuf.Duration end_offset = 2;</code>
      */
     public com.google.protobuf.Duration.Builder getEndOffsetBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getEndOffsetFieldBuilder().getBuilder();
     }
@@ -1208,6 +1218,7 @@ public float getConfidence() {
     public Builder setConfidence(float value) {
 
       confidence_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1228,7 +1239,7 @@ public Builder setConfidence(float value) {
      * @return This builder for chaining.
      */
     public Builder clearConfidence() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       confidence_ = 0F;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingAnalyzeContentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingAnalyzeContentRequest.java
index d92d5e7373f6..dd8c48662fed 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingAnalyzeContentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingAnalyzeContentRequest.java
@@ -194,7 +194,9 @@ public InputCase getInputCase() {
   }
 
   public static final int PARTICIPANT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object participant_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object participant_ = "";
   /**
    *
    *
@@ -410,7 +412,9 @@ public com.google.cloud.dialogflow.v2beta1.OutputAudioConfig getReplyAudioConfig
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.OutputAudioConfigOrBuilder
       getReplyAudioConfigOrBuilder() {
-    return getReplyAudioConfig();
+    return replyAudioConfig_ == null
+        ? com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.getDefaultInstance()
+        : replyAudioConfig_;
   }
 
   public static final int INPUT_AUDIO_FIELD_NUMBER = 5;
@@ -633,7 +637,9 @@ public com.google.cloud.dialogflow.v2beta1.QueryParameters getQueryParams() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.QueryParametersOrBuilder getQueryParamsOrBuilder() {
-    return getQueryParams();
+    return queryParams_ == null
+        ? com.google.cloud.dialogflow.v2beta1.QueryParameters.getDefaultInstance()
+        : queryParams_;
   }
 
   public static final int ASSIST_QUERY_PARAMS_FIELD_NUMBER = 8;
@@ -682,7 +688,9 @@ public com.google.cloud.dialogflow.v2beta1.AssistQueryParameters getAssistQueryP
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.AssistQueryParametersOrBuilder
       getAssistQueryParamsOrBuilder() {
-    return getAssistQueryParams();
+    return assistQueryParams_ == null
+        ? com.google.cloud.dialogflow.v2beta1.AssistQueryParameters.getDefaultInstance()
+        : assistQueryParams_;
   }
 
   public static final int CX_PARAMETERS_FIELD_NUMBER = 13;
@@ -740,11 +748,13 @@ public com.google.protobuf.Struct getCxParameters() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getCxParametersOrBuilder() {
-    return getCxParameters();
+    return cxParameters_ == null ? com.google.protobuf.Struct.getDefaultInstance() : cxParameters_;
   }
 
   public static final int CX_CURRENT_PAGE_FIELD_NUMBER = 15;
-  private volatile java.lang.Object cxCurrentPage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object cxCurrentPage_ = "";
   /**
    *
    *
@@ -815,7 +825,7 @@ public com.google.protobuf.ByteString getCxCurrentPageBytes() {
   }
 
   public static final int ENABLE_PARTIAL_AUTOMATED_AGENT_REPLY_FIELD_NUMBER = 12;
-  private boolean enablePartialAutomatedAgentReply_;
+  private boolean enablePartialAutomatedAgentReply_ = false;
   /**
    *
    *
@@ -1232,45 +1242,39 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       participant_ = "";
-
       if (audioConfigBuilder_ != null) {
         audioConfigBuilder_.clear();
       }
       if (textConfigBuilder_ != null) {
         textConfigBuilder_.clear();
       }
-      if (replyAudioConfigBuilder_ == null) {
-        replyAudioConfig_ = null;
-      } else {
-        replyAudioConfig_ = null;
+      replyAudioConfig_ = null;
+      if (replyAudioConfigBuilder_ != null) {
+        replyAudioConfigBuilder_.dispose();
         replyAudioConfigBuilder_ = null;
       }
       if (inputDtmfBuilder_ != null) {
         inputDtmfBuilder_.clear();
       }
-      if (queryParamsBuilder_ == null) {
-        queryParams_ = null;
-      } else {
-        queryParams_ = null;
+      queryParams_ = null;
+      if (queryParamsBuilder_ != null) {
+        queryParamsBuilder_.dispose();
         queryParamsBuilder_ = null;
       }
-      if (assistQueryParamsBuilder_ == null) {
-        assistQueryParams_ = null;
-      } else {
-        assistQueryParams_ = null;
+      assistQueryParams_ = null;
+      if (assistQueryParamsBuilder_ != null) {
+        assistQueryParamsBuilder_.dispose();
         assistQueryParamsBuilder_ = null;
       }
-      if (cxParametersBuilder_ == null) {
-        cxParameters_ = null;
-      } else {
-        cxParameters_ = null;
+      cxParameters_ = null;
+      if (cxParametersBuilder_ != null) {
+        cxParametersBuilder_.dispose();
         cxParametersBuilder_ = null;
       }
       cxCurrentPage_ = "";
-
       enablePartialAutomatedAgentReply_ = false;
-
       configCase_ = 0;
       config_ = null;
       inputCase_ = 0;
@@ -1304,60 +1308,61 @@ public com.google.cloud.dialogflow.v2beta1.StreamingAnalyzeContentRequest build(
     public com.google.cloud.dialogflow.v2beta1.StreamingAnalyzeContentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.StreamingAnalyzeContentRequest result =
           new com.google.cloud.dialogflow.v2beta1.StreamingAnalyzeContentRequest(this);
-      result.participant_ = participant_;
-      if (configCase_ == 2) {
-        if (audioConfigBuilder_ == null) {
-          result.config_ = config_;
-        } else {
-          result.config_ = audioConfigBuilder_.build();
-        }
-      }
-      if (configCase_ == 3) {
-        if (textConfigBuilder_ == null) {
-          result.config_ = config_;
-        } else {
-          result.config_ = textConfigBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (replyAudioConfigBuilder_ == null) {
-        result.replyAudioConfig_ = replyAudioConfig_;
-      } else {
-        result.replyAudioConfig_ = replyAudioConfigBuilder_.build();
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.StreamingAnalyzeContentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.participant_ = participant_;
       }
-      if (inputCase_ == 5) {
-        result.input_ = input_;
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.replyAudioConfig_ =
+            replyAudioConfigBuilder_ == null ? replyAudioConfig_ : replyAudioConfigBuilder_.build();
       }
-      if (inputCase_ == 6) {
-        result.input_ = input_;
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.queryParams_ =
+            queryParamsBuilder_ == null ? queryParams_ : queryParamsBuilder_.build();
       }
-      if (inputCase_ == 9) {
-        if (inputDtmfBuilder_ == null) {
-          result.input_ = input_;
-        } else {
-          result.input_ = inputDtmfBuilder_.build();
-        }
+      if (((from_bitField0_ & 0x00000100) != 0)) {
+        result.assistQueryParams_ =
+            assistQueryParamsBuilder_ == null
+                ? assistQueryParams_
+                : assistQueryParamsBuilder_.build();
       }
-      if (queryParamsBuilder_ == null) {
-        result.queryParams_ = queryParams_;
-      } else {
-        result.queryParams_ = queryParamsBuilder_.build();
+      if (((from_bitField0_ & 0x00000200) != 0)) {
+        result.cxParameters_ =
+            cxParametersBuilder_ == null ? cxParameters_ : cxParametersBuilder_.build();
       }
-      if (assistQueryParamsBuilder_ == null) {
-        result.assistQueryParams_ = assistQueryParams_;
-      } else {
-        result.assistQueryParams_ = assistQueryParamsBuilder_.build();
+      if (((from_bitField0_ & 0x00000400) != 0)) {
+        result.cxCurrentPage_ = cxCurrentPage_;
       }
-      if (cxParametersBuilder_ == null) {
-        result.cxParameters_ = cxParameters_;
-      } else {
-        result.cxParameters_ = cxParametersBuilder_.build();
+      if (((from_bitField0_ & 0x00000800) != 0)) {
+        result.enablePartialAutomatedAgentReply_ = enablePartialAutomatedAgentReply_;
       }
-      result.cxCurrentPage_ = cxCurrentPage_;
-      result.enablePartialAutomatedAgentReply_ = enablePartialAutomatedAgentReply_;
+    }
+
+    private void buildPartialOneofs(
+        com.google.cloud.dialogflow.v2beta1.StreamingAnalyzeContentRequest result) {
       result.configCase_ = configCase_;
+      result.config_ = this.config_;
+      if (configCase_ == 2 && audioConfigBuilder_ != null) {
+        result.config_ = audioConfigBuilder_.build();
+      }
+      if (configCase_ == 3 && textConfigBuilder_ != null) {
+        result.config_ = textConfigBuilder_.build();
+      }
       result.inputCase_ = inputCase_;
-      onBuilt();
-      return result;
+      result.input_ = this.input_;
+      if (inputCase_ == 9 && inputDtmfBuilder_ != null) {
+        result.input_ = inputDtmfBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -1411,6 +1416,7 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getParticipant().isEmpty()) {
         participant_ = other.participant_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasReplyAudioConfig()) {
@@ -1427,6 +1433,7 @@ public Builder mergeFrom(
       }
       if (!other.getCxCurrentPage().isEmpty()) {
         cxCurrentPage_ = other.cxCurrentPage_;
+        bitField0_ |= 0x00000400;
         onChanged();
       }
       if (other.getEnablePartialAutomatedAgentReply() != false) {
@@ -1500,7 +1507,7 @@ public Builder mergeFrom(
             case 10:
               {
                 participant_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -1519,7 +1526,7 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getReplyAudioConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 42:
@@ -1538,14 +1545,14 @@ public Builder mergeFrom(
             case 58:
               {
                 input.readMessage(getQueryParamsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 58
             case 66:
               {
                 input.readMessage(
                     getAssistQueryParamsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000100;
                 break;
               } // case 66
             case 74:
@@ -1557,19 +1564,19 @@ public Builder mergeFrom(
             case 96:
               {
                 enablePartialAutomatedAgentReply_ = input.readBool();
-
+                bitField0_ |= 0x00000800;
                 break;
               } // case 96
             case 106:
               {
                 input.readMessage(getCxParametersFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000200;
                 break;
               } // case 106
             case 122:
               {
                 cxCurrentPage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000400;
                 break;
               } // case 122
             default:
@@ -1617,6 +1624,8 @@ public Builder clearInput() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object participant_ = "";
     /**
      *
@@ -1690,8 +1699,8 @@ public Builder setParticipant(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       participant_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1711,8 +1720,8 @@ public Builder setParticipant(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParticipant() {
-
       participant_ = getDefaultInstance().getParticipant();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1737,8 +1746,8 @@ public Builder setParticipantBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       participant_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1950,7 +1959,6 @@ public com.google.cloud.dialogflow.v2beta1.InputAudioConfigOrBuilder getAudioCon
       }
       configCase_ = 2;
       onChanged();
-      ;
       return audioConfigBuilder_;
     }
 
@@ -2161,7 +2169,6 @@ public com.google.cloud.dialogflow.v2beta1.InputTextConfigOrBuilder getTextConfi
       }
       configCase_ = 3;
       onChanged();
-      ;
       return textConfigBuilder_;
     }
 
@@ -2187,7 +2194,7 @@ public com.google.cloud.dialogflow.v2beta1.InputTextConfigOrBuilder getTextConfi
      * @return Whether the replyAudioConfig field is set.
      */
     public boolean hasReplyAudioConfig() {
-      return replyAudioConfigBuilder_ != null || replyAudioConfig_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -2233,11 +2240,11 @@ public Builder setReplyAudioConfig(
           throw new NullPointerException();
         }
         replyAudioConfig_ = value;
-        onChanged();
       } else {
         replyAudioConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -2257,11 +2264,11 @@ public Builder setReplyAudioConfig(
         com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.Builder builderForValue) {
       if (replyAudioConfigBuilder_ == null) {
         replyAudioConfig_ = builderForValue.build();
-        onChanged();
       } else {
         replyAudioConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -2280,19 +2287,19 @@ public Builder setReplyAudioConfig(
     public Builder mergeReplyAudioConfig(
         com.google.cloud.dialogflow.v2beta1.OutputAudioConfig value) {
       if (replyAudioConfigBuilder_ == null) {
-        if (replyAudioConfig_ != null) {
-          replyAudioConfig_ =
-              com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.newBuilder(replyAudioConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && replyAudioConfig_ != null
+            && replyAudioConfig_
+                != com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.getDefaultInstance()) {
+          getReplyAudioConfigBuilder().mergeFrom(value);
         } else {
           replyAudioConfig_ = value;
         }
-        onChanged();
       } else {
         replyAudioConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -2309,14 +2316,13 @@ public Builder mergeReplyAudioConfig(
      * <code>.google.cloud.dialogflow.v2beta1.OutputAudioConfig reply_audio_config = 4;</code>
      */
     public Builder clearReplyAudioConfig() {
-      if (replyAudioConfigBuilder_ == null) {
-        replyAudioConfig_ = null;
-        onChanged();
-      } else {
-        replyAudioConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      replyAudioConfig_ = null;
+      if (replyAudioConfigBuilder_ != null) {
+        replyAudioConfigBuilder_.dispose();
         replyAudioConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2334,7 +2340,7 @@ public Builder clearReplyAudioConfig() {
      */
     public com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.Builder
         getReplyAudioConfigBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getReplyAudioConfigFieldBuilder().getBuilder();
     }
@@ -2849,7 +2855,6 @@ public com.google.cloud.dialogflow.v2beta1.TelephonyDtmfEvents.Builder getInputD
       }
       inputCase_ = 9;
       onChanged();
-      ;
       return inputDtmfBuilder_;
     }
 
@@ -2871,7 +2876,7 @@ public com.google.cloud.dialogflow.v2beta1.TelephonyDtmfEvents.Builder getInputD
      * @return Whether the queryParams field is set.
      */
     public boolean hasQueryParams() {
-      return queryParamsBuilder_ != null || queryParams_ != null;
+      return ((bitField0_ & 0x00000080) != 0);
     }
     /**
      *
@@ -2908,11 +2913,11 @@ public Builder setQueryParams(com.google.cloud.dialogflow.v2beta1.QueryParameter
           throw new NullPointerException();
         }
         queryParams_ = value;
-        onChanged();
       } else {
         queryParamsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2928,11 +2933,11 @@ public Builder setQueryParams(
         com.google.cloud.dialogflow.v2beta1.QueryParameters.Builder builderForValue) {
       if (queryParamsBuilder_ == null) {
         queryParams_ = builderForValue.build();
-        onChanged();
       } else {
         queryParamsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2946,19 +2951,19 @@ public Builder setQueryParams(
      */
     public Builder mergeQueryParams(com.google.cloud.dialogflow.v2beta1.QueryParameters value) {
       if (queryParamsBuilder_ == null) {
-        if (queryParams_ != null) {
-          queryParams_ =
-              com.google.cloud.dialogflow.v2beta1.QueryParameters.newBuilder(queryParams_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000080) != 0)
+            && queryParams_ != null
+            && queryParams_
+                != com.google.cloud.dialogflow.v2beta1.QueryParameters.getDefaultInstance()) {
+          getQueryParamsBuilder().mergeFrom(value);
         } else {
           queryParams_ = value;
         }
-        onChanged();
       } else {
         queryParamsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2971,14 +2976,13 @@ public Builder mergeQueryParams(com.google.cloud.dialogflow.v2beta1.QueryParamet
      * <code>.google.cloud.dialogflow.v2beta1.QueryParameters query_params = 7;</code>
      */
     public Builder clearQueryParams() {
-      if (queryParamsBuilder_ == null) {
-        queryParams_ = null;
-        onChanged();
-      } else {
-        queryParams_ = null;
+      bitField0_ = (bitField0_ & ~0x00000080);
+      queryParams_ = null;
+      if (queryParamsBuilder_ != null) {
+        queryParamsBuilder_.dispose();
         queryParamsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2991,7 +2995,7 @@ public Builder clearQueryParams() {
      * <code>.google.cloud.dialogflow.v2beta1.QueryParameters query_params = 7;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.QueryParameters.Builder getQueryParamsBuilder() {
-
+      bitField0_ |= 0x00000080;
       onChanged();
       return getQueryParamsFieldBuilder().getBuilder();
     }
@@ -3057,7 +3061,7 @@ public com.google.cloud.dialogflow.v2beta1.QueryParametersOrBuilder getQueryPara
      * @return Whether the assistQueryParams field is set.
      */
     public boolean hasAssistQueryParams() {
-      return assistQueryParamsBuilder_ != null || assistQueryParams_ != null;
+      return ((bitField0_ & 0x00000100) != 0);
     }
     /**
      *
@@ -3095,11 +3099,11 @@ public Builder setAssistQueryParams(
           throw new NullPointerException();
         }
         assistQueryParams_ = value;
-        onChanged();
       } else {
         assistQueryParamsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -3115,11 +3119,11 @@ public Builder setAssistQueryParams(
         com.google.cloud.dialogflow.v2beta1.AssistQueryParameters.Builder builderForValue) {
       if (assistQueryParamsBuilder_ == null) {
         assistQueryParams_ = builderForValue.build();
-        onChanged();
       } else {
         assistQueryParamsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -3134,20 +3138,19 @@ public Builder setAssistQueryParams(
     public Builder mergeAssistQueryParams(
         com.google.cloud.dialogflow.v2beta1.AssistQueryParameters value) {
       if (assistQueryParamsBuilder_ == null) {
-        if (assistQueryParams_ != null) {
-          assistQueryParams_ =
-              com.google.cloud.dialogflow.v2beta1.AssistQueryParameters.newBuilder(
-                      assistQueryParams_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000100) != 0)
+            && assistQueryParams_ != null
+            && assistQueryParams_
+                != com.google.cloud.dialogflow.v2beta1.AssistQueryParameters.getDefaultInstance()) {
+          getAssistQueryParamsBuilder().mergeFrom(value);
         } else {
           assistQueryParams_ = value;
         }
-        onChanged();
       } else {
         assistQueryParamsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -3160,14 +3163,13 @@ public Builder mergeAssistQueryParams(
      * <code>.google.cloud.dialogflow.v2beta1.AssistQueryParameters assist_query_params = 8;</code>
      */
     public Builder clearAssistQueryParams() {
-      if (assistQueryParamsBuilder_ == null) {
-        assistQueryParams_ = null;
-        onChanged();
-      } else {
-        assistQueryParams_ = null;
+      bitField0_ = (bitField0_ & ~0x00000100);
+      assistQueryParams_ = null;
+      if (assistQueryParamsBuilder_ != null) {
+        assistQueryParamsBuilder_.dispose();
         assistQueryParamsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3181,7 +3183,7 @@ public Builder clearAssistQueryParams() {
      */
     public com.google.cloud.dialogflow.v2beta1.AssistQueryParameters.Builder
         getAssistQueryParamsBuilder() {
-
+      bitField0_ |= 0x00000100;
       onChanged();
       return getAssistQueryParamsFieldBuilder().getBuilder();
     }
@@ -3252,7 +3254,7 @@ public Builder clearAssistQueryParams() {
      * @return Whether the cxParameters field is set.
      */
     public boolean hasCxParameters() {
-      return cxParametersBuilder_ != null || cxParameters_ != null;
+      return ((bitField0_ & 0x00000200) != 0);
     }
     /**
      *
@@ -3297,11 +3299,11 @@ public Builder setCxParameters(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         cxParameters_ = value;
-        onChanged();
       } else {
         cxParametersBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -3320,11 +3322,11 @@ public Builder setCxParameters(com.google.protobuf.Struct value) {
     public Builder setCxParameters(com.google.protobuf.Struct.Builder builderForValue) {
       if (cxParametersBuilder_ == null) {
         cxParameters_ = builderForValue.build();
-        onChanged();
       } else {
         cxParametersBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -3342,17 +3344,18 @@ public Builder setCxParameters(com.google.protobuf.Struct.Builder builderForValu
      */
     public Builder mergeCxParameters(com.google.protobuf.Struct value) {
       if (cxParametersBuilder_ == null) {
-        if (cxParameters_ != null) {
-          cxParameters_ =
-              com.google.protobuf.Struct.newBuilder(cxParameters_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000200) != 0)
+            && cxParameters_ != null
+            && cxParameters_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getCxParametersBuilder().mergeFrom(value);
         } else {
           cxParameters_ = value;
         }
-        onChanged();
       } else {
         cxParametersBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000200;
+      onChanged();
       return this;
     }
     /**
@@ -3369,14 +3372,13 @@ public Builder mergeCxParameters(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct cx_parameters = 13;</code>
      */
     public Builder clearCxParameters() {
-      if (cxParametersBuilder_ == null) {
-        cxParameters_ = null;
-        onChanged();
-      } else {
-        cxParameters_ = null;
+      bitField0_ = (bitField0_ & ~0x00000200);
+      cxParameters_ = null;
+      if (cxParametersBuilder_ != null) {
+        cxParametersBuilder_.dispose();
         cxParametersBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3393,7 +3395,7 @@ public Builder clearCxParameters() {
      * <code>.google.protobuf.Struct cx_parameters = 13;</code>
      */
     public com.google.protobuf.Struct.Builder getCxParametersBuilder() {
-
+      bitField0_ |= 0x00000200;
       onChanged();
       return getCxParametersFieldBuilder().getBuilder();
     }
@@ -3543,8 +3545,8 @@ public Builder setCxCurrentPage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       cxCurrentPage_ = value;
+      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -3571,8 +3573,8 @@ public Builder setCxCurrentPage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearCxCurrentPage() {
-
       cxCurrentPage_ = getDefaultInstance().getCxCurrentPage();
+      bitField0_ = (bitField0_ & ~0x00000400);
       onChanged();
       return this;
     }
@@ -3604,8 +3606,8 @@ public Builder setCxCurrentPageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       cxCurrentPage_ = value;
+      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -3647,6 +3649,7 @@ public boolean getEnablePartialAutomatedAgentReply() {
     public Builder setEnablePartialAutomatedAgentReply(boolean value) {
 
       enablePartialAutomatedAgentReply_ = value;
+      bitField0_ |= 0x00000800;
       onChanged();
       return this;
     }
@@ -3665,7 +3668,7 @@ public Builder setEnablePartialAutomatedAgentReply(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearEnablePartialAutomatedAgentReply() {
-
+      bitField0_ = (bitField0_ & ~0x00000800);
       enablePartialAutomatedAgentReply_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingAnalyzeContentResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingAnalyzeContentResponse.java
index 42fb5bbdf507..12bc4b518830 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingAnalyzeContentResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingAnalyzeContentResponse.java
@@ -136,11 +136,15 @@ public com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult getRecogni
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResultOrBuilder
       getRecognitionResultOrBuilder() {
-    return getRecognitionResult();
+    return recognitionResult_ == null
+        ? com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult.getDefaultInstance()
+        : recognitionResult_;
   }
 
   public static final int REPLY_TEXT_FIELD_NUMBER = 2;
-  private volatile java.lang.Object replyText_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object replyText_ = "";
   /**
    *
    *
@@ -259,7 +263,9 @@ public com.google.cloud.dialogflow.v2beta1.OutputAudio getReplyAudio() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.OutputAudioOrBuilder getReplyAudioOrBuilder() {
-    return getReplyAudio();
+    return replyAudio_ == null
+        ? com.google.cloud.dialogflow.v2beta1.OutputAudio.getDefaultInstance()
+        : replyAudio_;
   }
 
   public static final int AUTOMATED_AGENT_REPLY_FIELD_NUMBER = 4;
@@ -317,7 +323,9 @@ public com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply getAutomatedAgent
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.AutomatedAgentReplyOrBuilder
       getAutomatedAgentReplyOrBuilder() {
-    return getAutomatedAgentReply();
+    return automatedAgentReply_ == null
+        ? com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply.getDefaultInstance()
+        : automatedAgentReply_;
   }
 
   public static final int MESSAGE_FIELD_NUMBER = 6;
@@ -365,10 +373,14 @@ public com.google.cloud.dialogflow.v2beta1.Message getMessage() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.MessageOrBuilder getMessageOrBuilder() {
-    return getMessage();
+    return message_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Message.getDefaultInstance()
+        : message_;
   }
 
   public static final int HUMAN_AGENT_SUGGESTION_RESULTS_FIELD_NUMBER = 7;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.SuggestionResult>
       humanAgentSuggestionResults_;
   /**
@@ -462,6 +474,8 @@ public com.google.cloud.dialogflow.v2beta1.SuggestionResult getHumanAgentSuggest
   }
 
   public static final int END_USER_SUGGESTION_RESULTS_FIELD_NUMBER = 8;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.SuggestionResult>
       endUserSuggestionResults_;
   /**
@@ -599,7 +613,9 @@ public com.google.cloud.dialogflow.v2beta1.DtmfParameters getDtmfParameters() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.DtmfParametersOrBuilder getDtmfParametersOrBuilder() {
-    return getDtmfParameters();
+    return dtmfParameters_ == null
+        ? com.google.cloud.dialogflow.v2beta1.DtmfParameters.getDefaultInstance()
+        : dtmfParameters_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -917,30 +933,26 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (recognitionResultBuilder_ == null) {
-        recognitionResult_ = null;
-      } else {
-        recognitionResult_ = null;
+      bitField0_ = 0;
+      recognitionResult_ = null;
+      if (recognitionResultBuilder_ != null) {
+        recognitionResultBuilder_.dispose();
         recognitionResultBuilder_ = null;
       }
       replyText_ = "";
-
-      if (replyAudioBuilder_ == null) {
-        replyAudio_ = null;
-      } else {
-        replyAudio_ = null;
+      replyAudio_ = null;
+      if (replyAudioBuilder_ != null) {
+        replyAudioBuilder_.dispose();
         replyAudioBuilder_ = null;
       }
-      if (automatedAgentReplyBuilder_ == null) {
-        automatedAgentReply_ = null;
-      } else {
-        automatedAgentReply_ = null;
+      automatedAgentReply_ = null;
+      if (automatedAgentReplyBuilder_ != null) {
+        automatedAgentReplyBuilder_.dispose();
         automatedAgentReplyBuilder_ = null;
       }
-      if (messageBuilder_ == null) {
-        message_ = null;
-      } else {
-        message_ = null;
+      message_ = null;
+      if (messageBuilder_ != null) {
+        messageBuilder_.dispose();
         messageBuilder_ = null;
       }
       if (humanAgentSuggestionResultsBuilder_ == null) {
@@ -949,18 +961,17 @@ public Builder clear() {
         humanAgentSuggestionResults_ = null;
         humanAgentSuggestionResultsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000020);
       if (endUserSuggestionResultsBuilder_ == null) {
         endUserSuggestionResults_ = java.util.Collections.emptyList();
       } else {
         endUserSuggestionResults_ = null;
         endUserSuggestionResultsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
-      if (dtmfParametersBuilder_ == null) {
-        dtmfParameters_ = null;
-      } else {
-        dtmfParameters_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      dtmfParameters_ = null;
+      if (dtmfParametersBuilder_ != null) {
+        dtmfParametersBuilder_.dispose();
         dtmfParametersBuilder_ = null;
       }
       return this;
@@ -992,55 +1003,66 @@ public com.google.cloud.dialogflow.v2beta1.StreamingAnalyzeContentResponse build
     public com.google.cloud.dialogflow.v2beta1.StreamingAnalyzeContentResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.StreamingAnalyzeContentResponse result =
           new com.google.cloud.dialogflow.v2beta1.StreamingAnalyzeContentResponse(this);
-      int from_bitField0_ = bitField0_;
-      if (recognitionResultBuilder_ == null) {
-        result.recognitionResult_ = recognitionResult_;
-      } else {
-        result.recognitionResult_ = recognitionResultBuilder_.build();
-      }
-      result.replyText_ = replyText_;
-      if (replyAudioBuilder_ == null) {
-        result.replyAudio_ = replyAudio_;
-      } else {
-        result.replyAudio_ = replyAudioBuilder_.build();
-      }
-      if (automatedAgentReplyBuilder_ == null) {
-        result.automatedAgentReply_ = automatedAgentReply_;
-      } else {
-        result.automatedAgentReply_ = automatedAgentReplyBuilder_.build();
-      }
-      if (messageBuilder_ == null) {
-        result.message_ = message_;
-      } else {
-        result.message_ = messageBuilder_.build();
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.StreamingAnalyzeContentResponse result) {
       if (humanAgentSuggestionResultsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000020) != 0)) {
           humanAgentSuggestionResults_ =
               java.util.Collections.unmodifiableList(humanAgentSuggestionResults_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000020);
         }
         result.humanAgentSuggestionResults_ = humanAgentSuggestionResults_;
       } else {
         result.humanAgentSuggestionResults_ = humanAgentSuggestionResultsBuilder_.build();
       }
       if (endUserSuggestionResultsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000040) != 0)) {
           endUserSuggestionResults_ =
               java.util.Collections.unmodifiableList(endUserSuggestionResults_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000040);
         }
         result.endUserSuggestionResults_ = endUserSuggestionResults_;
       } else {
         result.endUserSuggestionResults_ = endUserSuggestionResultsBuilder_.build();
       }
-      if (dtmfParametersBuilder_ == null) {
-        result.dtmfParameters_ = dtmfParameters_;
-      } else {
-        result.dtmfParameters_ = dtmfParametersBuilder_.build();
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.StreamingAnalyzeContentResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.recognitionResult_ =
+            recognitionResultBuilder_ == null
+                ? recognitionResult_
+                : recognitionResultBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.replyText_ = replyText_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.replyAudio_ = replyAudioBuilder_ == null ? replyAudio_ : replyAudioBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.automatedAgentReply_ =
+            automatedAgentReplyBuilder_ == null
+                ? automatedAgentReply_
+                : automatedAgentReplyBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.message_ = messageBuilder_ == null ? message_ : messageBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.dtmfParameters_ =
+            dtmfParametersBuilder_ == null ? dtmfParameters_ : dtmfParametersBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -1097,6 +1119,7 @@ public Builder mergeFrom(
       }
       if (!other.getReplyText().isEmpty()) {
         replyText_ = other.replyText_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasReplyAudio()) {
@@ -1112,7 +1135,7 @@ public Builder mergeFrom(
         if (!other.humanAgentSuggestionResults_.isEmpty()) {
           if (humanAgentSuggestionResults_.isEmpty()) {
             humanAgentSuggestionResults_ = other.humanAgentSuggestionResults_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000020);
           } else {
             ensureHumanAgentSuggestionResultsIsMutable();
             humanAgentSuggestionResults_.addAll(other.humanAgentSuggestionResults_);
@@ -1125,7 +1148,7 @@ public Builder mergeFrom(
             humanAgentSuggestionResultsBuilder_.dispose();
             humanAgentSuggestionResultsBuilder_ = null;
             humanAgentSuggestionResults_ = other.humanAgentSuggestionResults_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000020);
             humanAgentSuggestionResultsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getHumanAgentSuggestionResultsFieldBuilder()
@@ -1139,7 +1162,7 @@ public Builder mergeFrom(
         if (!other.endUserSuggestionResults_.isEmpty()) {
           if (endUserSuggestionResults_.isEmpty()) {
             endUserSuggestionResults_ = other.endUserSuggestionResults_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000040);
           } else {
             ensureEndUserSuggestionResultsIsMutable();
             endUserSuggestionResults_.addAll(other.endUserSuggestionResults_);
@@ -1152,7 +1175,7 @@ public Builder mergeFrom(
             endUserSuggestionResultsBuilder_.dispose();
             endUserSuggestionResultsBuilder_ = null;
             endUserSuggestionResults_ = other.endUserSuggestionResults_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000040);
             endUserSuggestionResultsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getEndUserSuggestionResultsFieldBuilder()
@@ -1195,32 +1218,32 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getRecognitionResultFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 replyText_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getReplyAudioFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(
                     getAutomatedAgentReplyFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 50:
               {
                 input.readMessage(getMessageFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 50
             case 58:
@@ -1254,7 +1277,7 @@ public Builder mergeFrom(
             case 82:
               {
                 input.readMessage(getDtmfParametersFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 82
             default:
@@ -1295,7 +1318,7 @@ public Builder mergeFrom(
      * @return Whether the recognitionResult field is set.
      */
     public boolean hasRecognitionResult() {
-      return recognitionResultBuilder_ != null || recognitionResult_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -1335,11 +1358,11 @@ public Builder setRecognitionResult(
           throw new NullPointerException();
         }
         recognitionResult_ = value;
-        onChanged();
       } else {
         recognitionResultBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -1356,11 +1379,11 @@ public Builder setRecognitionResult(
         com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult.Builder builderForValue) {
       if (recognitionResultBuilder_ == null) {
         recognitionResult_ = builderForValue.build();
-        onChanged();
       } else {
         recognitionResultBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -1376,20 +1399,20 @@ public Builder setRecognitionResult(
     public Builder mergeRecognitionResult(
         com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult value) {
       if (recognitionResultBuilder_ == null) {
-        if (recognitionResult_ != null) {
-          recognitionResult_ =
-              com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult.newBuilder(
-                      recognitionResult_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && recognitionResult_ != null
+            && recognitionResult_
+                != com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult
+                    .getDefaultInstance()) {
+          getRecognitionResultBuilder().mergeFrom(value);
         } else {
           recognitionResult_ = value;
         }
-        onChanged();
       } else {
         recognitionResultBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -1403,14 +1426,13 @@ public Builder mergeRecognitionResult(
      * </code>
      */
     public Builder clearRecognitionResult() {
-      if (recognitionResultBuilder_ == null) {
-        recognitionResult_ = null;
-        onChanged();
-      } else {
-        recognitionResult_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      recognitionResult_ = null;
+      if (recognitionResultBuilder_ != null) {
+        recognitionResultBuilder_.dispose();
         recognitionResultBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1425,7 +1447,7 @@ public Builder clearRecognitionResult() {
      */
     public com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult.Builder
         getRecognitionResultBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getRecognitionResultFieldBuilder().getBuilder();
     }
@@ -1540,8 +1562,8 @@ public Builder setReplyText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       replyText_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1558,8 +1580,8 @@ public Builder setReplyText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearReplyText() {
-
       replyText_ = getDefaultInstance().getReplyText();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1581,8 +1603,8 @@ public Builder setReplyTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       replyText_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1613,7 +1635,7 @@ public Builder setReplyTextBytes(com.google.protobuf.ByteString value) {
      * @return Whether the replyAudio field is set.
      */
     public boolean hasReplyAudio() {
-      return replyAudioBuilder_ != null || replyAudio_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1666,11 +1688,11 @@ public Builder setReplyAudio(com.google.cloud.dialogflow.v2beta1.OutputAudio val
           throw new NullPointerException();
         }
         replyAudio_ = value;
-        onChanged();
       } else {
         replyAudioBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1694,11 +1716,11 @@ public Builder setReplyAudio(
         com.google.cloud.dialogflow.v2beta1.OutputAudio.Builder builderForValue) {
       if (replyAudioBuilder_ == null) {
         replyAudio_ = builderForValue.build();
-        onChanged();
       } else {
         replyAudioBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1720,19 +1742,19 @@ public Builder setReplyAudio(
      */
     public Builder mergeReplyAudio(com.google.cloud.dialogflow.v2beta1.OutputAudio value) {
       if (replyAudioBuilder_ == null) {
-        if (replyAudio_ != null) {
-          replyAudio_ =
-              com.google.cloud.dialogflow.v2beta1.OutputAudio.newBuilder(replyAudio_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && replyAudio_ != null
+            && replyAudio_
+                != com.google.cloud.dialogflow.v2beta1.OutputAudio.getDefaultInstance()) {
+          getReplyAudioBuilder().mergeFrom(value);
         } else {
           replyAudio_ = value;
         }
-        onChanged();
       } else {
         replyAudioBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1753,14 +1775,13 @@ public Builder mergeReplyAudio(com.google.cloud.dialogflow.v2beta1.OutputAudio v
      * <code>.google.cloud.dialogflow.v2beta1.OutputAudio reply_audio = 3;</code>
      */
     public Builder clearReplyAudio() {
-      if (replyAudioBuilder_ == null) {
-        replyAudio_ = null;
-        onChanged();
-      } else {
-        replyAudio_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      replyAudio_ = null;
+      if (replyAudioBuilder_ != null) {
+        replyAudioBuilder_.dispose();
         replyAudioBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1781,7 +1802,7 @@ public Builder clearReplyAudio() {
      * <code>.google.cloud.dialogflow.v2beta1.OutputAudio reply_audio = 3;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.OutputAudio.Builder getReplyAudioBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getReplyAudioFieldBuilder().getBuilder();
     }
@@ -1866,7 +1887,7 @@ public com.google.cloud.dialogflow.v2beta1.OutputAudioOrBuilder getReplyAudioOrB
      * @return Whether the automatedAgentReply field is set.
      */
     public boolean hasAutomatedAgentReply() {
-      return automatedAgentReplyBuilder_ != null || automatedAgentReply_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1910,11 +1931,11 @@ public Builder setAutomatedAgentReply(
           throw new NullPointerException();
         }
         automatedAgentReply_ = value;
-        onChanged();
       } else {
         automatedAgentReplyBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1933,11 +1954,11 @@ public Builder setAutomatedAgentReply(
         com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply.Builder builderForValue) {
       if (automatedAgentReplyBuilder_ == null) {
         automatedAgentReply_ = builderForValue.build();
-        onChanged();
       } else {
         automatedAgentReplyBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1955,20 +1976,19 @@ public Builder setAutomatedAgentReply(
     public Builder mergeAutomatedAgentReply(
         com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply value) {
       if (automatedAgentReplyBuilder_ == null) {
-        if (automatedAgentReply_ != null) {
-          automatedAgentReply_ =
-              com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply.newBuilder(
-                      automatedAgentReply_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && automatedAgentReply_ != null
+            && automatedAgentReply_
+                != com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply.getDefaultInstance()) {
+          getAutomatedAgentReplyBuilder().mergeFrom(value);
         } else {
           automatedAgentReply_ = value;
         }
-        onChanged();
       } else {
         automatedAgentReplyBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1984,14 +2004,13 @@ public Builder mergeAutomatedAgentReply(
      * <code>.google.cloud.dialogflow.v2beta1.AutomatedAgentReply automated_agent_reply = 4;</code>
      */
     public Builder clearAutomatedAgentReply() {
-      if (automatedAgentReplyBuilder_ == null) {
-        automatedAgentReply_ = null;
-        onChanged();
-      } else {
-        automatedAgentReply_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      automatedAgentReply_ = null;
+      if (automatedAgentReplyBuilder_ != null) {
+        automatedAgentReplyBuilder_.dispose();
         automatedAgentReplyBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2008,7 +2027,7 @@ public Builder clearAutomatedAgentReply() {
      */
     public com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply.Builder
         getAutomatedAgentReplyBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getAutomatedAgentReplyFieldBuilder().getBuilder();
     }
@@ -2081,7 +2100,7 @@ public Builder clearAutomatedAgentReply() {
      * @return Whether the message field is set.
      */
     public boolean hasMessage() {
-      return messageBuilder_ != null || message_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -2118,11 +2137,11 @@ public Builder setMessage(com.google.cloud.dialogflow.v2beta1.Message value) {
           throw new NullPointerException();
         }
         message_ = value;
-        onChanged();
       } else {
         messageBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2137,11 +2156,11 @@ public Builder setMessage(com.google.cloud.dialogflow.v2beta1.Message value) {
     public Builder setMessage(com.google.cloud.dialogflow.v2beta1.Message.Builder builderForValue) {
       if (messageBuilder_ == null) {
         message_ = builderForValue.build();
-        onChanged();
       } else {
         messageBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2155,19 +2174,18 @@ public Builder setMessage(com.google.cloud.dialogflow.v2beta1.Message.Builder bu
      */
     public Builder mergeMessage(com.google.cloud.dialogflow.v2beta1.Message value) {
       if (messageBuilder_ == null) {
-        if (message_ != null) {
-          message_ =
-              com.google.cloud.dialogflow.v2beta1.Message.newBuilder(message_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && message_ != null
+            && message_ != com.google.cloud.dialogflow.v2beta1.Message.getDefaultInstance()) {
+          getMessageBuilder().mergeFrom(value);
         } else {
           message_ = value;
         }
-        onChanged();
       } else {
         messageBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2180,14 +2198,13 @@ public Builder mergeMessage(com.google.cloud.dialogflow.v2beta1.Message value) {
      * <code>.google.cloud.dialogflow.v2beta1.Message message = 6;</code>
      */
     public Builder clearMessage() {
-      if (messageBuilder_ == null) {
-        message_ = null;
-        onChanged();
-      } else {
-        message_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      message_ = null;
+      if (messageBuilder_ != null) {
+        messageBuilder_.dispose();
         messageBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2200,7 +2217,7 @@ public Builder clearMessage() {
      * <code>.google.cloud.dialogflow.v2beta1.Message message = 6;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.Message.Builder getMessageBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getMessageFieldBuilder().getBuilder();
     }
@@ -2252,11 +2269,11 @@ public com.google.cloud.dialogflow.v2beta1.MessageOrBuilder getMessageOrBuilder(
         humanAgentSuggestionResults_ = java.util.Collections.emptyList();
 
     private void ensureHumanAgentSuggestionResultsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000020) != 0)) {
         humanAgentSuggestionResults_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.SuggestionResult>(
                 humanAgentSuggestionResults_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000020;
       }
     }
 
@@ -2522,7 +2539,7 @@ public Builder addAllHumanAgentSuggestionResults(
     public Builder clearHumanAgentSuggestionResults() {
       if (humanAgentSuggestionResultsBuilder_ == null) {
         humanAgentSuggestionResults_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000020);
         onChanged();
       } else {
         humanAgentSuggestionResultsBuilder_.clear();
@@ -2678,7 +2695,7 @@ public Builder removeHumanAgentSuggestionResults(int index) {
                 com.google.cloud.dialogflow.v2beta1.SuggestionResult.Builder,
                 com.google.cloud.dialogflow.v2beta1.SuggestionResultOrBuilder>(
                 humanAgentSuggestionResults_,
-                ((bitField0_ & 0x00000001) != 0),
+                ((bitField0_ & 0x00000020) != 0),
                 getParentForChildren(),
                 isClean());
         humanAgentSuggestionResults_ = null;
@@ -2690,11 +2707,11 @@ public Builder removeHumanAgentSuggestionResults(int index) {
         endUserSuggestionResults_ = java.util.Collections.emptyList();
 
     private void ensureEndUserSuggestionResultsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000040) != 0)) {
         endUserSuggestionResults_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.SuggestionResult>(
                 endUserSuggestionResults_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000040;
       }
     }
 
@@ -2959,7 +2976,7 @@ public Builder addAllEndUserSuggestionResults(
     public Builder clearEndUserSuggestionResults() {
       if (endUserSuggestionResultsBuilder_ == null) {
         endUserSuggestionResults_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000040);
         onChanged();
       } else {
         endUserSuggestionResultsBuilder_.clear();
@@ -3115,7 +3132,7 @@ public Builder removeEndUserSuggestionResults(int index) {
                 com.google.cloud.dialogflow.v2beta1.SuggestionResult.Builder,
                 com.google.cloud.dialogflow.v2beta1.SuggestionResultOrBuilder>(
                 endUserSuggestionResults_,
-                ((bitField0_ & 0x00000002) != 0),
+                ((bitField0_ & 0x00000040) != 0),
                 getParentForChildren(),
                 isClean());
         endUserSuggestionResults_ = null;
@@ -3141,7 +3158,7 @@ public Builder removeEndUserSuggestionResults(int index) {
      * @return Whether the dtmfParameters field is set.
      */
     public boolean hasDtmfParameters() {
-      return dtmfParametersBuilder_ != null || dtmfParameters_ != null;
+      return ((bitField0_ & 0x00000080) != 0);
     }
     /**
      *
@@ -3178,11 +3195,11 @@ public Builder setDtmfParameters(com.google.cloud.dialogflow.v2beta1.DtmfParamet
           throw new NullPointerException();
         }
         dtmfParameters_ = value;
-        onChanged();
       } else {
         dtmfParametersBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -3198,11 +3215,11 @@ public Builder setDtmfParameters(
         com.google.cloud.dialogflow.v2beta1.DtmfParameters.Builder builderForValue) {
       if (dtmfParametersBuilder_ == null) {
         dtmfParameters_ = builderForValue.build();
-        onChanged();
       } else {
         dtmfParametersBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -3216,19 +3233,19 @@ public Builder setDtmfParameters(
      */
     public Builder mergeDtmfParameters(com.google.cloud.dialogflow.v2beta1.DtmfParameters value) {
       if (dtmfParametersBuilder_ == null) {
-        if (dtmfParameters_ != null) {
-          dtmfParameters_ =
-              com.google.cloud.dialogflow.v2beta1.DtmfParameters.newBuilder(dtmfParameters_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000080) != 0)
+            && dtmfParameters_ != null
+            && dtmfParameters_
+                != com.google.cloud.dialogflow.v2beta1.DtmfParameters.getDefaultInstance()) {
+          getDtmfParametersBuilder().mergeFrom(value);
         } else {
           dtmfParameters_ = value;
         }
-        onChanged();
       } else {
         dtmfParametersBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -3241,14 +3258,13 @@ public Builder mergeDtmfParameters(com.google.cloud.dialogflow.v2beta1.DtmfParam
      * <code>.google.cloud.dialogflow.v2beta1.DtmfParameters dtmf_parameters = 10;</code>
      */
     public Builder clearDtmfParameters() {
-      if (dtmfParametersBuilder_ == null) {
-        dtmfParameters_ = null;
-        onChanged();
-      } else {
-        dtmfParameters_ = null;
+      bitField0_ = (bitField0_ & ~0x00000080);
+      dtmfParameters_ = null;
+      if (dtmfParametersBuilder_ != null) {
+        dtmfParametersBuilder_.dispose();
         dtmfParametersBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3261,7 +3277,7 @@ public Builder clearDtmfParameters() {
      * <code>.google.cloud.dialogflow.v2beta1.DtmfParameters dtmf_parameters = 10;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.DtmfParameters.Builder getDtmfParametersBuilder() {
-
+      bitField0_ |= 0x00000080;
       onChanged();
       return getDtmfParametersFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentRequest.java
index 60c841452275..1662c232eaf5 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentRequest.java
@@ -93,7 +93,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SESSION_FIELD_NUMBER = 1;
-  private volatile java.lang.Object session_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object session_ = "";
   /**
    *
    *
@@ -230,7 +232,9 @@ public com.google.cloud.dialogflow.v2beta1.QueryParameters getQueryParams() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.QueryParametersOrBuilder getQueryParamsOrBuilder() {
-    return getQueryParams();
+    return queryParams_ == null
+        ? com.google.cloud.dialogflow.v2beta1.QueryParameters.getDefaultInstance()
+        : queryParams_;
   }
 
   public static final int QUERY_INPUT_FIELD_NUMBER = 3;
@@ -296,11 +300,13 @@ public com.google.cloud.dialogflow.v2beta1.QueryInput getQueryInput() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.QueryInputOrBuilder getQueryInputOrBuilder() {
-    return getQueryInput();
+    return queryInput_ == null
+        ? com.google.cloud.dialogflow.v2beta1.QueryInput.getDefaultInstance()
+        : queryInput_;
   }
 
   public static final int SINGLE_UTTERANCE_FIELD_NUMBER = 4;
-  private boolean singleUtterance_;
+  private boolean singleUtterance_ = false;
   /**
    *
    *
@@ -380,7 +386,9 @@ public com.google.cloud.dialogflow.v2beta1.OutputAudioConfig getOutputAudioConfi
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.OutputAudioConfigOrBuilder
       getOutputAudioConfigOrBuilder() {
-    return getOutputAudioConfig();
+    return outputAudioConfig_ == null
+        ? com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.getDefaultInstance()
+        : outputAudioConfig_;
   }
 
   public static final int OUTPUT_AUDIO_CONFIG_MASK_FIELD_NUMBER = 7;
@@ -440,11 +448,13 @@ public com.google.protobuf.FieldMask getOutputAudioConfigMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getOutputAudioConfigMaskOrBuilder() {
-    return getOutputAudioConfigMask();
+    return outputAudioConfigMask_ == null
+        ? com.google.protobuf.FieldMask.getDefaultInstance()
+        : outputAudioConfigMask_;
   }
 
   public static final int INPUT_AUDIO_FIELD_NUMBER = 6;
-  private com.google.protobuf.ByteString inputAudio_;
+  private com.google.protobuf.ByteString inputAudio_ = com.google.protobuf.ByteString.EMPTY;
   /**
    *
    *
@@ -760,36 +770,30 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       session_ = "";
-
-      if (queryParamsBuilder_ == null) {
-        queryParams_ = null;
-      } else {
-        queryParams_ = null;
+      queryParams_ = null;
+      if (queryParamsBuilder_ != null) {
+        queryParamsBuilder_.dispose();
         queryParamsBuilder_ = null;
       }
-      if (queryInputBuilder_ == null) {
-        queryInput_ = null;
-      } else {
-        queryInput_ = null;
+      queryInput_ = null;
+      if (queryInputBuilder_ != null) {
+        queryInputBuilder_.dispose();
         queryInputBuilder_ = null;
       }
       singleUtterance_ = false;
-
-      if (outputAudioConfigBuilder_ == null) {
-        outputAudioConfig_ = null;
-      } else {
-        outputAudioConfig_ = null;
+      outputAudioConfig_ = null;
+      if (outputAudioConfigBuilder_ != null) {
+        outputAudioConfigBuilder_.dispose();
         outputAudioConfigBuilder_ = null;
       }
-      if (outputAudioConfigMaskBuilder_ == null) {
-        outputAudioConfigMask_ = null;
-      } else {
-        outputAudioConfigMask_ = null;
+      outputAudioConfigMask_ = null;
+      if (outputAudioConfigMaskBuilder_ != null) {
+        outputAudioConfigMaskBuilder_.dispose();
         outputAudioConfigMaskBuilder_ = null;
       }
       inputAudio_ = com.google.protobuf.ByteString.EMPTY;
-
       return this;
     }
 
@@ -818,31 +822,44 @@ public com.google.cloud.dialogflow.v2beta1.StreamingDetectIntentRequest build()
     public com.google.cloud.dialogflow.v2beta1.StreamingDetectIntentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.StreamingDetectIntentRequest result =
           new com.google.cloud.dialogflow.v2beta1.StreamingDetectIntentRequest(this);
-      result.session_ = session_;
-      if (queryParamsBuilder_ == null) {
-        result.queryParams_ = queryParams_;
-      } else {
-        result.queryParams_ = queryParamsBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (queryInputBuilder_ == null) {
-        result.queryInput_ = queryInput_;
-      } else {
-        result.queryInput_ = queryInputBuilder_.build();
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.StreamingDetectIntentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.session_ = session_;
       }
-      result.singleUtterance_ = singleUtterance_;
-      if (outputAudioConfigBuilder_ == null) {
-        result.outputAudioConfig_ = outputAudioConfig_;
-      } else {
-        result.outputAudioConfig_ = outputAudioConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.queryParams_ =
+            queryParamsBuilder_ == null ? queryParams_ : queryParamsBuilder_.build();
       }
-      if (outputAudioConfigMaskBuilder_ == null) {
-        result.outputAudioConfigMask_ = outputAudioConfigMask_;
-      } else {
-        result.outputAudioConfigMask_ = outputAudioConfigMaskBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.queryInput_ = queryInputBuilder_ == null ? queryInput_ : queryInputBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.singleUtterance_ = singleUtterance_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.outputAudioConfig_ =
+            outputAudioConfigBuilder_ == null
+                ? outputAudioConfig_
+                : outputAudioConfigBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.outputAudioConfigMask_ =
+            outputAudioConfigMaskBuilder_ == null
+                ? outputAudioConfigMask_
+                : outputAudioConfigMaskBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.inputAudio_ = inputAudio_;
       }
-      result.inputAudio_ = inputAudio_;
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -895,6 +912,7 @@ public Builder mergeFrom(
         return this;
       if (!other.getSession().isEmpty()) {
         session_ = other.session_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasQueryParams()) {
@@ -944,45 +962,45 @@ public Builder mergeFrom(
             case 10:
               {
                 session_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getQueryParamsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getQueryInputFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 32:
               {
                 singleUtterance_ = input.readBool();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 32
             case 42:
               {
                 input.readMessage(
                     getOutputAudioConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             case 50:
               {
                 inputAudio_ = input.readBytes();
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 50
             case 58:
               {
                 input.readMessage(
                     getOutputAudioConfigMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 58
             default:
@@ -1002,6 +1020,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object session_ = "";
     /**
      *
@@ -1129,8 +1149,8 @@ public Builder setSession(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       session_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1168,8 +1188,8 @@ public Builder setSession(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSession() {
-
       session_ = getDefaultInstance().getSession();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1212,8 +1232,8 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       session_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1236,7 +1256,7 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
      * @return Whether the queryParams field is set.
      */
     public boolean hasQueryParams() {
-      return queryParamsBuilder_ != null || queryParams_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -1273,11 +1293,11 @@ public Builder setQueryParams(com.google.cloud.dialogflow.v2beta1.QueryParameter
           throw new NullPointerException();
         }
         queryParams_ = value;
-        onChanged();
       } else {
         queryParamsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1293,11 +1313,11 @@ public Builder setQueryParams(
         com.google.cloud.dialogflow.v2beta1.QueryParameters.Builder builderForValue) {
       if (queryParamsBuilder_ == null) {
         queryParams_ = builderForValue.build();
-        onChanged();
       } else {
         queryParamsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1311,19 +1331,19 @@ public Builder setQueryParams(
      */
     public Builder mergeQueryParams(com.google.cloud.dialogflow.v2beta1.QueryParameters value) {
       if (queryParamsBuilder_ == null) {
-        if (queryParams_ != null) {
-          queryParams_ =
-              com.google.cloud.dialogflow.v2beta1.QueryParameters.newBuilder(queryParams_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && queryParams_ != null
+            && queryParams_
+                != com.google.cloud.dialogflow.v2beta1.QueryParameters.getDefaultInstance()) {
+          getQueryParamsBuilder().mergeFrom(value);
         } else {
           queryParams_ = value;
         }
-        onChanged();
       } else {
         queryParamsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1336,14 +1356,13 @@ public Builder mergeQueryParams(com.google.cloud.dialogflow.v2beta1.QueryParamet
      * <code>.google.cloud.dialogflow.v2beta1.QueryParameters query_params = 2;</code>
      */
     public Builder clearQueryParams() {
-      if (queryParamsBuilder_ == null) {
-        queryParams_ = null;
-        onChanged();
-      } else {
-        queryParams_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      queryParams_ = null;
+      if (queryParamsBuilder_ != null) {
+        queryParamsBuilder_.dispose();
         queryParamsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1356,7 +1375,7 @@ public Builder clearQueryParams() {
      * <code>.google.cloud.dialogflow.v2beta1.QueryParameters query_params = 2;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.QueryParameters.Builder getQueryParamsBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getQueryParamsFieldBuilder().getBuilder();
     }
@@ -1428,7 +1447,7 @@ public com.google.cloud.dialogflow.v2beta1.QueryParametersOrBuilder getQueryPara
      * @return Whether the queryInput field is set.
      */
     public boolean hasQueryInput() {
-      return queryInputBuilder_ != null || queryInput_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1477,11 +1496,11 @@ public Builder setQueryInput(com.google.cloud.dialogflow.v2beta1.QueryInput valu
           throw new NullPointerException();
         }
         queryInput_ = value;
-        onChanged();
       } else {
         queryInputBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1503,11 +1522,11 @@ public Builder setQueryInput(
         com.google.cloud.dialogflow.v2beta1.QueryInput.Builder builderForValue) {
       if (queryInputBuilder_ == null) {
         queryInput_ = builderForValue.build();
-        onChanged();
       } else {
         queryInputBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1527,19 +1546,18 @@ public Builder setQueryInput(
      */
     public Builder mergeQueryInput(com.google.cloud.dialogflow.v2beta1.QueryInput value) {
       if (queryInputBuilder_ == null) {
-        if (queryInput_ != null) {
-          queryInput_ =
-              com.google.cloud.dialogflow.v2beta1.QueryInput.newBuilder(queryInput_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && queryInput_ != null
+            && queryInput_ != com.google.cloud.dialogflow.v2beta1.QueryInput.getDefaultInstance()) {
+          getQueryInputBuilder().mergeFrom(value);
         } else {
           queryInput_ = value;
         }
-        onChanged();
       } else {
         queryInputBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1558,14 +1576,13 @@ public Builder mergeQueryInput(com.google.cloud.dialogflow.v2beta1.QueryInput va
      * </code>
      */
     public Builder clearQueryInput() {
-      if (queryInputBuilder_ == null) {
-        queryInput_ = null;
-        onChanged();
-      } else {
-        queryInput_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      queryInput_ = null;
+      if (queryInputBuilder_ != null) {
+        queryInputBuilder_.dispose();
         queryInputBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1584,7 +1601,7 @@ public Builder clearQueryInput() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.QueryInput.Builder getQueryInputBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getQueryInputFieldBuilder().getBuilder();
     }
@@ -1697,6 +1714,7 @@ public boolean getSingleUtterance() {
     public Builder setSingleUtterance(boolean value) {
 
       singleUtterance_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1723,7 +1741,7 @@ public Builder setSingleUtterance(boolean value) {
      */
     @java.lang.Deprecated
     public Builder clearSingleUtterance() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       singleUtterance_ = false;
       onChanged();
       return this;
@@ -1749,7 +1767,7 @@ public Builder clearSingleUtterance() {
      * @return Whether the outputAudioConfig field is set.
      */
     public boolean hasOutputAudioConfig() {
-      return outputAudioConfigBuilder_ != null || outputAudioConfig_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -1791,11 +1809,11 @@ public Builder setOutputAudioConfig(
           throw new NullPointerException();
         }
         outputAudioConfig_ = value;
-        onChanged();
       } else {
         outputAudioConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1813,11 +1831,11 @@ public Builder setOutputAudioConfig(
         com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.Builder builderForValue) {
       if (outputAudioConfigBuilder_ == null) {
         outputAudioConfig_ = builderForValue.build();
-        onChanged();
       } else {
         outputAudioConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1834,19 +1852,19 @@ public Builder setOutputAudioConfig(
     public Builder mergeOutputAudioConfig(
         com.google.cloud.dialogflow.v2beta1.OutputAudioConfig value) {
       if (outputAudioConfigBuilder_ == null) {
-        if (outputAudioConfig_ != null) {
-          outputAudioConfig_ =
-              com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.newBuilder(outputAudioConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && outputAudioConfig_ != null
+            && outputAudioConfig_
+                != com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.getDefaultInstance()) {
+          getOutputAudioConfigBuilder().mergeFrom(value);
         } else {
           outputAudioConfig_ = value;
         }
-        onChanged();
       } else {
         outputAudioConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1861,14 +1879,13 @@ public Builder mergeOutputAudioConfig(
      * <code>.google.cloud.dialogflow.v2beta1.OutputAudioConfig output_audio_config = 5;</code>
      */
     public Builder clearOutputAudioConfig() {
-      if (outputAudioConfigBuilder_ == null) {
-        outputAudioConfig_ = null;
-        onChanged();
-      } else {
-        outputAudioConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      outputAudioConfig_ = null;
+      if (outputAudioConfigBuilder_ != null) {
+        outputAudioConfigBuilder_.dispose();
         outputAudioConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1884,7 +1901,7 @@ public Builder clearOutputAudioConfig() {
      */
     public com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.Builder
         getOutputAudioConfigBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getOutputAudioConfigFieldBuilder().getBuilder();
     }
@@ -1959,7 +1976,7 @@ public Builder clearOutputAudioConfig() {
      * @return Whether the outputAudioConfigMask field is set.
      */
     public boolean hasOutputAudioConfigMask() {
-      return outputAudioConfigMaskBuilder_ != null || outputAudioConfigMask_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -2004,11 +2021,11 @@ public Builder setOutputAudioConfigMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         outputAudioConfigMask_ = value;
-        onChanged();
       } else {
         outputAudioConfigMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2027,11 +2044,11 @@ public Builder setOutputAudioConfigMask(com.google.protobuf.FieldMask value) {
     public Builder setOutputAudioConfigMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (outputAudioConfigMaskBuilder_ == null) {
         outputAudioConfigMask_ = builderForValue.build();
-        onChanged();
       } else {
         outputAudioConfigMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2049,19 +2066,18 @@ public Builder setOutputAudioConfigMask(com.google.protobuf.FieldMask.Builder bu
      */
     public Builder mergeOutputAudioConfigMask(com.google.protobuf.FieldMask value) {
       if (outputAudioConfigMaskBuilder_ == null) {
-        if (outputAudioConfigMask_ != null) {
-          outputAudioConfigMask_ =
-              com.google.protobuf.FieldMask.newBuilder(outputAudioConfigMask_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && outputAudioConfigMask_ != null
+            && outputAudioConfigMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getOutputAudioConfigMaskBuilder().mergeFrom(value);
         } else {
           outputAudioConfigMask_ = value;
         }
-        onChanged();
       } else {
         outputAudioConfigMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2078,14 +2094,13 @@ public Builder mergeOutputAudioConfigMask(com.google.protobuf.FieldMask value) {
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
      */
     public Builder clearOutputAudioConfigMask() {
-      if (outputAudioConfigMaskBuilder_ == null) {
-        outputAudioConfigMask_ = null;
-        onChanged();
-      } else {
-        outputAudioConfigMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      outputAudioConfigMask_ = null;
+      if (outputAudioConfigMaskBuilder_ != null) {
+        outputAudioConfigMaskBuilder_.dispose();
         outputAudioConfigMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2102,7 +2117,7 @@ public Builder clearOutputAudioConfigMask() {
      * <code>.google.protobuf.FieldMask output_audio_config_mask = 7;</code>
      */
     public com.google.protobuf.FieldMask.Builder getOutputAudioConfigMaskBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getOutputAudioConfigMaskFieldBuilder().getBuilder();
     }
@@ -2194,8 +2209,8 @@ public Builder setInputAudio(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       inputAudio_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2213,7 +2228,7 @@ public Builder setInputAudio(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearInputAudio() {
-
+      bitField0_ = (bitField0_ & ~0x00000040);
       inputAudio_ = getDefaultInstance().getInputAudio();
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentResponse.java
index 3879cdf1adc0..1938728dbc93 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentResponse.java
@@ -83,7 +83,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RESPONSE_ID_FIELD_NUMBER = 1;
-  private volatile java.lang.Object responseId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object responseId_ = "";
   /**
    *
    *
@@ -182,7 +184,9 @@ public com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult getRecogni
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResultOrBuilder
       getRecognitionResultOrBuilder() {
-    return getRecognitionResult();
+    return recognitionResult_ == null
+        ? com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult.getDefaultInstance()
+        : recognitionResult_;
   }
 
   public static final int QUERY_RESULT_FIELD_NUMBER = 3;
@@ -233,10 +237,14 @@ public com.google.cloud.dialogflow.v2beta1.QueryResult getQueryResult() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.QueryResultOrBuilder getQueryResultOrBuilder() {
-    return getQueryResult();
+    return queryResult_ == null
+        ? com.google.cloud.dialogflow.v2beta1.QueryResult.getDefaultInstance()
+        : queryResult_;
   }
 
   public static final int ALTERNATIVE_QUERY_RESULTS_FIELD_NUMBER = 7;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.QueryResult> alternativeQueryResults_;
   /**
    *
@@ -390,11 +398,11 @@ public com.google.rpc.Status getWebhookStatus() {
    */
   @java.lang.Override
   public com.google.rpc.StatusOrBuilder getWebhookStatusOrBuilder() {
-    return getWebhookStatus();
+    return webhookStatus_ == null ? com.google.rpc.Status.getDefaultInstance() : webhookStatus_;
   }
 
   public static final int OUTPUT_AUDIO_FIELD_NUMBER = 5;
-  private com.google.protobuf.ByteString outputAudio_;
+  private com.google.protobuf.ByteString outputAudio_ = com.google.protobuf.ByteString.EMPTY;
   /**
    *
    *
@@ -465,7 +473,9 @@ public com.google.cloud.dialogflow.v2beta1.OutputAudioConfig getOutputAudioConfi
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.OutputAudioConfigOrBuilder
       getOutputAudioConfigOrBuilder() {
-    return getOutputAudioConfig();
+    return outputAudioConfig_ == null
+        ? com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.getDefaultInstance()
+        : outputAudioConfig_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -760,18 +770,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       responseId_ = "";
-
-      if (recognitionResultBuilder_ == null) {
-        recognitionResult_ = null;
-      } else {
-        recognitionResult_ = null;
+      recognitionResult_ = null;
+      if (recognitionResultBuilder_ != null) {
+        recognitionResultBuilder_.dispose();
         recognitionResultBuilder_ = null;
       }
-      if (queryResultBuilder_ == null) {
-        queryResult_ = null;
-      } else {
-        queryResult_ = null;
+      queryResult_ = null;
+      if (queryResultBuilder_ != null) {
+        queryResultBuilder_.dispose();
         queryResultBuilder_ = null;
       }
       if (alternativeQueryResultsBuilder_ == null) {
@@ -780,19 +788,16 @@ public Builder clear() {
         alternativeQueryResults_ = null;
         alternativeQueryResultsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
-      if (webhookStatusBuilder_ == null) {
-        webhookStatus_ = null;
-      } else {
-        webhookStatus_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      webhookStatus_ = null;
+      if (webhookStatusBuilder_ != null) {
+        webhookStatusBuilder_.dispose();
         webhookStatusBuilder_ = null;
       }
       outputAudio_ = com.google.protobuf.ByteString.EMPTY;
-
-      if (outputAudioConfigBuilder_ == null) {
-        outputAudioConfig_ = null;
-      } else {
-        outputAudioConfig_ = null;
+      outputAudioConfig_ = null;
+      if (outputAudioConfigBuilder_ != null) {
+        outputAudioConfigBuilder_.dispose();
         outputAudioConfigBuilder_ = null;
       }
       return this;
@@ -823,41 +828,57 @@ public com.google.cloud.dialogflow.v2beta1.StreamingDetectIntentResponse build()
     public com.google.cloud.dialogflow.v2beta1.StreamingDetectIntentResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.StreamingDetectIntentResponse result =
           new com.google.cloud.dialogflow.v2beta1.StreamingDetectIntentResponse(this);
-      int from_bitField0_ = bitField0_;
-      result.responseId_ = responseId_;
-      if (recognitionResultBuilder_ == null) {
-        result.recognitionResult_ = recognitionResult_;
-      } else {
-        result.recognitionResult_ = recognitionResultBuilder_.build();
-      }
-      if (queryResultBuilder_ == null) {
-        result.queryResult_ = queryResult_;
-      } else {
-        result.queryResult_ = queryResultBuilder_.build();
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.StreamingDetectIntentResponse result) {
       if (alternativeQueryResultsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000008) != 0)) {
           alternativeQueryResults_ =
               java.util.Collections.unmodifiableList(alternativeQueryResults_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000008);
         }
         result.alternativeQueryResults_ = alternativeQueryResults_;
       } else {
         result.alternativeQueryResults_ = alternativeQueryResultsBuilder_.build();
       }
-      if (webhookStatusBuilder_ == null) {
-        result.webhookStatus_ = webhookStatus_;
-      } else {
-        result.webhookStatus_ = webhookStatusBuilder_.build();
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.StreamingDetectIntentResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.responseId_ = responseId_;
       }
-      result.outputAudio_ = outputAudio_;
-      if (outputAudioConfigBuilder_ == null) {
-        result.outputAudioConfig_ = outputAudioConfig_;
-      } else {
-        result.outputAudioConfig_ = outputAudioConfigBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.recognitionResult_ =
+            recognitionResultBuilder_ == null
+                ? recognitionResult_
+                : recognitionResultBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.queryResult_ =
+            queryResultBuilder_ == null ? queryResult_ : queryResultBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.webhookStatus_ =
+            webhookStatusBuilder_ == null ? webhookStatus_ : webhookStatusBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.outputAudio_ = outputAudio_;
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.outputAudioConfig_ =
+            outputAudioConfigBuilder_ == null
+                ? outputAudioConfig_
+                : outputAudioConfigBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -910,6 +931,7 @@ public Builder mergeFrom(
         return this;
       if (!other.getResponseId().isEmpty()) {
         responseId_ = other.responseId_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasRecognitionResult()) {
@@ -922,7 +944,7 @@ public Builder mergeFrom(
         if (!other.alternativeQueryResults_.isEmpty()) {
           if (alternativeQueryResults_.isEmpty()) {
             alternativeQueryResults_ = other.alternativeQueryResults_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000008);
           } else {
             ensureAlternativeQueryResultsIsMutable();
             alternativeQueryResults_.addAll(other.alternativeQueryResults_);
@@ -935,7 +957,7 @@ public Builder mergeFrom(
             alternativeQueryResultsBuilder_.dispose();
             alternativeQueryResultsBuilder_ = null;
             alternativeQueryResults_ = other.alternativeQueryResults_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000008);
             alternativeQueryResultsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getAlternativeQueryResultsFieldBuilder()
@@ -983,39 +1005,39 @@ public Builder mergeFrom(
             case 10:
               {
                 responseId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(
                     getRecognitionResultFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getQueryResultFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(getWebhookStatusFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 34
             case 42:
               {
                 outputAudio_ = input.readBytes();
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 42
             case 50:
               {
                 input.readMessage(
                     getOutputAudioConfigFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 50
             case 58:
@@ -1115,8 +1137,8 @@ public Builder setResponseId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       responseId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1133,8 +1155,8 @@ public Builder setResponseId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearResponseId() {
-
       responseId_ = getDefaultInstance().getResponseId();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1156,8 +1178,8 @@ public Builder setResponseIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       responseId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1181,7 +1203,7 @@ public Builder setResponseIdBytes(com.google.protobuf.ByteString value) {
      * @return Whether the recognitionResult field is set.
      */
     public boolean hasRecognitionResult() {
-      return recognitionResultBuilder_ != null || recognitionResult_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -1221,11 +1243,11 @@ public Builder setRecognitionResult(
           throw new NullPointerException();
         }
         recognitionResult_ = value;
-        onChanged();
       } else {
         recognitionResultBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1242,11 +1264,11 @@ public Builder setRecognitionResult(
         com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult.Builder builderForValue) {
       if (recognitionResultBuilder_ == null) {
         recognitionResult_ = builderForValue.build();
-        onChanged();
       } else {
         recognitionResultBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1262,20 +1284,20 @@ public Builder setRecognitionResult(
     public Builder mergeRecognitionResult(
         com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult value) {
       if (recognitionResultBuilder_ == null) {
-        if (recognitionResult_ != null) {
-          recognitionResult_ =
-              com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult.newBuilder(
-                      recognitionResult_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && recognitionResult_ != null
+            && recognitionResult_
+                != com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult
+                    .getDefaultInstance()) {
+          getRecognitionResultBuilder().mergeFrom(value);
         } else {
           recognitionResult_ = value;
         }
-        onChanged();
       } else {
         recognitionResultBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1289,14 +1311,13 @@ public Builder mergeRecognitionResult(
      * </code>
      */
     public Builder clearRecognitionResult() {
-      if (recognitionResultBuilder_ == null) {
-        recognitionResult_ = null;
-        onChanged();
-      } else {
-        recognitionResult_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      recognitionResult_ = null;
+      if (recognitionResultBuilder_ != null) {
+        recognitionResultBuilder_.dispose();
         recognitionResultBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1311,7 +1332,7 @@ public Builder clearRecognitionResult() {
      */
     public com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult.Builder
         getRecognitionResultBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getRecognitionResultFieldBuilder().getBuilder();
     }
@@ -1381,7 +1402,7 @@ public Builder clearRecognitionResult() {
      * @return Whether the queryResult field is set.
      */
     public boolean hasQueryResult() {
-      return queryResultBuilder_ != null || queryResult_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1420,11 +1441,11 @@ public Builder setQueryResult(com.google.cloud.dialogflow.v2beta1.QueryResult va
           throw new NullPointerException();
         }
         queryResult_ = value;
-        onChanged();
       } else {
         queryResultBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1441,11 +1462,11 @@ public Builder setQueryResult(
         com.google.cloud.dialogflow.v2beta1.QueryResult.Builder builderForValue) {
       if (queryResultBuilder_ == null) {
         queryResult_ = builderForValue.build();
-        onChanged();
       } else {
         queryResultBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1460,19 +1481,19 @@ public Builder setQueryResult(
      */
     public Builder mergeQueryResult(com.google.cloud.dialogflow.v2beta1.QueryResult value) {
       if (queryResultBuilder_ == null) {
-        if (queryResult_ != null) {
-          queryResult_ =
-              com.google.cloud.dialogflow.v2beta1.QueryResult.newBuilder(queryResult_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && queryResult_ != null
+            && queryResult_
+                != com.google.cloud.dialogflow.v2beta1.QueryResult.getDefaultInstance()) {
+          getQueryResultBuilder().mergeFrom(value);
         } else {
           queryResult_ = value;
         }
-        onChanged();
       } else {
         queryResultBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1486,14 +1507,13 @@ public Builder mergeQueryResult(com.google.cloud.dialogflow.v2beta1.QueryResult
      * <code>.google.cloud.dialogflow.v2beta1.QueryResult query_result = 3;</code>
      */
     public Builder clearQueryResult() {
-      if (queryResultBuilder_ == null) {
-        queryResult_ = null;
-        onChanged();
-      } else {
-        queryResult_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      queryResult_ = null;
+      if (queryResultBuilder_ != null) {
+        queryResultBuilder_.dispose();
         queryResultBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1507,7 +1527,7 @@ public Builder clearQueryResult() {
      * <code>.google.cloud.dialogflow.v2beta1.QueryResult query_result = 3;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.QueryResult.Builder getQueryResultBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getQueryResultFieldBuilder().getBuilder();
     }
@@ -1561,11 +1581,11 @@ public com.google.cloud.dialogflow.v2beta1.QueryResultOrBuilder getQueryResultOr
         alternativeQueryResults_ = java.util.Collections.emptyList();
 
     private void ensureAlternativeQueryResultsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         alternativeQueryResults_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.QueryResult>(
                 alternativeQueryResults_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000008;
       }
     }
 
@@ -1873,7 +1893,7 @@ public Builder addAllAlternativeQueryResults(
     public Builder clearAlternativeQueryResults() {
       if (alternativeQueryResultsBuilder_ == null) {
         alternativeQueryResults_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
       } else {
         alternativeQueryResultsBuilder_.clear();
@@ -2056,7 +2076,7 @@ public Builder removeAlternativeQueryResults(int index) {
                 com.google.cloud.dialogflow.v2beta1.QueryResult.Builder,
                 com.google.cloud.dialogflow.v2beta1.QueryResultOrBuilder>(
                 alternativeQueryResults_,
-                ((bitField0_ & 0x00000001) != 0),
+                ((bitField0_ & 0x00000008) != 0),
                 getParentForChildren(),
                 isClean());
         alternativeQueryResults_ = null;
@@ -2080,7 +2100,7 @@ public Builder removeAlternativeQueryResults(int index) {
      * @return Whether the webhookStatus field is set.
      */
     public boolean hasWebhookStatus() {
-      return webhookStatusBuilder_ != null || webhookStatus_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -2115,11 +2135,11 @@ public Builder setWebhookStatus(com.google.rpc.Status value) {
           throw new NullPointerException();
         }
         webhookStatus_ = value;
-        onChanged();
       } else {
         webhookStatusBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2134,11 +2154,11 @@ public Builder setWebhookStatus(com.google.rpc.Status value) {
     public Builder setWebhookStatus(com.google.rpc.Status.Builder builderForValue) {
       if (webhookStatusBuilder_ == null) {
         webhookStatus_ = builderForValue.build();
-        onChanged();
       } else {
         webhookStatusBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2152,17 +2172,18 @@ public Builder setWebhookStatus(com.google.rpc.Status.Builder builderForValue) {
      */
     public Builder mergeWebhookStatus(com.google.rpc.Status value) {
       if (webhookStatusBuilder_ == null) {
-        if (webhookStatus_ != null) {
-          webhookStatus_ =
-              com.google.rpc.Status.newBuilder(webhookStatus_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && webhookStatus_ != null
+            && webhookStatus_ != com.google.rpc.Status.getDefaultInstance()) {
+          getWebhookStatusBuilder().mergeFrom(value);
         } else {
           webhookStatus_ = value;
         }
-        onChanged();
       } else {
         webhookStatusBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2175,14 +2196,13 @@ public Builder mergeWebhookStatus(com.google.rpc.Status value) {
      * <code>.google.rpc.Status webhook_status = 4;</code>
      */
     public Builder clearWebhookStatus() {
-      if (webhookStatusBuilder_ == null) {
-        webhookStatus_ = null;
-        onChanged();
-      } else {
-        webhookStatus_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      webhookStatus_ = null;
+      if (webhookStatusBuilder_ != null) {
+        webhookStatusBuilder_.dispose();
         webhookStatusBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2195,7 +2215,7 @@ public Builder clearWebhookStatus() {
      * <code>.google.rpc.Status webhook_status = 4;</code>
      */
     public com.google.rpc.Status.Builder getWebhookStatusBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getWebhookStatusFieldBuilder().getBuilder();
     }
@@ -2287,8 +2307,8 @@ public Builder setOutputAudio(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       outputAudio_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2312,7 +2332,7 @@ public Builder setOutputAudio(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearOutputAudio() {
-
+      bitField0_ = (bitField0_ & ~0x00000020);
       outputAudio_ = getDefaultInstance().getOutputAudio();
       onChanged();
       return this;
@@ -2336,7 +2356,7 @@ public Builder clearOutputAudio() {
      * @return Whether the outputAudioConfig field is set.
      */
     public boolean hasOutputAudioConfig() {
-      return outputAudioConfigBuilder_ != null || outputAudioConfig_ != null;
+      return ((bitField0_ & 0x00000040) != 0);
     }
     /**
      *
@@ -2374,11 +2394,11 @@ public Builder setOutputAudioConfig(
           throw new NullPointerException();
         }
         outputAudioConfig_ = value;
-        onChanged();
       } else {
         outputAudioConfigBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2394,11 +2414,11 @@ public Builder setOutputAudioConfig(
         com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.Builder builderForValue) {
       if (outputAudioConfigBuilder_ == null) {
         outputAudioConfig_ = builderForValue.build();
-        onChanged();
       } else {
         outputAudioConfigBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2413,19 +2433,19 @@ public Builder setOutputAudioConfig(
     public Builder mergeOutputAudioConfig(
         com.google.cloud.dialogflow.v2beta1.OutputAudioConfig value) {
       if (outputAudioConfigBuilder_ == null) {
-        if (outputAudioConfig_ != null) {
-          outputAudioConfig_ =
-              com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.newBuilder(outputAudioConfig_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000040) != 0)
+            && outputAudioConfig_ != null
+            && outputAudioConfig_
+                != com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.getDefaultInstance()) {
+          getOutputAudioConfigBuilder().mergeFrom(value);
         } else {
           outputAudioConfig_ = value;
         }
-        onChanged();
       } else {
         outputAudioConfigBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2438,14 +2458,13 @@ public Builder mergeOutputAudioConfig(
      * <code>.google.cloud.dialogflow.v2beta1.OutputAudioConfig output_audio_config = 6;</code>
      */
     public Builder clearOutputAudioConfig() {
-      if (outputAudioConfigBuilder_ == null) {
-        outputAudioConfig_ = null;
-        onChanged();
-      } else {
-        outputAudioConfig_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      outputAudioConfig_ = null;
+      if (outputAudioConfigBuilder_ != null) {
+        outputAudioConfigBuilder_.dispose();
         outputAudioConfigBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2459,7 +2478,7 @@ public Builder clearOutputAudioConfig() {
      */
     public com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.Builder
         getOutputAudioConfigBuilder() {
-
+      bitField0_ |= 0x00000040;
       onChanged();
       return getOutputAudioConfigFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingRecognitionResult.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingRecognitionResult.java
index 9c75d1addc85..21d38c001888 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingRecognitionResult.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingRecognitionResult.java
@@ -326,7 +326,7 @@ private MessageType(int value) {
   }
 
   public static final int MESSAGE_TYPE_FIELD_NUMBER = 1;
-  private int messageType_;
+  private int messageType_ = 0;
   /**
    *
    *
@@ -358,9 +358,8 @@ public int getMessageTypeValue() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult.MessageType
       getMessageType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult.MessageType result =
-        com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult.MessageType.valueOf(
+        com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult.MessageType.forNumber(
             messageType_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult.MessageType.UNRECOGNIZED
@@ -368,7 +367,9 @@ public int getMessageTypeValue() {
   }
 
   public static final int TRANSCRIPT_FIELD_NUMBER = 2;
-  private volatile java.lang.Object transcript_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object transcript_ = "";
   /**
    *
    *
@@ -419,7 +420,7 @@ public com.google.protobuf.ByteString getTranscriptBytes() {
   }
 
   public static final int IS_FINAL_FIELD_NUMBER = 3;
-  private boolean isFinal_;
+  private boolean isFinal_ = false;
   /**
    *
    *
@@ -440,7 +441,7 @@ public boolean getIsFinal() {
   }
 
   public static final int CONFIDENCE_FIELD_NUMBER = 4;
-  private float confidence_;
+  private float confidence_ = 0F;
   /**
    *
    *
@@ -463,7 +464,7 @@ public float getConfidence() {
   }
 
   public static final int STABILITY_FIELD_NUMBER = 6;
-  private float stability_;
+  private float stability_ = 0F;
   /**
    *
    *
@@ -487,6 +488,8 @@ public float getStability() {
   }
 
   public static final int SPEECH_WORD_INFO_FIELD_NUMBER = 7;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.SpeechWordInfo> speechWordInfo_;
   /**
    *
@@ -615,11 +618,15 @@ public com.google.protobuf.Duration getSpeechEndOffset() {
    */
   @java.lang.Override
   public com.google.protobuf.DurationOrBuilder getSpeechEndOffsetOrBuilder() {
-    return getSpeechEndOffset();
+    return speechEndOffset_ == null
+        ? com.google.protobuf.Duration.getDefaultInstance()
+        : speechEndOffset_;
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 10;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -712,7 +719,9 @@ public com.google.cloud.dialogflow.v2beta1.TelephonyDtmfEvents getDtmfDigits() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.TelephonyDtmfEventsOrBuilder getDtmfDigitsOrBuilder() {
-    return getDtmfDigits();
+    return dtmfDigits_ == null
+        ? com.google.cloud.dialogflow.v2beta1.TelephonyDtmfEvents.getDefaultInstance()
+        : dtmfDigits_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -1035,35 +1044,28 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       messageType_ = 0;
-
       transcript_ = "";
-
       isFinal_ = false;
-
       confidence_ = 0F;
-
       stability_ = 0F;
-
       if (speechWordInfoBuilder_ == null) {
         speechWordInfo_ = java.util.Collections.emptyList();
       } else {
         speechWordInfo_ = null;
         speechWordInfoBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
-      if (speechEndOffsetBuilder_ == null) {
-        speechEndOffset_ = null;
-      } else {
-        speechEndOffset_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      speechEndOffset_ = null;
+      if (speechEndOffsetBuilder_ != null) {
+        speechEndOffsetBuilder_.dispose();
         speechEndOffsetBuilder_ = null;
       }
       languageCode_ = "";
-
-      if (dtmfDigitsBuilder_ == null) {
-        dtmfDigits_ = null;
-      } else {
-        dtmfDigits_ = null;
+      dtmfDigits_ = null;
+      if (dtmfDigitsBuilder_ != null) {
+        dtmfDigitsBuilder_.dispose();
         dtmfDigitsBuilder_ = null;
       }
       return this;
@@ -1094,34 +1096,55 @@ public com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult build() {
     public com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult buildPartial() {
       com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult result =
           new com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult(this);
-      int from_bitField0_ = bitField0_;
-      result.messageType_ = messageType_;
-      result.transcript_ = transcript_;
-      result.isFinal_ = isFinal_;
-      result.confidence_ = confidence_;
-      result.stability_ = stability_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult result) {
       if (speechWordInfoBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000020) != 0)) {
           speechWordInfo_ = java.util.Collections.unmodifiableList(speechWordInfo_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000020);
         }
         result.speechWordInfo_ = speechWordInfo_;
       } else {
         result.speechWordInfo_ = speechWordInfoBuilder_.build();
       }
-      if (speechEndOffsetBuilder_ == null) {
-        result.speechEndOffset_ = speechEndOffset_;
-      } else {
-        result.speechEndOffset_ = speechEndOffsetBuilder_.build();
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.messageType_ = messageType_;
       }
-      result.languageCode_ = languageCode_;
-      if (dtmfDigitsBuilder_ == null) {
-        result.dtmfDigits_ = dtmfDigits_;
-      } else {
-        result.dtmfDigits_ = dtmfDigitsBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.transcript_ = transcript_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.isFinal_ = isFinal_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.confidence_ = confidence_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.stability_ = stability_;
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.speechEndOffset_ =
+            speechEndOffsetBuilder_ == null ? speechEndOffset_ : speechEndOffsetBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000100) != 0)) {
+        result.dtmfDigits_ = dtmfDigitsBuilder_ == null ? dtmfDigits_ : dtmfDigitsBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -1176,6 +1199,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.StreamingRecognitio
       }
       if (!other.getTranscript().isEmpty()) {
         transcript_ = other.transcript_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getIsFinal() != false) {
@@ -1191,7 +1215,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.StreamingRecognitio
         if (!other.speechWordInfo_.isEmpty()) {
           if (speechWordInfo_.isEmpty()) {
             speechWordInfo_ = other.speechWordInfo_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000020);
           } else {
             ensureSpeechWordInfoIsMutable();
             speechWordInfo_.addAll(other.speechWordInfo_);
@@ -1204,7 +1228,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.StreamingRecognitio
             speechWordInfoBuilder_.dispose();
             speechWordInfoBuilder_ = null;
             speechWordInfo_ = other.speechWordInfo_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000020);
             speechWordInfoBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getSpeechWordInfoFieldBuilder()
@@ -1219,6 +1243,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.StreamingRecognitio
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000080;
         onChanged();
       }
       if (other.hasDtmfDigits()) {
@@ -1253,37 +1278,37 @@ public Builder mergeFrom(
             case 8:
               {
                 messageType_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 18:
               {
                 transcript_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 isFinal_ = input.readBool();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 37:
               {
                 confidence_ = input.readFloat();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 37
             case 42:
               {
                 input.readMessage(getDtmfDigitsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000100;
                 break;
               } // case 42
             case 53:
               {
                 stability_ = input.readFloat();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 53
             case 58:
@@ -1303,13 +1328,13 @@ public Builder mergeFrom(
             case 66:
               {
                 input.readMessage(getSpeechEndOffsetFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 66
             case 82:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 82
             default:
@@ -1364,8 +1389,8 @@ public int getMessageTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setMessageTypeValue(int value) {
-
       messageType_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1385,9 +1410,8 @@ public Builder setMessageTypeValue(int value) {
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult.MessageType
         getMessageType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult.MessageType result =
-          com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult.MessageType.valueOf(
+          com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult.MessageType.forNumber(
               messageType_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult.MessageType.UNRECOGNIZED
@@ -1412,7 +1436,7 @@ public Builder setMessageType(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       messageType_ = value.getNumber();
       onChanged();
       return this;
@@ -1431,7 +1455,7 @@ public Builder setMessageType(
      * @return This builder for chaining.
      */
     public Builder clearMessageType() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       messageType_ = 0;
       onChanged();
       return this;
@@ -1501,8 +1525,8 @@ public Builder setTranscript(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       transcript_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1519,8 +1543,8 @@ public Builder setTranscript(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTranscript() {
-
       transcript_ = getDefaultInstance().getTranscript();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1542,8 +1566,8 @@ public Builder setTranscriptBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       transcript_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1585,6 +1609,7 @@ public boolean getIsFinal() {
     public Builder setIsFinal(boolean value) {
 
       isFinal_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1603,7 +1628,7 @@ public Builder setIsFinal(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearIsFinal() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       isFinal_ = false;
       onChanged();
       return this;
@@ -1650,6 +1675,7 @@ public float getConfidence() {
     public Builder setConfidence(float value) {
 
       confidence_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1670,7 +1696,7 @@ public Builder setConfidence(float value) {
      * @return This builder for chaining.
      */
     public Builder clearConfidence() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       confidence_ = 0F;
       onChanged();
       return this;
@@ -1719,6 +1745,7 @@ public float getStability() {
     public Builder setStability(float value) {
 
       stability_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1740,7 +1767,7 @@ public Builder setStability(float value) {
      * @return This builder for chaining.
      */
     public Builder clearStability() {
-
+      bitField0_ = (bitField0_ & ~0x00000010);
       stability_ = 0F;
       onChanged();
       return this;
@@ -1750,11 +1777,11 @@ public Builder clearStability() {
         java.util.Collections.emptyList();
 
     private void ensureSpeechWordInfoIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000020) != 0)) {
         speechWordInfo_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.SpeechWordInfo>(
                 speechWordInfo_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000020;
       }
     }
 
@@ -1995,7 +2022,7 @@ public Builder addAllSpeechWordInfo(
     public Builder clearSpeechWordInfo() {
       if (speechWordInfoBuilder_ == null) {
         speechWordInfo_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000020);
         onChanged();
       } else {
         speechWordInfoBuilder_.clear();
@@ -2136,7 +2163,7 @@ public com.google.cloud.dialogflow.v2beta1.SpeechWordInfo.Builder addSpeechWordI
                 com.google.cloud.dialogflow.v2beta1.SpeechWordInfo.Builder,
                 com.google.cloud.dialogflow.v2beta1.SpeechWordInfoOrBuilder>(
                 speechWordInfo_,
-                ((bitField0_ & 0x00000001) != 0),
+                ((bitField0_ & 0x00000020) != 0),
                 getParentForChildren(),
                 isClean());
         speechWordInfo_ = null;
@@ -2163,7 +2190,7 @@ public com.google.cloud.dialogflow.v2beta1.SpeechWordInfo.Builder addSpeechWordI
      * @return Whether the speechEndOffset field is set.
      */
     public boolean hasSpeechEndOffset() {
-      return speechEndOffsetBuilder_ != null || speechEndOffset_ != null;
+      return ((bitField0_ & 0x00000040) != 0);
     }
     /**
      *
@@ -2202,11 +2229,11 @@ public Builder setSpeechEndOffset(com.google.protobuf.Duration value) {
           throw new NullPointerException();
         }
         speechEndOffset_ = value;
-        onChanged();
       } else {
         speechEndOffsetBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2222,11 +2249,11 @@ public Builder setSpeechEndOffset(com.google.protobuf.Duration value) {
     public Builder setSpeechEndOffset(com.google.protobuf.Duration.Builder builderForValue) {
       if (speechEndOffsetBuilder_ == null) {
         speechEndOffset_ = builderForValue.build();
-        onChanged();
       } else {
         speechEndOffsetBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2241,19 +2268,18 @@ public Builder setSpeechEndOffset(com.google.protobuf.Duration.Builder builderFo
      */
     public Builder mergeSpeechEndOffset(com.google.protobuf.Duration value) {
       if (speechEndOffsetBuilder_ == null) {
-        if (speechEndOffset_ != null) {
-          speechEndOffset_ =
-              com.google.protobuf.Duration.newBuilder(speechEndOffset_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000040) != 0)
+            && speechEndOffset_ != null
+            && speechEndOffset_ != com.google.protobuf.Duration.getDefaultInstance()) {
+          getSpeechEndOffsetBuilder().mergeFrom(value);
         } else {
           speechEndOffset_ = value;
         }
-        onChanged();
       } else {
         speechEndOffsetBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000040;
+      onChanged();
       return this;
     }
     /**
@@ -2267,14 +2293,13 @@ public Builder mergeSpeechEndOffset(com.google.protobuf.Duration value) {
      * <code>.google.protobuf.Duration speech_end_offset = 8;</code>
      */
     public Builder clearSpeechEndOffset() {
-      if (speechEndOffsetBuilder_ == null) {
-        speechEndOffset_ = null;
-        onChanged();
-      } else {
-        speechEndOffset_ = null;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      speechEndOffset_ = null;
+      if (speechEndOffsetBuilder_ != null) {
+        speechEndOffsetBuilder_.dispose();
         speechEndOffsetBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2288,7 +2313,7 @@ public Builder clearSpeechEndOffset() {
      * <code>.google.protobuf.Duration speech_end_offset = 8;</code>
      */
     public com.google.protobuf.Duration.Builder getSpeechEndOffsetBuilder() {
-
+      bitField0_ |= 0x00000040;
       onChanged();
       return getSpeechEndOffsetFieldBuilder().getBuilder();
     }
@@ -2399,8 +2424,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2416,8 +2441,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000080);
       onChanged();
       return this;
     }
@@ -2438,8 +2463,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2462,7 +2487,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
      * @return Whether the dtmfDigits field is set.
      */
     public boolean hasDtmfDigits() {
-      return dtmfDigitsBuilder_ != null || dtmfDigits_ != null;
+      return ((bitField0_ & 0x00000100) != 0);
     }
     /**
      *
@@ -2499,11 +2524,11 @@ public Builder setDtmfDigits(com.google.cloud.dialogflow.v2beta1.TelephonyDtmfEv
           throw new NullPointerException();
         }
         dtmfDigits_ = value;
-        onChanged();
       } else {
         dtmfDigitsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -2519,11 +2544,11 @@ public Builder setDtmfDigits(
         com.google.cloud.dialogflow.v2beta1.TelephonyDtmfEvents.Builder builderForValue) {
       if (dtmfDigitsBuilder_ == null) {
         dtmfDigits_ = builderForValue.build();
-        onChanged();
       } else {
         dtmfDigitsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -2537,19 +2562,19 @@ public Builder setDtmfDigits(
      */
     public Builder mergeDtmfDigits(com.google.cloud.dialogflow.v2beta1.TelephonyDtmfEvents value) {
       if (dtmfDigitsBuilder_ == null) {
-        if (dtmfDigits_ != null) {
-          dtmfDigits_ =
-              com.google.cloud.dialogflow.v2beta1.TelephonyDtmfEvents.newBuilder(dtmfDigits_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000100) != 0)
+            && dtmfDigits_ != null
+            && dtmfDigits_
+                != com.google.cloud.dialogflow.v2beta1.TelephonyDtmfEvents.getDefaultInstance()) {
+          getDtmfDigitsBuilder().mergeFrom(value);
         } else {
           dtmfDigits_ = value;
         }
-        onChanged();
       } else {
         dtmfDigitsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -2562,14 +2587,13 @@ public Builder mergeDtmfDigits(com.google.cloud.dialogflow.v2beta1.TelephonyDtmf
      * <code>.google.cloud.dialogflow.v2beta1.TelephonyDtmfEvents dtmf_digits = 5;</code>
      */
     public Builder clearDtmfDigits() {
-      if (dtmfDigitsBuilder_ == null) {
-        dtmfDigits_ = null;
-        onChanged();
-      } else {
-        dtmfDigits_ = null;
+      bitField0_ = (bitField0_ & ~0x00000100);
+      dtmfDigits_ = null;
+      if (dtmfDigitsBuilder_ != null) {
+        dtmfDigitsBuilder_.dispose();
         dtmfDigitsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2582,7 +2606,7 @@ public Builder clearDtmfDigits() {
      * <code>.google.cloud.dialogflow.v2beta1.TelephonyDtmfEvents dtmf_digits = 5;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.TelephonyDtmfEvents.Builder getDtmfDigitsBuilder() {
-
+      bitField0_ |= 0x00000100;
       onChanged();
       return getDtmfDigitsFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SubAgent.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SubAgent.java
index cc3c128276c0..435fa0784427 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SubAgent.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SubAgent.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PROJECT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object project_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object project_ = "";
   /**
    *
    *
@@ -122,7 +124,9 @@ public com.google.protobuf.ByteString getProjectBytes() {
   }
 
   public static final int ENVIRONMENT_FIELD_NUMBER = 2;
-  private volatile java.lang.Object environment_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object environment_ = "";
   /**
    *
    *
@@ -380,10 +384,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       project_ = "";
-
       environment_ = "";
-
       return this;
     }
 
@@ -411,12 +414,23 @@ public com.google.cloud.dialogflow.v2beta1.SubAgent build() {
     public com.google.cloud.dialogflow.v2beta1.SubAgent buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SubAgent result =
           new com.google.cloud.dialogflow.v2beta1.SubAgent(this);
-      result.project_ = project_;
-      result.environment_ = environment_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.SubAgent result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.project_ = project_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.environment_ = environment_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -464,10 +478,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.SubAgent other) {
       if (other == com.google.cloud.dialogflow.v2beta1.SubAgent.getDefaultInstance()) return this;
       if (!other.getProject().isEmpty()) {
         project_ = other.project_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getEnvironment().isEmpty()) {
         environment_ = other.environment_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -499,13 +515,13 @@ public Builder mergeFrom(
             case 10:
               {
                 project_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 environment_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -525,6 +541,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object project_ = "";
     /**
      *
@@ -592,8 +610,8 @@ public Builder setProject(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       project_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -611,8 +629,8 @@ public Builder setProject(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProject() {
-
       project_ = getDefaultInstance().getProject();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -635,8 +653,8 @@ public Builder setProjectBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       project_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -708,8 +726,8 @@ public Builder setEnvironment(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       environment_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -727,8 +745,8 @@ public Builder setEnvironment(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearEnvironment() {
-
       environment_ = getDefaultInstance().getEnvironment();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -751,8 +769,8 @@ public Builder setEnvironmentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       environment_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestArticlesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestArticlesRequest.java
index 4abda44f5549..2a856fe16052 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestArticlesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestArticlesRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -126,7 +128,9 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int LATEST_MESSAGE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object latestMessage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object latestMessage_ = "";
   /**
    *
    *
@@ -185,7 +189,7 @@ public com.google.protobuf.ByteString getLatestMessageBytes() {
   }
 
   public static final int CONTEXT_SIZE_FIELD_NUMBER = 3;
-  private int contextSize_;
+  private int contextSize_ = 0;
   /**
    *
    *
@@ -256,7 +260,9 @@ public com.google.cloud.dialogflow.v2beta1.AssistQueryParameters getAssistQueryP
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.AssistQueryParametersOrBuilder
       getAssistQueryParamsOrBuilder() {
-    return getAssistQueryParams();
+    return assistQueryParams_ == null
+        ? com.google.cloud.dialogflow.v2beta1.AssistQueryParameters.getDefaultInstance()
+        : assistQueryParams_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -489,16 +495,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       latestMessage_ = "";
-
       contextSize_ = 0;
-
-      if (assistQueryParamsBuilder_ == null) {
-        assistQueryParams_ = null;
-      } else {
-        assistQueryParams_ = null;
+      assistQueryParams_ = null;
+      if (assistQueryParamsBuilder_ != null) {
+        assistQueryParamsBuilder_.dispose();
         assistQueryParamsBuilder_ = null;
       }
       return this;
@@ -528,18 +531,32 @@ public com.google.cloud.dialogflow.v2beta1.SuggestArticlesRequest build() {
     public com.google.cloud.dialogflow.v2beta1.SuggestArticlesRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SuggestArticlesRequest result =
           new com.google.cloud.dialogflow.v2beta1.SuggestArticlesRequest(this);
-      result.parent_ = parent_;
-      result.latestMessage_ = latestMessage_;
-      result.contextSize_ = contextSize_;
-      if (assistQueryParamsBuilder_ == null) {
-        result.assistQueryParams_ = assistQueryParams_;
-      } else {
-        result.assistQueryParams_ = assistQueryParamsBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.SuggestArticlesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.latestMessage_ = latestMessage_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.contextSize_ = contextSize_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.assistQueryParams_ =
+            assistQueryParamsBuilder_ == null
+                ? assistQueryParams_
+                : assistQueryParamsBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -588,10 +605,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.SuggestArticlesRequ
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLatestMessage().isEmpty()) {
         latestMessage_ = other.latestMessage_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getContextSize() != 0) {
@@ -629,26 +648,26 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 latestMessage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 contextSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 34:
               {
                 input.readMessage(
                     getAssistQueryParamsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -668,6 +687,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -741,8 +762,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -762,8 +783,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -788,8 +809,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -870,8 +891,8 @@ public Builder setLatestMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -892,8 +913,8 @@ public Builder setLatestMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLatestMessage() {
-
       latestMessage_ = getDefaultInstance().getLatestMessage();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -919,8 +940,8 @@ public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -960,6 +981,7 @@ public int getContextSize() {
     public Builder setContextSize(int value) {
 
       contextSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -977,7 +999,7 @@ public Builder setContextSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearContextSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       contextSize_ = 0;
       onChanged();
       return this;
@@ -1003,7 +1025,7 @@ public Builder clearContextSize() {
      * @return Whether the assistQueryParams field is set.
      */
     public boolean hasAssistQueryParams() {
-      return assistQueryParamsBuilder_ != null || assistQueryParams_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1045,11 +1067,11 @@ public Builder setAssistQueryParams(
           throw new NullPointerException();
         }
         assistQueryParams_ = value;
-        onChanged();
       } else {
         assistQueryParamsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1067,11 +1089,11 @@ public Builder setAssistQueryParams(
         com.google.cloud.dialogflow.v2beta1.AssistQueryParameters.Builder builderForValue) {
       if (assistQueryParamsBuilder_ == null) {
         assistQueryParams_ = builderForValue.build();
-        onChanged();
       } else {
         assistQueryParamsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1088,20 +1110,19 @@ public Builder setAssistQueryParams(
     public Builder mergeAssistQueryParams(
         com.google.cloud.dialogflow.v2beta1.AssistQueryParameters value) {
       if (assistQueryParamsBuilder_ == null) {
-        if (assistQueryParams_ != null) {
-          assistQueryParams_ =
-              com.google.cloud.dialogflow.v2beta1.AssistQueryParameters.newBuilder(
-                      assistQueryParams_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && assistQueryParams_ != null
+            && assistQueryParams_
+                != com.google.cloud.dialogflow.v2beta1.AssistQueryParameters.getDefaultInstance()) {
+          getAssistQueryParamsBuilder().mergeFrom(value);
         } else {
           assistQueryParams_ = value;
         }
-        onChanged();
       } else {
         assistQueryParamsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1116,14 +1137,13 @@ public Builder mergeAssistQueryParams(
      * </code>
      */
     public Builder clearAssistQueryParams() {
-      if (assistQueryParamsBuilder_ == null) {
-        assistQueryParams_ = null;
-        onChanged();
-      } else {
-        assistQueryParams_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      assistQueryParams_ = null;
+      if (assistQueryParamsBuilder_ != null) {
+        assistQueryParamsBuilder_.dispose();
         assistQueryParamsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1139,7 +1159,7 @@ public Builder clearAssistQueryParams() {
      */
     public com.google.cloud.dialogflow.v2beta1.AssistQueryParameters.Builder
         getAssistQueryParamsBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getAssistQueryParamsFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestArticlesResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestArticlesResponse.java
index ee278a438788..ff5601b94ee4 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestArticlesResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestArticlesResponse.java
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ARTICLE_ANSWERS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.ArticleAnswer> articleAnswers_;
   /**
    *
@@ -139,7 +141,9 @@ public com.google.cloud.dialogflow.v2beta1.ArticleAnswerOrBuilder getArticleAnsw
   }
 
   public static final int LATEST_MESSAGE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object latestMessage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object latestMessage_ = "";
   /**
    *
    *
@@ -194,7 +198,7 @@ public com.google.protobuf.ByteString getLatestMessageBytes() {
   }
 
   public static final int CONTEXT_SIZE_FIELD_NUMBER = 3;
-  private int contextSize_;
+  private int contextSize_ = 0;
   /**
    *
    *
@@ -433,6 +437,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (articleAnswersBuilder_ == null) {
         articleAnswers_ = java.util.Collections.emptyList();
       } else {
@@ -441,9 +446,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       latestMessage_ = "";
-
       contextSize_ = 0;
-
       return this;
     }
 
@@ -471,7 +474,16 @@ public com.google.cloud.dialogflow.v2beta1.SuggestArticlesResponse build() {
     public com.google.cloud.dialogflow.v2beta1.SuggestArticlesResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SuggestArticlesResponse result =
           new com.google.cloud.dialogflow.v2beta1.SuggestArticlesResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.SuggestArticlesResponse result) {
       if (articleAnswersBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           articleAnswers_ = java.util.Collections.unmodifiableList(articleAnswers_);
@@ -481,10 +493,16 @@ public com.google.cloud.dialogflow.v2beta1.SuggestArticlesResponse buildPartial(
       } else {
         result.articleAnswers_ = articleAnswersBuilder_.build();
       }
-      result.latestMessage_ = latestMessage_;
-      result.contextSize_ = contextSize_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.SuggestArticlesResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.latestMessage_ = latestMessage_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.contextSize_ = contextSize_;
+      }
     }
 
     @java.lang.Override
@@ -562,6 +580,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.SuggestArticlesResp
       }
       if (!other.getLatestMessage().isEmpty()) {
         latestMessage_ = other.latestMessage_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getContextSize() != 0) {
@@ -610,13 +629,13 @@ public Builder mergeFrom(
             case 18:
               {
                 latestMessage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 contextSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             default:
@@ -1070,8 +1089,8 @@ public Builder setLatestMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1090,8 +1109,8 @@ public Builder setLatestMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLatestMessage() {
-
       latestMessage_ = getDefaultInstance().getLatestMessage();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1115,8 +1134,8 @@ public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1160,6 +1179,7 @@ public int getContextSize() {
     public Builder setContextSize(int value) {
 
       contextSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1179,7 +1199,7 @@ public Builder setContextSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearContextSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       contextSize_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestConversationSummaryRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestConversationSummaryRequest.java
index ce637399c1ff..2e851dd89147 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestConversationSummaryRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestConversationSummaryRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONVERSATION_FIELD_NUMBER = 1;
-  private volatile java.lang.Object conversation_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object conversation_ = "";
   /**
    *
    *
@@ -127,7 +129,9 @@ public com.google.protobuf.ByteString getConversationBytes() {
   }
 
   public static final int LATEST_MESSAGE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object latestMessage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object latestMessage_ = "";
   /**
    *
    *
@@ -184,7 +188,7 @@ public com.google.protobuf.ByteString getLatestMessageBytes() {
   }
 
   public static final int CONTEXT_SIZE_FIELD_NUMBER = 4;
-  private int contextSize_;
+  private int contextSize_ = 0;
   /**
    *
    *
@@ -421,12 +425,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       conversation_ = "";
-
       latestMessage_ = "";
-
       contextSize_ = 0;
-
       return this;
     }
 
@@ -456,13 +458,27 @@ public com.google.cloud.dialogflow.v2beta1.SuggestConversationSummaryRequest bui
     public com.google.cloud.dialogflow.v2beta1.SuggestConversationSummaryRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SuggestConversationSummaryRequest result =
           new com.google.cloud.dialogflow.v2beta1.SuggestConversationSummaryRequest(this);
-      result.conversation_ = conversation_;
-      result.latestMessage_ = latestMessage_;
-      result.contextSize_ = contextSize_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.SuggestConversationSummaryRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversation_ = conversation_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.latestMessage_ = latestMessage_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.contextSize_ = contextSize_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -514,10 +530,12 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getConversation().isEmpty()) {
         conversation_ = other.conversation_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLatestMessage().isEmpty()) {
         latestMessage_ = other.latestMessage_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getContextSize() != 0) {
@@ -552,19 +570,19 @@ public Builder mergeFrom(
             case 10:
               {
                 conversation_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 26:
               {
                 latestMessage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 26
             case 32:
               {
                 contextSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 32
             default:
@@ -584,6 +602,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object conversation_ = "";
     /**
      *
@@ -657,8 +677,8 @@ public Builder setConversation(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       conversation_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -678,8 +698,8 @@ public Builder setConversation(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConversation() {
-
       conversation_ = getDefaultInstance().getConversation();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -704,8 +724,8 @@ public Builder setConversationBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       conversation_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -783,8 +803,8 @@ public Builder setLatestMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -804,8 +824,8 @@ public Builder setLatestMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLatestMessage() {
-
       latestMessage_ = getDefaultInstance().getLatestMessage();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -830,8 +850,8 @@ public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -871,6 +891,7 @@ public int getContextSize() {
     public Builder setContextSize(int value) {
 
       contextSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -888,7 +909,7 @@ public Builder setContextSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearContextSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       contextSize_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestConversationSummaryResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestConversationSummaryResponse.java
index a793d71dce11..bca3bafeed90 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestConversationSummaryResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestConversationSummaryResponse.java
@@ -148,7 +148,6 @@ public interface SummaryOrBuilder
      *
      * <code>map&lt;string, string&gt; text_sections = 4;</code>
      */
-
     /* nullable */
     java.lang.String getTextSectionsOrDefault(
         java.lang.String key,
@@ -258,7 +257,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
     }
 
     public static final int TEXT_FIELD_NUMBER = 1;
-    private volatile java.lang.Object text_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object text_ = "";
     /**
      *
      *
@@ -319,6 +320,7 @@ private static final class TextSectionsDefaultEntryHolder {
               "");
     }
 
+    @SuppressWarnings("serial")
     private com.google.protobuf.MapField<java.lang.String, java.lang.String> textSections_;
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String>
@@ -384,8 +386,10 @@ public java.util.Map<java.lang.String, java.lang.String> getTextSectionsMap() {
      * <code>map&lt;string, string&gt; text_sections = 4;</code>
      */
     @java.lang.Override
-    public java.lang.String getTextSectionsOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getTextSectionsOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -416,7 +420,9 @@ public java.lang.String getTextSectionsOrThrow(java.lang.String key) {
     }
 
     public static final int ANSWER_RECORD_FIELD_NUMBER = 3;
-    private volatile java.lang.Object answerRecord_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object answerRecord_ = "";
     /**
      *
      *
@@ -724,11 +730,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         text_ = "";
-
         internalGetMutableTextSections().clear();
         answerRecord_ = "";
-
         return this;
       }
 
@@ -762,15 +767,28 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
         com.google.cloud.dialogflow.v2beta1.SuggestConversationSummaryResponse.Summary result =
             new com.google.cloud.dialogflow.v2beta1.SuggestConversationSummaryResponse.Summary(
                 this);
-        int from_bitField0_ = bitField0_;
-        result.text_ = text_;
-        result.textSections_ = internalGetTextSections();
-        result.textSections_.makeImmutable();
-        result.answerRecord_ = answerRecord_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.cloud.dialogflow.v2beta1.SuggestConversationSummaryResponse.Summary result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.text_ = text_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.textSections_ = internalGetTextSections();
+          result.textSections_.makeImmutable();
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.answerRecord_ = answerRecord_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -827,11 +845,14 @@ public Builder mergeFrom(
                 .getDefaultInstance()) return this;
         if (!other.getText().isEmpty()) {
           text_ = other.text_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         internalGetMutableTextSections().mergeFrom(other.internalGetTextSections());
+        bitField0_ |= 0x00000002;
         if (!other.getAnswerRecord().isEmpty()) {
           answerRecord_ = other.answerRecord_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -863,13 +884,13 @@ public Builder mergeFrom(
               case 10:
                 {
                   text_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 26:
                 {
                   answerRecord_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000004;
                   break;
                 } // case 26
               case 34:
@@ -881,6 +902,7 @@ public Builder mergeFrom(
                   internalGetMutableTextSections()
                       .getMutableMap()
                       .put(textSections__.getKey(), textSections__.getValue());
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 34
               default:
@@ -963,8 +985,8 @@ public Builder setText(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         text_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -980,8 +1002,8 @@ public Builder setText(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearText() {
-
         text_ = getDefaultInstance().getText();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1002,8 +1024,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         text_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1021,8 +1043,6 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
 
       private com.google.protobuf.MapField<java.lang.String, java.lang.String>
           internalGetMutableTextSections() {
-        onChanged();
-        ;
         if (textSections_ == null) {
           textSections_ =
               com.google.protobuf.MapField.newMapField(TextSectionsDefaultEntryHolder.defaultEntry);
@@ -1030,6 +1050,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
         if (!textSections_.isMutable()) {
           textSections_ = textSections_.copy();
         }
+        bitField0_ |= 0x00000002;
+        onChanged();
         return textSections_;
       }
 
@@ -1087,8 +1109,10 @@ public java.util.Map<java.lang.String, java.lang.String> getTextSectionsMap() {
        * <code>map&lt;string, string&gt; text_sections = 4;</code>
        */
       @java.lang.Override
-      public java.lang.String getTextSectionsOrDefault(
-          java.lang.String key, java.lang.String defaultValue) {
+      public /* nullable */ java.lang.String getTextSectionsOrDefault(
+          java.lang.String key,
+          /* nullable */
+          java.lang.String defaultValue) {
         if (key == null) {
           throw new NullPointerException("map key");
         }
@@ -1119,6 +1143,7 @@ public java.lang.String getTextSectionsOrThrow(java.lang.String key) {
       }
 
       public Builder clearTextSections() {
+        bitField0_ = (bitField0_ & ~0x00000002);
         internalGetMutableTextSections().getMutableMap().clear();
         return this;
       }
@@ -1143,6 +1168,7 @@ public Builder removeTextSections(java.lang.String key) {
       /** Use alternate mutation accessors instead. */
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, java.lang.String> getMutableTextSections() {
+        bitField0_ |= 0x00000002;
         return internalGetMutableTextSections().getMutableMap();
       }
       /**
@@ -1163,8 +1189,8 @@ public Builder putTextSections(java.lang.String key, java.lang.String value) {
         if (value == null) {
           throw new NullPointerException("map value");
         }
-
         internalGetMutableTextSections().getMutableMap().put(key, value);
+        bitField0_ |= 0x00000002;
         return this;
       }
       /**
@@ -1180,6 +1206,7 @@ public Builder putTextSections(java.lang.String key, java.lang.String value) {
        */
       public Builder putAllTextSections(java.util.Map<java.lang.String, java.lang.String> values) {
         internalGetMutableTextSections().getMutableMap().putAll(values);
+        bitField0_ |= 0x00000002;
         return this;
       }
 
@@ -1247,8 +1274,8 @@ public Builder setAnswerRecord(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         answerRecord_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1265,8 +1292,8 @@ public Builder setAnswerRecord(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearAnswerRecord() {
-
         answerRecord_ = getDefaultInstance().getAnswerRecord();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -1288,8 +1315,8 @@ public Builder setAnswerRecordBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         answerRecord_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1414,11 +1441,16 @@ public boolean hasSummary() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.SuggestConversationSummaryResponse.SummaryOrBuilder
       getSummaryOrBuilder() {
-    return getSummary();
+    return summary_ == null
+        ? com.google.cloud.dialogflow.v2beta1.SuggestConversationSummaryResponse.Summary
+            .getDefaultInstance()
+        : summary_;
   }
 
   public static final int LATEST_MESSAGE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object latestMessage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object latestMessage_ = "";
   /**
    *
    *
@@ -1473,7 +1505,7 @@ public com.google.protobuf.ByteString getLatestMessageBytes() {
   }
 
   public static final int CONTEXT_SIZE_FIELD_NUMBER = 3;
-  private int contextSize_;
+  private int contextSize_ = 0;
   /**
    *
    *
@@ -1716,16 +1748,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (summaryBuilder_ == null) {
-        summary_ = null;
-      } else {
-        summary_ = null;
+      bitField0_ = 0;
+      summary_ = null;
+      if (summaryBuilder_ != null) {
+        summaryBuilder_.dispose();
         summaryBuilder_ = null;
       }
       latestMessage_ = "";
-
       contextSize_ = 0;
-
       return this;
     }
 
@@ -1756,17 +1786,27 @@ public com.google.cloud.dialogflow.v2beta1.SuggestConversationSummaryResponse bu
     public com.google.cloud.dialogflow.v2beta1.SuggestConversationSummaryResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SuggestConversationSummaryResponse result =
           new com.google.cloud.dialogflow.v2beta1.SuggestConversationSummaryResponse(this);
-      if (summaryBuilder_ == null) {
-        result.summary_ = summary_;
-      } else {
-        result.summary_ = summaryBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.latestMessage_ = latestMessage_;
-      result.contextSize_ = contextSize_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.SuggestConversationSummaryResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.summary_ = summaryBuilder_ == null ? summary_ : summaryBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.latestMessage_ = latestMessage_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.contextSize_ = contextSize_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -1821,6 +1861,7 @@ public Builder mergeFrom(
       }
       if (!other.getLatestMessage().isEmpty()) {
         latestMessage_ = other.latestMessage_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getContextSize() != 0) {
@@ -1855,19 +1896,19 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getSummaryFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 latestMessage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 contextSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             default:
@@ -1887,6 +1928,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2beta1.SuggestConversationSummaryResponse.Summary summary_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.SuggestConversationSummaryResponse.Summary,
@@ -1907,7 +1950,7 @@ public Builder mergeFrom(
      * @return Whether the summary field is set.
      */
     public boolean hasSummary() {
-      return summaryBuilder_ != null || summary_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -1951,11 +1994,11 @@ public Builder setSummary(
           throw new NullPointerException();
         }
         summary_ = value;
-        onChanged();
       } else {
         summaryBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -1974,11 +2017,11 @@ public Builder setSummary(
             builderForValue) {
       if (summaryBuilder_ == null) {
         summary_ = builderForValue.build();
-        onChanged();
       } else {
         summaryBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -1995,20 +2038,20 @@ public Builder setSummary(
     public Builder mergeSummary(
         com.google.cloud.dialogflow.v2beta1.SuggestConversationSummaryResponse.Summary value) {
       if (summaryBuilder_ == null) {
-        if (summary_ != null) {
-          summary_ =
-              com.google.cloud.dialogflow.v2beta1.SuggestConversationSummaryResponse.Summary
-                  .newBuilder(summary_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && summary_ != null
+            && summary_
+                != com.google.cloud.dialogflow.v2beta1.SuggestConversationSummaryResponse.Summary
+                    .getDefaultInstance()) {
+          getSummaryBuilder().mergeFrom(value);
         } else {
           summary_ = value;
         }
-        onChanged();
       } else {
         summaryBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -2023,14 +2066,13 @@ public Builder mergeSummary(
      * </code>
      */
     public Builder clearSummary() {
-      if (summaryBuilder_ == null) {
-        summary_ = null;
-        onChanged();
-      } else {
-        summary_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      summary_ = null;
+      if (summaryBuilder_ != null) {
+        summaryBuilder_.dispose();
         summaryBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2046,7 +2088,7 @@ public Builder clearSummary() {
      */
     public com.google.cloud.dialogflow.v2beta1.SuggestConversationSummaryResponse.Summary.Builder
         getSummaryBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getSummaryFieldBuilder().getBuilder();
     }
@@ -2171,8 +2213,8 @@ public Builder setLatestMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -2191,8 +2233,8 @@ public Builder setLatestMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLatestMessage() {
-
       latestMessage_ = getDefaultInstance().getLatestMessage();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -2216,8 +2258,8 @@ public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -2259,6 +2301,7 @@ public int getContextSize() {
     public Builder setContextSize(int value) {
 
       contextSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2277,7 +2320,7 @@ public Builder setContextSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearContextSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       contextSize_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestFaqAnswersRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestFaqAnswersRequest.java
index dc64f7902d9e..360fa233a16d 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestFaqAnswersRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestFaqAnswersRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -126,7 +128,9 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int LATEST_MESSAGE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object latestMessage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object latestMessage_ = "";
   /**
    *
    *
@@ -185,7 +189,7 @@ public com.google.protobuf.ByteString getLatestMessageBytes() {
   }
 
   public static final int CONTEXT_SIZE_FIELD_NUMBER = 3;
-  private int contextSize_;
+  private int contextSize_ = 0;
   /**
    *
    *
@@ -256,7 +260,9 @@ public com.google.cloud.dialogflow.v2beta1.AssistQueryParameters getAssistQueryP
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.AssistQueryParametersOrBuilder
       getAssistQueryParamsOrBuilder() {
-    return getAssistQueryParams();
+    return assistQueryParams_ == null
+        ? com.google.cloud.dialogflow.v2beta1.AssistQueryParameters.getDefaultInstance()
+        : assistQueryParams_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -489,16 +495,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       latestMessage_ = "";
-
       contextSize_ = 0;
-
-      if (assistQueryParamsBuilder_ == null) {
-        assistQueryParams_ = null;
-      } else {
-        assistQueryParams_ = null;
+      assistQueryParams_ = null;
+      if (assistQueryParamsBuilder_ != null) {
+        assistQueryParamsBuilder_.dispose();
         assistQueryParamsBuilder_ = null;
       }
       return this;
@@ -529,18 +532,33 @@ public com.google.cloud.dialogflow.v2beta1.SuggestFaqAnswersRequest build() {
     public com.google.cloud.dialogflow.v2beta1.SuggestFaqAnswersRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SuggestFaqAnswersRequest result =
           new com.google.cloud.dialogflow.v2beta1.SuggestFaqAnswersRequest(this);
-      result.parent_ = parent_;
-      result.latestMessage_ = latestMessage_;
-      result.contextSize_ = contextSize_;
-      if (assistQueryParamsBuilder_ == null) {
-        result.assistQueryParams_ = assistQueryParams_;
-      } else {
-        result.assistQueryParams_ = assistQueryParamsBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.SuggestFaqAnswersRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.latestMessage_ = latestMessage_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.contextSize_ = contextSize_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.assistQueryParams_ =
+            assistQueryParamsBuilder_ == null
+                ? assistQueryParams_
+                : assistQueryParamsBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -590,10 +608,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.SuggestFaqAnswersRe
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLatestMessage().isEmpty()) {
         latestMessage_ = other.latestMessage_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getContextSize() != 0) {
@@ -631,26 +651,26 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 latestMessage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 contextSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 34:
               {
                 input.readMessage(
                     getAssistQueryParamsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -670,6 +690,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -743,8 +765,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -764,8 +786,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -790,8 +812,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -872,8 +894,8 @@ public Builder setLatestMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -894,8 +916,8 @@ public Builder setLatestMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLatestMessage() {
-
       latestMessage_ = getDefaultInstance().getLatestMessage();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -921,8 +943,8 @@ public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -962,6 +984,7 @@ public int getContextSize() {
     public Builder setContextSize(int value) {
 
       contextSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -979,7 +1002,7 @@ public Builder setContextSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearContextSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       contextSize_ = 0;
       onChanged();
       return this;
@@ -1005,7 +1028,7 @@ public Builder clearContextSize() {
      * @return Whether the assistQueryParams field is set.
      */
     public boolean hasAssistQueryParams() {
-      return assistQueryParamsBuilder_ != null || assistQueryParams_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1047,11 +1070,11 @@ public Builder setAssistQueryParams(
           throw new NullPointerException();
         }
         assistQueryParams_ = value;
-        onChanged();
       } else {
         assistQueryParamsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1069,11 +1092,11 @@ public Builder setAssistQueryParams(
         com.google.cloud.dialogflow.v2beta1.AssistQueryParameters.Builder builderForValue) {
       if (assistQueryParamsBuilder_ == null) {
         assistQueryParams_ = builderForValue.build();
-        onChanged();
       } else {
         assistQueryParamsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1090,20 +1113,19 @@ public Builder setAssistQueryParams(
     public Builder mergeAssistQueryParams(
         com.google.cloud.dialogflow.v2beta1.AssistQueryParameters value) {
       if (assistQueryParamsBuilder_ == null) {
-        if (assistQueryParams_ != null) {
-          assistQueryParams_ =
-              com.google.cloud.dialogflow.v2beta1.AssistQueryParameters.newBuilder(
-                      assistQueryParams_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && assistQueryParams_ != null
+            && assistQueryParams_
+                != com.google.cloud.dialogflow.v2beta1.AssistQueryParameters.getDefaultInstance()) {
+          getAssistQueryParamsBuilder().mergeFrom(value);
         } else {
           assistQueryParams_ = value;
         }
-        onChanged();
       } else {
         assistQueryParamsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1118,14 +1140,13 @@ public Builder mergeAssistQueryParams(
      * </code>
      */
     public Builder clearAssistQueryParams() {
-      if (assistQueryParamsBuilder_ == null) {
-        assistQueryParams_ = null;
-        onChanged();
-      } else {
-        assistQueryParams_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      assistQueryParams_ = null;
+      if (assistQueryParamsBuilder_ != null) {
+        assistQueryParamsBuilder_.dispose();
         assistQueryParamsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1141,7 +1162,7 @@ public Builder clearAssistQueryParams() {
      */
     public com.google.cloud.dialogflow.v2beta1.AssistQueryParameters.Builder
         getAssistQueryParamsBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getAssistQueryParamsFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestFaqAnswersResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestFaqAnswersResponse.java
index 98bfaeff1f35..b091559e430a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestFaqAnswersResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestFaqAnswersResponse.java
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int FAQ_ANSWERS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.FaqAnswer> faqAnswers_;
   /**
    *
@@ -138,7 +140,9 @@ public com.google.cloud.dialogflow.v2beta1.FaqAnswerOrBuilder getFaqAnswersOrBui
   }
 
   public static final int LATEST_MESSAGE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object latestMessage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object latestMessage_ = "";
   /**
    *
    *
@@ -193,7 +197,7 @@ public com.google.protobuf.ByteString getLatestMessageBytes() {
   }
 
   public static final int CONTEXT_SIZE_FIELD_NUMBER = 3;
-  private int contextSize_;
+  private int contextSize_ = 0;
   /**
    *
    *
@@ -432,6 +436,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (faqAnswersBuilder_ == null) {
         faqAnswers_ = java.util.Collections.emptyList();
       } else {
@@ -440,9 +445,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       latestMessage_ = "";
-
       contextSize_ = 0;
-
       return this;
     }
 
@@ -471,7 +474,16 @@ public com.google.cloud.dialogflow.v2beta1.SuggestFaqAnswersResponse build() {
     public com.google.cloud.dialogflow.v2beta1.SuggestFaqAnswersResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SuggestFaqAnswersResponse result =
           new com.google.cloud.dialogflow.v2beta1.SuggestFaqAnswersResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.SuggestFaqAnswersResponse result) {
       if (faqAnswersBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           faqAnswers_ = java.util.Collections.unmodifiableList(faqAnswers_);
@@ -481,10 +493,17 @@ public com.google.cloud.dialogflow.v2beta1.SuggestFaqAnswersResponse buildPartia
       } else {
         result.faqAnswers_ = faqAnswersBuilder_.build();
       }
-      result.latestMessage_ = latestMessage_;
-      result.contextSize_ = contextSize_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.SuggestFaqAnswersResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.latestMessage_ = latestMessage_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.contextSize_ = contextSize_;
+      }
     }
 
     @java.lang.Override
@@ -563,6 +582,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.SuggestFaqAnswersRe
       }
       if (!other.getLatestMessage().isEmpty()) {
         latestMessage_ = other.latestMessage_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getContextSize() != 0) {
@@ -610,13 +630,13 @@ public Builder mergeFrom(
             case 18:
               {
                 latestMessage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 contextSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             default:
@@ -1060,8 +1080,8 @@ public Builder setLatestMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1080,8 +1100,8 @@ public Builder setLatestMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLatestMessage() {
-
       latestMessage_ = getDefaultInstance().getLatestMessage();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1105,8 +1125,8 @@ public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1150,6 +1170,7 @@ public int getContextSize() {
     public Builder setContextSize(int value) {
 
       contextSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1169,7 +1190,7 @@ public Builder setContextSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearContextSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       contextSize_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestSmartRepliesRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestSmartRepliesRequest.java
index b3a0994d4da5..e76720aec602 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestSmartRepliesRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestSmartRepliesRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -176,11 +178,15 @@ public com.google.cloud.dialogflow.v2beta1.TextInput getCurrentTextInput() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.TextInputOrBuilder getCurrentTextInputOrBuilder() {
-    return getCurrentTextInput();
+    return currentTextInput_ == null
+        ? com.google.cloud.dialogflow.v2beta1.TextInput.getDefaultInstance()
+        : currentTextInput_;
   }
 
   public static final int LATEST_MESSAGE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object latestMessage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object latestMessage_ = "";
   /**
    *
    *
@@ -235,7 +241,7 @@ public com.google.protobuf.ByteString getLatestMessageBytes() {
   }
 
   public static final int CONTEXT_SIZE_FIELD_NUMBER = 3;
-  private int contextSize_;
+  private int contextSize_ = 0;
   /**
    *
    *
@@ -484,18 +490,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
-      if (currentTextInputBuilder_ == null) {
-        currentTextInput_ = null;
-      } else {
-        currentTextInput_ = null;
+      currentTextInput_ = null;
+      if (currentTextInputBuilder_ != null) {
+        currentTextInputBuilder_.dispose();
         currentTextInputBuilder_ = null;
       }
       latestMessage_ = "";
-
       contextSize_ = 0;
-
       return this;
     }
 
@@ -524,18 +527,31 @@ public com.google.cloud.dialogflow.v2beta1.SuggestSmartRepliesRequest build() {
     public com.google.cloud.dialogflow.v2beta1.SuggestSmartRepliesRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SuggestSmartRepliesRequest result =
           new com.google.cloud.dialogflow.v2beta1.SuggestSmartRepliesRequest(this);
-      result.parent_ = parent_;
-      if (currentTextInputBuilder_ == null) {
-        result.currentTextInput_ = currentTextInput_;
-      } else {
-        result.currentTextInput_ = currentTextInputBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.latestMessage_ = latestMessage_;
-      result.contextSize_ = contextSize_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.SuggestSmartRepliesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.currentTextInput_ =
+            currentTextInputBuilder_ == null ? currentTextInput_ : currentTextInputBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.latestMessage_ = latestMessage_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.contextSize_ = contextSize_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -585,6 +601,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.SuggestSmartReplies
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasCurrentTextInput()) {
@@ -592,6 +609,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.SuggestSmartReplies
       }
       if (!other.getLatestMessage().isEmpty()) {
         latestMessage_ = other.latestMessage_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.getContextSize() != 0) {
@@ -626,26 +644,26 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 latestMessage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 18
             case 24:
               {
                 contextSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 24
             case 34:
               {
                 input.readMessage(
                     getCurrentTextInputFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 34
             default:
@@ -665,6 +683,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -738,8 +758,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -759,8 +779,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -785,8 +805,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -811,7 +831,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the currentTextInput field is set.
      */
     public boolean hasCurrentTextInput() {
-      return currentTextInputBuilder_ != null || currentTextInput_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -852,11 +872,11 @@ public Builder setCurrentTextInput(com.google.cloud.dialogflow.v2beta1.TextInput
           throw new NullPointerException();
         }
         currentTextInput_ = value;
-        onChanged();
       } else {
         currentTextInputBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -874,11 +894,11 @@ public Builder setCurrentTextInput(
         com.google.cloud.dialogflow.v2beta1.TextInput.Builder builderForValue) {
       if (currentTextInputBuilder_ == null) {
         currentTextInput_ = builderForValue.build();
-        onChanged();
       } else {
         currentTextInputBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -894,19 +914,19 @@ public Builder setCurrentTextInput(
      */
     public Builder mergeCurrentTextInput(com.google.cloud.dialogflow.v2beta1.TextInput value) {
       if (currentTextInputBuilder_ == null) {
-        if (currentTextInput_ != null) {
-          currentTextInput_ =
-              com.google.cloud.dialogflow.v2beta1.TextInput.newBuilder(currentTextInput_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && currentTextInput_ != null
+            && currentTextInput_
+                != com.google.cloud.dialogflow.v2beta1.TextInput.getDefaultInstance()) {
+          getCurrentTextInputBuilder().mergeFrom(value);
         } else {
           currentTextInput_ = value;
         }
-        onChanged();
       } else {
         currentTextInputBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -921,14 +941,13 @@ public Builder mergeCurrentTextInput(com.google.cloud.dialogflow.v2beta1.TextInp
      * <code>.google.cloud.dialogflow.v2beta1.TextInput current_text_input = 4;</code>
      */
     public Builder clearCurrentTextInput() {
-      if (currentTextInputBuilder_ == null) {
-        currentTextInput_ = null;
-        onChanged();
-      } else {
-        currentTextInput_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      currentTextInput_ = null;
+      if (currentTextInputBuilder_ != null) {
+        currentTextInputBuilder_.dispose();
         currentTextInputBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -943,7 +962,7 @@ public Builder clearCurrentTextInput() {
      * <code>.google.cloud.dialogflow.v2beta1.TextInput current_text_input = 4;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.TextInput.Builder getCurrentTextInputBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getCurrentTextInputFieldBuilder().getBuilder();
     }
@@ -1065,8 +1084,8 @@ public Builder setLatestMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1085,8 +1104,8 @@ public Builder setLatestMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLatestMessage() {
-
       latestMessage_ = getDefaultInstance().getLatestMessage();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1110,8 +1129,8 @@ public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1151,6 +1170,7 @@ public int getContextSize() {
     public Builder setContextSize(int value) {
 
       contextSize_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1168,7 +1188,7 @@ public Builder setContextSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearContextSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       contextSize_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestSmartRepliesResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestSmartRepliesResponse.java
index 8f9c592823d4..4929ede6cdda 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestSmartRepliesResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestSmartRepliesResponse.java
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SMART_REPLY_ANSWERS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.SmartReplyAnswer> smartReplyAnswers_;
   /**
    *
@@ -155,7 +157,9 @@ public com.google.cloud.dialogflow.v2beta1.SmartReplyAnswer getSmartReplyAnswers
   }
 
   public static final int LATEST_MESSAGE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object latestMessage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object latestMessage_ = "";
   /**
    *
    *
@@ -210,7 +214,7 @@ public com.google.protobuf.ByteString getLatestMessageBytes() {
   }
 
   public static final int CONTEXT_SIZE_FIELD_NUMBER = 3;
-  private int contextSize_;
+  private int contextSize_ = 0;
   /**
    *
    *
@@ -450,6 +454,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (smartReplyAnswersBuilder_ == null) {
         smartReplyAnswers_ = java.util.Collections.emptyList();
       } else {
@@ -458,9 +463,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       latestMessage_ = "";
-
       contextSize_ = 0;
-
       return this;
     }
 
@@ -489,7 +492,16 @@ public com.google.cloud.dialogflow.v2beta1.SuggestSmartRepliesResponse build() {
     public com.google.cloud.dialogflow.v2beta1.SuggestSmartRepliesResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SuggestSmartRepliesResponse result =
           new com.google.cloud.dialogflow.v2beta1.SuggestSmartRepliesResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.SuggestSmartRepliesResponse result) {
       if (smartReplyAnswersBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           smartReplyAnswers_ = java.util.Collections.unmodifiableList(smartReplyAnswers_);
@@ -499,10 +511,17 @@ public com.google.cloud.dialogflow.v2beta1.SuggestSmartRepliesResponse buildPart
       } else {
         result.smartReplyAnswers_ = smartReplyAnswersBuilder_.build();
       }
-      result.latestMessage_ = latestMessage_;
-      result.contextSize_ = contextSize_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.SuggestSmartRepliesResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.latestMessage_ = latestMessage_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.contextSize_ = contextSize_;
+      }
     }
 
     @java.lang.Override
@@ -582,6 +601,7 @@ public Builder mergeFrom(
       }
       if (!other.getLatestMessage().isEmpty()) {
         latestMessage_ = other.latestMessage_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getContextSize() != 0) {
@@ -630,13 +650,13 @@ public Builder mergeFrom(
             case 18:
               {
                 latestMessage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 contextSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             default:
@@ -1146,8 +1166,8 @@ public Builder setLatestMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1166,8 +1186,8 @@ public Builder setLatestMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLatestMessage() {
-
       latestMessage_ = getDefaultInstance().getLatestMessage();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1191,8 +1211,8 @@ public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1236,6 +1256,7 @@ public int getContextSize() {
     public Builder setContextSize(int value) {
 
       contextSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1255,7 +1276,7 @@ public Builder setContextSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearContextSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       contextSize_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Suggestion.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Suggestion.java
index e1c5400c1e45..8cb929d2edc9 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Suggestion.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Suggestion.java
@@ -223,7 +223,6 @@ public interface ArticleOrBuilder
      *
      * <code>map&lt;string, string&gt; metadata = 5;</code>
      */
-
     /* nullable */
     java.lang.String getMetadataOrDefault(
         java.lang.String key,
@@ -334,7 +333,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
     }
 
     public static final int TITLE_FIELD_NUMBER = 1;
-    private volatile java.lang.Object title_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object title_ = "";
     /**
      *
      *
@@ -383,7 +384,9 @@ public com.google.protobuf.ByteString getTitleBytes() {
     }
 
     public static final int URI_FIELD_NUMBER = 2;
-    private volatile java.lang.Object uri_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object uri_ = "";
     /**
      *
      *
@@ -432,6 +435,8 @@ public com.google.protobuf.ByteString getUriBytes() {
     }
 
     public static final int SNIPPETS_FIELD_NUMBER = 3;
+
+    @SuppressWarnings("serial")
     private com.google.protobuf.LazyStringList snippets_;
     /**
      *
@@ -505,6 +510,7 @@ private static final class MetadataDefaultEntryHolder {
               "");
     }
 
+    @SuppressWarnings("serial")
     private com.google.protobuf.MapField<java.lang.String, java.lang.String> metadata_;
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String> internalGetMetadata() {
@@ -565,8 +571,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
      * <code>map&lt;string, string&gt; metadata = 5;</code>
      */
     @java.lang.Override
-    public java.lang.String getMetadataOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getMetadataOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -596,7 +604,9 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
     }
 
     public static final int ANSWER_RECORD_FIELD_NUMBER = 6;
-    private volatile java.lang.Object answerRecord_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object answerRecord_ = "";
     /**
      *
      *
@@ -919,15 +929,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         title_ = "";
-
         uri_ = "";
-
         snippets_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000004);
         internalGetMutableMetadata().clear();
         answerRecord_ = "";
-
         return this;
       }
 
@@ -955,21 +963,40 @@ public com.google.cloud.dialogflow.v2beta1.Suggestion.Article build() {
       public com.google.cloud.dialogflow.v2beta1.Suggestion.Article buildPartial() {
         com.google.cloud.dialogflow.v2beta1.Suggestion.Article result =
             new com.google.cloud.dialogflow.v2beta1.Suggestion.Article(this);
-        int from_bitField0_ = bitField0_;
-        result.title_ = title_;
-        result.uri_ = uri_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          snippets_ = snippets_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000001);
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
-        result.snippets_ = snippets_;
-        result.metadata_ = internalGetMetadata();
-        result.metadata_.makeImmutable();
-        result.answerRecord_ = answerRecord_;
         onBuilt();
         return result;
       }
 
+      private void buildPartialRepeatedFields(
+          com.google.cloud.dialogflow.v2beta1.Suggestion.Article result) {
+        if (((bitField0_ & 0x00000004) != 0)) {
+          snippets_ = snippets_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000004);
+        }
+        result.snippets_ = snippets_;
+      }
+
+      private void buildPartial0(com.google.cloud.dialogflow.v2beta1.Suggestion.Article result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.title_ = title_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.uri_ = uri_;
+        }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.metadata_ = internalGetMetadata();
+          result.metadata_.makeImmutable();
+        }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.answerRecord_ = answerRecord_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1020,16 +1047,18 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Suggestion.Article
           return this;
         if (!other.getTitle().isEmpty()) {
           title_ = other.title_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getUri().isEmpty()) {
           uri_ = other.uri_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (!other.snippets_.isEmpty()) {
           if (snippets_.isEmpty()) {
             snippets_ = other.snippets_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureSnippetsIsMutable();
             snippets_.addAll(other.snippets_);
@@ -1037,8 +1066,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Suggestion.Article
           onChanged();
         }
         internalGetMutableMetadata().mergeFrom(other.internalGetMetadata());
+        bitField0_ |= 0x00000008;
         if (!other.getAnswerRecord().isEmpty()) {
           answerRecord_ = other.answerRecord_;
+          bitField0_ |= 0x00000010;
           onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -1070,13 +1101,13 @@ public Builder mergeFrom(
               case 10:
                 {
                   title_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 18:
                 {
                   uri_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 18
               case 26:
@@ -1095,12 +1126,13 @@ public Builder mergeFrom(
                   internalGetMutableMetadata()
                       .getMutableMap()
                       .put(metadata__.getKey(), metadata__.getValue());
+                  bitField0_ |= 0x00000008;
                   break;
                 } // case 42
               case 50:
                 {
                   answerRecord_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000010;
                   break;
                 } // case 50
               default:
@@ -1183,8 +1215,8 @@ public Builder setTitle(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         title_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1200,8 +1232,8 @@ public Builder setTitle(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearTitle() {
-
         title_ = getDefaultInstance().getTitle();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1222,8 +1254,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         title_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1289,8 +1321,8 @@ public Builder setUri(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         uri_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1306,8 +1338,8 @@ public Builder setUri(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearUri() {
-
         uri_ = getDefaultInstance().getUri();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1328,8 +1360,8 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         uri_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1338,9 +1370,9 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) {
           com.google.protobuf.LazyStringArrayList.EMPTY;
 
       private void ensureSnippetsIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!((bitField0_ & 0x00000004) != 0)) {
           snippets_ = new com.google.protobuf.LazyStringArrayList(snippets_);
-          bitField0_ |= 0x00000001;
+          bitField0_ |= 0x00000004;
         }
       }
       /**
@@ -1475,7 +1507,7 @@ public Builder addAllSnippets(java.lang.Iterable<java.lang.String> values) {
        */
       public Builder clearSnippets() {
         snippets_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -1515,8 +1547,6 @@ public Builder addSnippetsBytes(com.google.protobuf.ByteString value) {
 
       private com.google.protobuf.MapField<java.lang.String, java.lang.String>
           internalGetMutableMetadata() {
-        onChanged();
-        ;
         if (metadata_ == null) {
           metadata_ =
               com.google.protobuf.MapField.newMapField(MetadataDefaultEntryHolder.defaultEntry);
@@ -1524,6 +1554,8 @@ public Builder addSnippetsBytes(com.google.protobuf.ByteString value) {
         if (!metadata_.isMutable()) {
           metadata_ = metadata_.copy();
         }
+        bitField0_ |= 0x00000008;
+        onChanged();
         return metadata_;
       }
 
@@ -1578,8 +1610,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
        * <code>map&lt;string, string&gt; metadata = 5;</code>
        */
       @java.lang.Override
-      public java.lang.String getMetadataOrDefault(
-          java.lang.String key, java.lang.String defaultValue) {
+      public /* nullable */ java.lang.String getMetadataOrDefault(
+          java.lang.String key,
+          /* nullable */
+          java.lang.String defaultValue) {
         if (key == null) {
           throw new NullPointerException("map key");
         }
@@ -1609,6 +1643,7 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
       }
 
       public Builder clearMetadata() {
+        bitField0_ = (bitField0_ & ~0x00000008);
         internalGetMutableMetadata().getMutableMap().clear();
         return this;
       }
@@ -1632,6 +1667,7 @@ public Builder removeMetadata(java.lang.String key) {
       /** Use alternate mutation accessors instead. */
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, java.lang.String> getMutableMetadata() {
+        bitField0_ |= 0x00000008;
         return internalGetMutableMetadata().getMutableMap();
       }
       /**
@@ -1651,8 +1687,8 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
         if (value == null) {
           throw new NullPointerException("map value");
         }
-
         internalGetMutableMetadata().getMutableMap().put(key, value);
+        bitField0_ |= 0x00000008;
         return this;
       }
       /**
@@ -1667,6 +1703,7 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
        */
       public Builder putAllMetadata(java.util.Map<java.lang.String, java.lang.String> values) {
         internalGetMutableMetadata().getMutableMap().putAll(values);
+        bitField0_ |= 0x00000008;
         return this;
       }
 
@@ -1737,8 +1774,8 @@ public Builder setAnswerRecord(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         answerRecord_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1756,8 +1793,8 @@ public Builder setAnswerRecord(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearAnswerRecord() {
-
         answerRecord_ = getDefaultInstance().getAnswerRecord();
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
       }
@@ -1780,8 +1817,8 @@ public Builder setAnswerRecordBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         answerRecord_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1997,7 +2034,6 @@ public interface FaqAnswerOrBuilder
      *
      * <code>map&lt;string, string&gt; metadata = 5;</code>
      */
-
     /* nullable */
     java.lang.String getMetadataOrDefault(
         java.lang.String key,
@@ -2108,7 +2144,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
     }
 
     public static final int ANSWER_FIELD_NUMBER = 1;
-    private volatile java.lang.Object answer_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object answer_ = "";
     /**
      *
      *
@@ -2157,7 +2195,7 @@ public com.google.protobuf.ByteString getAnswerBytes() {
     }
 
     public static final int CONFIDENCE_FIELD_NUMBER = 2;
-    private float confidence_;
+    private float confidence_ = 0F;
     /**
      *
      *
@@ -2177,7 +2215,9 @@ public float getConfidence() {
     }
 
     public static final int QUESTION_FIELD_NUMBER = 3;
-    private volatile java.lang.Object question_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object question_ = "";
     /**
      *
      *
@@ -2226,7 +2266,9 @@ public com.google.protobuf.ByteString getQuestionBytes() {
     }
 
     public static final int SOURCE_FIELD_NUMBER = 4;
-    private volatile java.lang.Object source_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object source_ = "";
     /**
      *
      *
@@ -2293,6 +2335,7 @@ private static final class MetadataDefaultEntryHolder {
               "");
     }
 
+    @SuppressWarnings("serial")
     private com.google.protobuf.MapField<java.lang.String, java.lang.String> metadata_;
 
     private com.google.protobuf.MapField<java.lang.String, java.lang.String> internalGetMetadata() {
@@ -2353,8 +2396,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
      * <code>map&lt;string, string&gt; metadata = 5;</code>
      */
     @java.lang.Override
-    public java.lang.String getMetadataOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getMetadataOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -2384,7 +2429,9 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
     }
 
     public static final int ANSWER_RECORD_FIELD_NUMBER = 6;
-    private volatile java.lang.Object answerRecord_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object answerRecord_ = "";
     /**
      *
      *
@@ -2710,17 +2757,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         answer_ = "";
-
         confidence_ = 0F;
-
         question_ = "";
-
         source_ = "";
-
         internalGetMutableMetadata().clear();
         answerRecord_ = "";
-
         return this;
       }
 
@@ -2748,18 +2791,36 @@ public com.google.cloud.dialogflow.v2beta1.Suggestion.FaqAnswer build() {
       public com.google.cloud.dialogflow.v2beta1.Suggestion.FaqAnswer buildPartial() {
         com.google.cloud.dialogflow.v2beta1.Suggestion.FaqAnswer result =
             new com.google.cloud.dialogflow.v2beta1.Suggestion.FaqAnswer(this);
-        int from_bitField0_ = bitField0_;
-        result.answer_ = answer_;
-        result.confidence_ = confidence_;
-        result.question_ = question_;
-        result.source_ = source_;
-        result.metadata_ = internalGetMetadata();
-        result.metadata_.makeImmutable();
-        result.answerRecord_ = answerRecord_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(com.google.cloud.dialogflow.v2beta1.Suggestion.FaqAnswer result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.answer_ = answer_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.confidence_ = confidence_;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.question_ = question_;
+        }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.source_ = source_;
+        }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.metadata_ = internalGetMetadata();
+          result.metadata_.makeImmutable();
+        }
+        if (((from_bitField0_ & 0x00000020) != 0)) {
+          result.answerRecord_ = answerRecord_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -2810,6 +2871,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Suggestion.FaqAnswe
           return this;
         if (!other.getAnswer().isEmpty()) {
           answer_ = other.answer_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.getConfidence() != 0F) {
@@ -2817,15 +2879,19 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Suggestion.FaqAnswe
         }
         if (!other.getQuestion().isEmpty()) {
           question_ = other.question_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
         if (!other.getSource().isEmpty()) {
           source_ = other.source_;
+          bitField0_ |= 0x00000008;
           onChanged();
         }
         internalGetMutableMetadata().mergeFrom(other.internalGetMetadata());
+        bitField0_ |= 0x00000010;
         if (!other.getAnswerRecord().isEmpty()) {
           answerRecord_ = other.answerRecord_;
+          bitField0_ |= 0x00000020;
           onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -2857,25 +2923,25 @@ public Builder mergeFrom(
               case 10:
                 {
                   answer_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 21:
                 {
                   confidence_ = input.readFloat();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 21
               case 26:
                 {
                   question_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000004;
                   break;
                 } // case 26
               case 34:
                 {
                   source_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000008;
                   break;
                 } // case 34
               case 42:
@@ -2887,12 +2953,13 @@ public Builder mergeFrom(
                   internalGetMutableMetadata()
                       .getMutableMap()
                       .put(metadata__.getKey(), metadata__.getValue());
+                  bitField0_ |= 0x00000010;
                   break;
                 } // case 42
               case 50:
                 {
                   answerRecord_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000020;
                   break;
                 } // case 50
               default:
@@ -2975,8 +3042,8 @@ public Builder setAnswer(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         answer_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2992,8 +3059,8 @@ public Builder setAnswer(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearAnswer() {
-
         answer_ = getDefaultInstance().getAnswer();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -3014,8 +3081,8 @@ public Builder setAnswerBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         answer_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -3055,6 +3122,7 @@ public float getConfidence() {
       public Builder setConfidence(float value) {
 
         confidence_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -3072,7 +3140,7 @@ public Builder setConfidence(float value) {
        * @return This builder for chaining.
        */
       public Builder clearConfidence() {
-
+        bitField0_ = (bitField0_ & ~0x00000002);
         confidence_ = 0F;
         onChanged();
         return this;
@@ -3139,8 +3207,8 @@ public Builder setQuestion(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         question_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -3156,8 +3224,8 @@ public Builder setQuestion(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearQuestion() {
-
         question_ = getDefaultInstance().getQuestion();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -3178,8 +3246,8 @@ public Builder setQuestionBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         question_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -3254,8 +3322,8 @@ public Builder setSource(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         source_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -3274,8 +3342,8 @@ public Builder setSource(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearSource() {
-
         source_ = getDefaultInstance().getSource();
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
@@ -3299,8 +3367,8 @@ public Builder setSourceBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         source_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -3318,8 +3386,6 @@ public Builder setSourceBytes(com.google.protobuf.ByteString value) {
 
       private com.google.protobuf.MapField<java.lang.String, java.lang.String>
           internalGetMutableMetadata() {
-        onChanged();
-        ;
         if (metadata_ == null) {
           metadata_ =
               com.google.protobuf.MapField.newMapField(MetadataDefaultEntryHolder.defaultEntry);
@@ -3327,6 +3393,8 @@ public Builder setSourceBytes(com.google.protobuf.ByteString value) {
         if (!metadata_.isMutable()) {
           metadata_ = metadata_.copy();
         }
+        bitField0_ |= 0x00000010;
+        onChanged();
         return metadata_;
       }
 
@@ -3381,8 +3449,10 @@ public java.util.Map<java.lang.String, java.lang.String> getMetadataMap() {
        * <code>map&lt;string, string&gt; metadata = 5;</code>
        */
       @java.lang.Override
-      public java.lang.String getMetadataOrDefault(
-          java.lang.String key, java.lang.String defaultValue) {
+      public /* nullable */ java.lang.String getMetadataOrDefault(
+          java.lang.String key,
+          /* nullable */
+          java.lang.String defaultValue) {
         if (key == null) {
           throw new NullPointerException("map key");
         }
@@ -3412,6 +3482,7 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
       }
 
       public Builder clearMetadata() {
+        bitField0_ = (bitField0_ & ~0x00000010);
         internalGetMutableMetadata().getMutableMap().clear();
         return this;
       }
@@ -3435,6 +3506,7 @@ public Builder removeMetadata(java.lang.String key) {
       /** Use alternate mutation accessors instead. */
       @java.lang.Deprecated
       public java.util.Map<java.lang.String, java.lang.String> getMutableMetadata() {
+        bitField0_ |= 0x00000010;
         return internalGetMutableMetadata().getMutableMap();
       }
       /**
@@ -3454,8 +3526,8 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
         if (value == null) {
           throw new NullPointerException("map value");
         }
-
         internalGetMutableMetadata().getMutableMap().put(key, value);
+        bitField0_ |= 0x00000010;
         return this;
       }
       /**
@@ -3470,6 +3542,7 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
        */
       public Builder putAllMetadata(java.util.Map<java.lang.String, java.lang.String> values) {
         internalGetMutableMetadata().getMutableMap().putAll(values);
+        bitField0_ |= 0x00000010;
         return this;
       }
 
@@ -3540,8 +3613,8 @@ public Builder setAnswerRecord(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         answerRecord_ = value;
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -3559,8 +3632,8 @@ public Builder setAnswerRecord(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearAnswerRecord() {
-
         answerRecord_ = getDefaultInstance().getAnswerRecord();
+        bitField0_ = (bitField0_ & ~0x00000020);
         onChanged();
         return this;
       }
@@ -3583,8 +3656,8 @@ public Builder setAnswerRecordBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         answerRecord_ = value;
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -3654,7 +3727,9 @@ public com.google.cloud.dialogflow.v2beta1.Suggestion.FaqAnswer getDefaultInstan
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -3709,6 +3784,8 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int ARTICLES_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Suggestion.Article> articles_;
   /**
    *
@@ -3779,6 +3856,8 @@ public com.google.cloud.dialogflow.v2beta1.Suggestion.ArticleOrBuilder getArticl
   }
 
   public static final int FAQ_ANSWERS_FIELD_NUMBER = 4;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Suggestion.FaqAnswer> faqAnswers_;
   /**
    *
@@ -3892,11 +3971,13 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
 
   public static final int LATEST_MESSAGE_FIELD_NUMBER = 7;
-  private volatile java.lang.Object latestMessage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object latestMessage_ = "";
   /**
    *
    *
@@ -4190,30 +4271,28 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       if (articlesBuilder_ == null) {
         articles_ = java.util.Collections.emptyList();
       } else {
         articles_ = null;
         articlesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       if (faqAnswersBuilder_ == null) {
         faqAnswers_ = java.util.Collections.emptyList();
       } else {
         faqAnswers_ = null;
         faqAnswersBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
       latestMessage_ = "";
-
       return this;
     }
 
@@ -4241,34 +4320,46 @@ public com.google.cloud.dialogflow.v2beta1.Suggestion build() {
     public com.google.cloud.dialogflow.v2beta1.Suggestion buildPartial() {
       com.google.cloud.dialogflow.v2beta1.Suggestion result =
           new com.google.cloud.dialogflow.v2beta1.Suggestion(this);
-      int from_bitField0_ = bitField0_;
-      result.name_ = name_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.cloud.dialogflow.v2beta1.Suggestion result) {
       if (articlesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           articles_ = java.util.Collections.unmodifiableList(articles_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.articles_ = articles_;
       } else {
         result.articles_ = articlesBuilder_.build();
       }
       if (faqAnswersBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000004) != 0)) {
           faqAnswers_ = java.util.Collections.unmodifiableList(faqAnswers_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.faqAnswers_ = faqAnswers_;
       } else {
         result.faqAnswers_ = faqAnswersBuilder_.build();
       }
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.Suggestion result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.latestMessage_ = latestMessage_;
       }
-      result.latestMessage_ = latestMessage_;
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -4318,13 +4409,14 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Suggestion other) {
       if (other == com.google.cloud.dialogflow.v2beta1.Suggestion.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (articlesBuilder_ == null) {
         if (!other.articles_.isEmpty()) {
           if (articles_.isEmpty()) {
             articles_ = other.articles_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureArticlesIsMutable();
             articles_.addAll(other.articles_);
@@ -4337,7 +4429,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Suggestion other) {
             articlesBuilder_.dispose();
             articlesBuilder_ = null;
             articles_ = other.articles_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             articlesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getArticlesFieldBuilder()
@@ -4351,7 +4443,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Suggestion other) {
         if (!other.faqAnswers_.isEmpty()) {
           if (faqAnswers_.isEmpty()) {
             faqAnswers_ = other.faqAnswers_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureFaqAnswersIsMutable();
             faqAnswers_.addAll(other.faqAnswers_);
@@ -4364,7 +4456,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Suggestion other) {
             faqAnswersBuilder_.dispose();
             faqAnswersBuilder_ = null;
             faqAnswers_ = other.faqAnswers_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000004);
             faqAnswersBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getFaqAnswersFieldBuilder()
@@ -4379,6 +4471,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Suggestion other) {
       }
       if (!other.getLatestMessage().isEmpty()) {
         latestMessage_ = other.latestMessage_;
+        bitField0_ |= 0x00000010;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -4410,7 +4503,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -4444,13 +4537,13 @@ public Builder mergeFrom(
             case 42:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 42
             case 58:
               {
                 latestMessage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 58
             default:
@@ -4542,8 +4635,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -4562,8 +4655,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -4587,8 +4680,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -4597,11 +4690,11 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureArticlesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         articles_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.Suggestion.Article>(
                 articles_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -4821,7 +4914,7 @@ public Builder addAllArticles(
     public Builder clearArticles() {
       if (articlesBuilder_ == null) {
         articles_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         articlesBuilder_.clear();
@@ -4947,7 +5040,7 @@ public com.google.cloud.dialogflow.v2beta1.Suggestion.Article.Builder addArticle
                 com.google.cloud.dialogflow.v2beta1.Suggestion.Article,
                 com.google.cloud.dialogflow.v2beta1.Suggestion.Article.Builder,
                 com.google.cloud.dialogflow.v2beta1.Suggestion.ArticleOrBuilder>(
-                articles_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                articles_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         articles_ = null;
       }
       return articlesBuilder_;
@@ -4957,11 +5050,11 @@ public com.google.cloud.dialogflow.v2beta1.Suggestion.Article.Builder addArticle
         java.util.Collections.emptyList();
 
     private void ensureFaqAnswersIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         faqAnswers_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.Suggestion.FaqAnswer>(
                 faqAnswers_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000004;
       }
     }
 
@@ -5183,7 +5276,7 @@ public Builder addAllFaqAnswers(
     public Builder clearFaqAnswers() {
       if (faqAnswersBuilder_ == null) {
         faqAnswers_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
       } else {
         faqAnswersBuilder_.clear();
@@ -5311,7 +5404,7 @@ public com.google.cloud.dialogflow.v2beta1.Suggestion.FaqAnswer.Builder addFaqAn
                 com.google.cloud.dialogflow.v2beta1.Suggestion.FaqAnswer,
                 com.google.cloud.dialogflow.v2beta1.Suggestion.FaqAnswer.Builder,
                 com.google.cloud.dialogflow.v2beta1.Suggestion.FaqAnswerOrBuilder>(
-                faqAnswers_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                faqAnswers_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
         faqAnswers_ = null;
       }
       return faqAnswersBuilder_;
@@ -5335,7 +5428,7 @@ public com.google.cloud.dialogflow.v2beta1.Suggestion.FaqAnswer.Builder addFaqAn
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -5372,11 +5465,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -5391,11 +5484,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -5409,17 +5502,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
         } else {
           createTime_ = value;
         }
-        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -5432,14 +5526,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * <code>.google.protobuf.Timestamp create_time = 5;</code>
      */
     public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -5452,7 +5545,7 @@ public Builder clearCreateTime() {
      * <code>.google.protobuf.Timestamp create_time = 5;</code>
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
@@ -5567,8 +5660,8 @@ public Builder setLatestMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -5586,8 +5679,8 @@ public Builder setLatestMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLatestMessage() {
-
       latestMessage_ = getDefaultInstance().getLatestMessage();
+      bitField0_ = (bitField0_ & ~0x00000010);
       onChanged();
       return this;
     }
@@ -5610,8 +5703,8 @@ public Builder setLatestMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       latestMessage_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestionFeature.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestionFeature.java
index 82189e7d3125..ef46ce23afbd 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestionFeature.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestionFeature.java
@@ -273,7 +273,7 @@ private Type(int value) {
   }
 
   public static final int TYPE_FIELD_NUMBER = 1;
-  private int type_;
+  private int type_ = 0;
   /**
    *
    *
@@ -302,9 +302,8 @@ public int getTypeValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type getType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type result =
-        com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.valueOf(type_);
+        com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.forNumber(type_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.UNRECOGNIZED
         : result;
@@ -514,8 +513,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       type_ = 0;
-
       return this;
     }
 
@@ -543,11 +542,20 @@ public com.google.cloud.dialogflow.v2beta1.SuggestionFeature build() {
     public com.google.cloud.dialogflow.v2beta1.SuggestionFeature buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SuggestionFeature result =
           new com.google.cloud.dialogflow.v2beta1.SuggestionFeature(this);
-      result.type_ = type_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.SuggestionFeature result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.type_ = type_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -626,7 +634,7 @@ public Builder mergeFrom(
             case 8:
               {
                 type_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             default:
@@ -646,6 +654,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private int type_ = 0;
     /**
      *
@@ -675,8 +685,8 @@ public int getTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setTypeValue(int value) {
-
       type_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -693,9 +703,8 @@ public Builder setTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type result =
-          com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.valueOf(type_);
+          com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.forNumber(type_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Type.UNRECOGNIZED
           : result;
@@ -716,7 +725,7 @@ public Builder setType(com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Typ
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       type_ = value.getNumber();
       onChanged();
       return this;
@@ -733,7 +742,7 @@ public Builder setType(com.google.cloud.dialogflow.v2beta1.SuggestionFeature.Typ
      * @return This builder for chaining.
      */
     public Builder clearType() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       type_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestionResult.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestionResult.java
index 330ebec62ae1..5d32e189d70a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestionResult.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SuggestionResult.java
@@ -611,6 +611,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (errorBuilder_ != null) {
         errorBuilder_.clear();
       }
@@ -652,37 +653,33 @@ public com.google.cloud.dialogflow.v2beta1.SuggestionResult build() {
     public com.google.cloud.dialogflow.v2beta1.SuggestionResult buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SuggestionResult result =
           new com.google.cloud.dialogflow.v2beta1.SuggestionResult(this);
-      if (suggestionResponseCase_ == 1) {
-        if (errorBuilder_ == null) {
-          result.suggestionResponse_ = suggestionResponse_;
-        } else {
-          result.suggestionResponse_ = errorBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (suggestionResponseCase_ == 2) {
-        if (suggestArticlesResponseBuilder_ == null) {
-          result.suggestionResponse_ = suggestionResponse_;
-        } else {
-          result.suggestionResponse_ = suggestArticlesResponseBuilder_.build();
-        }
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.SuggestionResult result) {
+      int from_bitField0_ = bitField0_;
+    }
+
+    private void buildPartialOneofs(com.google.cloud.dialogflow.v2beta1.SuggestionResult result) {
+      result.suggestionResponseCase_ = suggestionResponseCase_;
+      result.suggestionResponse_ = this.suggestionResponse_;
+      if (suggestionResponseCase_ == 1 && errorBuilder_ != null) {
+        result.suggestionResponse_ = errorBuilder_.build();
       }
-      if (suggestionResponseCase_ == 3) {
-        if (suggestFaqAnswersResponseBuilder_ == null) {
-          result.suggestionResponse_ = suggestionResponse_;
-        } else {
-          result.suggestionResponse_ = suggestFaqAnswersResponseBuilder_.build();
-        }
+      if (suggestionResponseCase_ == 2 && suggestArticlesResponseBuilder_ != null) {
+        result.suggestionResponse_ = suggestArticlesResponseBuilder_.build();
       }
-      if (suggestionResponseCase_ == 4) {
-        if (suggestSmartRepliesResponseBuilder_ == null) {
-          result.suggestionResponse_ = suggestionResponse_;
-        } else {
-          result.suggestionResponse_ = suggestSmartRepliesResponseBuilder_.build();
-        }
+      if (suggestionResponseCase_ == 3 && suggestFaqAnswersResponseBuilder_ != null) {
+        result.suggestionResponse_ = suggestFaqAnswersResponseBuilder_.build();
+      }
+      if (suggestionResponseCase_ == 4 && suggestSmartRepliesResponseBuilder_ != null) {
+        result.suggestionResponse_ = suggestSmartRepliesResponseBuilder_.build();
       }
-      result.suggestionResponseCase_ = suggestionResponseCase_;
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -841,6 +838,8 @@ public Builder clearSuggestionResponse() {
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder>
         errorBuilder_;
@@ -1039,7 +1038,6 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
       }
       suggestionResponseCase_ = 1;
       onChanged();
-      ;
       return errorBuilder_;
     }
 
@@ -1267,7 +1265,6 @@ public Builder clearSuggestArticlesResponse() {
       }
       suggestionResponseCase_ = 2;
       onChanged();
-      ;
       return suggestArticlesResponseBuilder_;
     }
 
@@ -1506,7 +1503,6 @@ public Builder clearSuggestFaqAnswersResponse() {
       }
       suggestionResponseCase_ = 3;
       onChanged();
-      ;
       return suggestFaqAnswersResponseBuilder_;
     }
 
@@ -1746,7 +1742,6 @@ public Builder clearSuggestSmartRepliesResponse() {
       }
       suggestionResponseCase_ = 4;
       onChanged();
-      ;
       return suggestSmartRepliesResponseBuilder_;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SynthesizeSpeechConfig.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SynthesizeSpeechConfig.java
index 977731a234a2..8221c5bf7175 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SynthesizeSpeechConfig.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SynthesizeSpeechConfig.java
@@ -68,7 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SPEAKING_RATE_FIELD_NUMBER = 1;
-  private double speakingRate_;
+  private double speakingRate_ = 0D;
   /**
    *
    *
@@ -89,7 +89,7 @@ public double getSpeakingRate() {
   }
 
   public static final int PITCH_FIELD_NUMBER = 2;
-  private double pitch_;
+  private double pitch_ = 0D;
   /**
    *
    *
@@ -109,7 +109,7 @@ public double getPitch() {
   }
 
   public static final int VOLUME_GAIN_DB_FIELD_NUMBER = 3;
-  private double volumeGainDb_;
+  private double volumeGainDb_ = 0D;
   /**
    *
    *
@@ -134,6 +134,8 @@ public double getVolumeGainDb() {
   }
 
   public static final int EFFECTS_PROFILE_ID_FIELD_NUMBER = 5;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList effectsProfileId_;
   /**
    *
@@ -247,7 +249,9 @@ public com.google.cloud.dialogflow.v2beta1.VoiceSelectionParams getVoice() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.VoiceSelectionParamsOrBuilder getVoiceOrBuilder() {
-    return getVoice();
+    return voice_ == null
+        ? com.google.cloud.dialogflow.v2beta1.VoiceSelectionParams.getDefaultInstance()
+        : voice_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -507,18 +511,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       speakingRate_ = 0D;
-
       pitch_ = 0D;
-
       volumeGainDb_ = 0D;
-
       effectsProfileId_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
-      if (voiceBuilder_ == null) {
-        voice_ = null;
-      } else {
-        voice_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      voice_ = null;
+      if (voiceBuilder_ != null) {
+        voiceBuilder_.dispose();
         voiceBuilder_ = null;
       }
       return this;
@@ -548,22 +549,37 @@ public com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig build() {
     public com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig buildPartial() {
       com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig result =
           new com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig(this);
-      int from_bitField0_ = bitField0_;
-      result.speakingRate_ = speakingRate_;
-      result.pitch_ = pitch_;
-      result.volumeGainDb_ = volumeGainDb_;
-      if (((bitField0_ & 0x00000001) != 0)) {
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig result) {
+      if (((bitField0_ & 0x00000008) != 0)) {
         effectsProfileId_ = effectsProfileId_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000008);
       }
       result.effectsProfileId_ = effectsProfileId_;
-      if (voiceBuilder_ == null) {
-        result.voice_ = voice_;
-      } else {
-        result.voice_ = voiceBuilder_.build();
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.speakingRate_ = speakingRate_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pitch_ = pitch_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.volumeGainDb_ = volumeGainDb_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.voice_ = voiceBuilder_ == null ? voice_ : voiceBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -624,7 +640,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechCon
       if (!other.effectsProfileId_.isEmpty()) {
         if (effectsProfileId_.isEmpty()) {
           effectsProfileId_ = other.effectsProfileId_;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000008);
         } else {
           ensureEffectsProfileIdIsMutable();
           effectsProfileId_.addAll(other.effectsProfileId_);
@@ -663,25 +679,25 @@ public Builder mergeFrom(
             case 9:
               {
                 speakingRate_ = input.readDouble();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 9
             case 17:
               {
                 pitch_ = input.readDouble();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 17
             case 25:
               {
                 volumeGainDb_ = input.readDouble();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 25
             case 34:
               {
                 input.readMessage(getVoiceFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 34
             case 42:
@@ -747,6 +763,7 @@ public double getSpeakingRate() {
     public Builder setSpeakingRate(double value) {
 
       speakingRate_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -765,7 +782,7 @@ public Builder setSpeakingRate(double value) {
      * @return This builder for chaining.
      */
     public Builder clearSpeakingRate() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       speakingRate_ = 0D;
       onChanged();
       return this;
@@ -806,6 +823,7 @@ public double getPitch() {
     public Builder setPitch(double value) {
 
       pitch_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -823,7 +841,7 @@ public Builder setPitch(double value) {
      * @return This builder for chaining.
      */
     public Builder clearPitch() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       pitch_ = 0D;
       onChanged();
       return this;
@@ -874,6 +892,7 @@ public double getVolumeGainDb() {
     public Builder setVolumeGainDb(double value) {
 
       volumeGainDb_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -896,7 +915,7 @@ public Builder setVolumeGainDb(double value) {
      * @return This builder for chaining.
      */
     public Builder clearVolumeGainDb() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       volumeGainDb_ = 0D;
       onChanged();
       return this;
@@ -906,9 +925,9 @@ public Builder clearVolumeGainDb() {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureEffectsProfileIdIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         effectsProfileId_ = new com.google.protobuf.LazyStringArrayList(effectsProfileId_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000008;
       }
     }
     /**
@@ -1059,7 +1078,7 @@ public Builder addAllEffectsProfileId(java.lang.Iterable<java.lang.String> value
      */
     public Builder clearEffectsProfileId() {
       effectsProfileId_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1106,7 +1125,7 @@ public Builder addEffectsProfileIdBytes(com.google.protobuf.ByteString value) {
      * @return Whether the voice field is set.
      */
     public boolean hasVoice() {
-      return voiceBuilder_ != null || voice_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -1143,11 +1162,11 @@ public Builder setVoice(com.google.cloud.dialogflow.v2beta1.VoiceSelectionParams
           throw new NullPointerException();
         }
         voice_ = value;
-        onChanged();
       } else {
         voiceBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1163,11 +1182,11 @@ public Builder setVoice(
         com.google.cloud.dialogflow.v2beta1.VoiceSelectionParams.Builder builderForValue) {
       if (voiceBuilder_ == null) {
         voice_ = builderForValue.build();
-        onChanged();
       } else {
         voiceBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1181,19 +1200,19 @@ public Builder setVoice(
      */
     public Builder mergeVoice(com.google.cloud.dialogflow.v2beta1.VoiceSelectionParams value) {
       if (voiceBuilder_ == null) {
-        if (voice_ != null) {
-          voice_ =
-              com.google.cloud.dialogflow.v2beta1.VoiceSelectionParams.newBuilder(voice_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && voice_ != null
+            && voice_
+                != com.google.cloud.dialogflow.v2beta1.VoiceSelectionParams.getDefaultInstance()) {
+          getVoiceBuilder().mergeFrom(value);
         } else {
           voice_ = value;
         }
-        onChanged();
       } else {
         voiceBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1206,14 +1225,13 @@ public Builder mergeVoice(com.google.cloud.dialogflow.v2beta1.VoiceSelectionPara
      * <code>.google.cloud.dialogflow.v2beta1.VoiceSelectionParams voice = 4;</code>
      */
     public Builder clearVoice() {
-      if (voiceBuilder_ == null) {
-        voice_ = null;
-        onChanged();
-      } else {
-        voice_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      voice_ = null;
+      if (voiceBuilder_ != null) {
+        voiceBuilder_.dispose();
         voiceBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1226,7 +1244,7 @@ public Builder clearVoice() {
      * <code>.google.cloud.dialogflow.v2beta1.VoiceSelectionParams voice = 4;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.VoiceSelectionParams.Builder getVoiceBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getVoiceFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TelephonyDtmfEvents.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TelephonyDtmfEvents.java
index d67b263fddf6..ad71b83dd9fb 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TelephonyDtmfEvents.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TelephonyDtmfEvents.java
@@ -68,7 +68,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int DTMF_EVENTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<java.lang.Integer> dtmfEvents_;
+
   private static final com.google.protobuf.Internal.ListAdapter.Converter<
           java.lang.Integer, com.google.cloud.dialogflow.v2beta1.TelephonyDtmf>
       dtmfEvents_converter_ =
@@ -76,9 +79,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
               java.lang.Integer, com.google.cloud.dialogflow.v2beta1.TelephonyDtmf>() {
             public com.google.cloud.dialogflow.v2beta1.TelephonyDtmf convert(
                 java.lang.Integer from) {
-              @SuppressWarnings("deprecation")
               com.google.cloud.dialogflow.v2beta1.TelephonyDtmf result =
-                  com.google.cloud.dialogflow.v2beta1.TelephonyDtmf.valueOf(from);
+                  com.google.cloud.dialogflow.v2beta1.TelephonyDtmf.forNumber(from);
               return result == null
                   ? com.google.cloud.dialogflow.v2beta1.TelephonyDtmf.UNRECOGNIZED
                   : result;
@@ -380,6 +382,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       dtmfEvents_ = java.util.Collections.emptyList();
       bitField0_ = (bitField0_ & ~0x00000001);
       return this;
@@ -409,14 +412,25 @@ public com.google.cloud.dialogflow.v2beta1.TelephonyDtmfEvents build() {
     public com.google.cloud.dialogflow.v2beta1.TelephonyDtmfEvents buildPartial() {
       com.google.cloud.dialogflow.v2beta1.TelephonyDtmfEvents result =
           new com.google.cloud.dialogflow.v2beta1.TelephonyDtmfEvents(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.TelephonyDtmfEvents result) {
       if (((bitField0_ & 0x00000001) != 0)) {
         dtmfEvents_ = java.util.Collections.unmodifiableList(dtmfEvents_);
         bitField0_ = (bitField0_ & ~0x00000001);
       }
       result.dtmfEvents_ = dtmfEvents_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.TelephonyDtmfEvents result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TextInput.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TextInput.java
index ca2180f3138c..1cdfc53af6b5 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TextInput.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TextInput.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int TEXT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object text_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object text_ = "";
   /**
    *
    *
@@ -120,7 +122,9 @@ public com.google.protobuf.ByteString getTextBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -380,10 +384,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       text_ = "";
-
       languageCode_ = "";
-
       return this;
     }
 
@@ -411,12 +414,23 @@ public com.google.cloud.dialogflow.v2beta1.TextInput build() {
     public com.google.cloud.dialogflow.v2beta1.TextInput buildPartial() {
       com.google.cloud.dialogflow.v2beta1.TextInput result =
           new com.google.cloud.dialogflow.v2beta1.TextInput(this);
-      result.text_ = text_;
-      result.languageCode_ = languageCode_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.TextInput result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.text_ = text_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -464,10 +478,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.TextInput other) {
       if (other == com.google.cloud.dialogflow.v2beta1.TextInput.getDefaultInstance()) return this;
       if (!other.getText().isEmpty()) {
         text_ = other.text_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -499,13 +515,13 @@ public Builder mergeFrom(
             case 10:
               {
                 text_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -525,6 +541,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object text_ = "";
     /**
      *
@@ -589,8 +607,8 @@ public Builder setText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       text_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -607,8 +625,8 @@ public Builder setText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearText() {
-
       text_ = getDefaultInstance().getText();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -630,8 +648,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       text_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -706,8 +724,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -726,8 +744,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -751,8 +769,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TextToSpeechSettings.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TextToSpeechSettings.java
index 750a39395a7a..18af6e57c04f 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TextToSpeechSettings.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TextToSpeechSettings.java
@@ -79,7 +79,7 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   }
 
   public static final int ENABLE_TEXT_TO_SPEECH_FIELD_NUMBER = 1;
-  private boolean enableTextToSpeech_;
+  private boolean enableTextToSpeech_ = false;
   /**
    *
    *
@@ -98,7 +98,7 @@ public boolean getEnableTextToSpeech() {
   }
 
   public static final int OUTPUT_AUDIO_ENCODING_FIELD_NUMBER = 2;
-  private int outputAudioEncoding_;
+  private int outputAudioEncoding_ = 0;
   /**
    *
    *
@@ -131,16 +131,15 @@ public int getOutputAudioEncodingValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.OutputAudioEncoding getOutputAudioEncoding() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.OutputAudioEncoding result =
-        com.google.cloud.dialogflow.v2beta1.OutputAudioEncoding.valueOf(outputAudioEncoding_);
+        com.google.cloud.dialogflow.v2beta1.OutputAudioEncoding.forNumber(outputAudioEncoding_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.OutputAudioEncoding.UNRECOGNIZED
         : result;
   }
 
   public static final int SAMPLE_RATE_HERTZ_FIELD_NUMBER = 3;
-  private int sampleRateHertz_;
+  private int sampleRateHertz_ = 0;
   /**
    *
    *
@@ -179,6 +178,7 @@ private static final class SynthesizeSpeechConfigsDefaultEntryHolder {
                             .getDefaultInstance());
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<
           java.lang.String, com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig>
       synthesizeSpeechConfigs_;
@@ -255,9 +255,10 @@ public boolean containsSynthesizeSpeechConfigs(java.lang.String key) {
    * </code>
    */
   @java.lang.Override
-  public com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig
+  public /* nullable */ com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig
       getSynthesizeSpeechConfigsOrDefault(
           java.lang.String key,
+          /* nullable */
           com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
@@ -558,12 +559,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       enableTextToSpeech_ = false;
-
       outputAudioEncoding_ = 0;
-
       sampleRateHertz_ = 0;
-
       internalGetMutableSynthesizeSpeechConfigs().clear();
       return this;
     }
@@ -592,16 +591,30 @@ public com.google.cloud.dialogflow.v2beta1.TextToSpeechSettings build() {
     public com.google.cloud.dialogflow.v2beta1.TextToSpeechSettings buildPartial() {
       com.google.cloud.dialogflow.v2beta1.TextToSpeechSettings result =
           new com.google.cloud.dialogflow.v2beta1.TextToSpeechSettings(this);
-      int from_bitField0_ = bitField0_;
-      result.enableTextToSpeech_ = enableTextToSpeech_;
-      result.outputAudioEncoding_ = outputAudioEncoding_;
-      result.sampleRateHertz_ = sampleRateHertz_;
-      result.synthesizeSpeechConfigs_ = internalGetSynthesizeSpeechConfigs();
-      result.synthesizeSpeechConfigs_.makeImmutable();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.TextToSpeechSettings result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.enableTextToSpeech_ = enableTextToSpeech_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.outputAudioEncoding_ = outputAudioEncoding_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.sampleRateHertz_ = sampleRateHertz_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.synthesizeSpeechConfigs_ = internalGetSynthesizeSpeechConfigs();
+        result.synthesizeSpeechConfigs_.makeImmutable();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -659,6 +672,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.TextToSpeechSetting
       }
       internalGetMutableSynthesizeSpeechConfigs()
           .mergeFrom(other.internalGetSynthesizeSpeechConfigs());
+      bitField0_ |= 0x00000008;
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -688,19 +702,19 @@ public Builder mergeFrom(
             case 8:
               {
                 enableTextToSpeech_ = input.readBool();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 16:
               {
                 outputAudioEncoding_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 24:
               {
                 sampleRateHertz_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 34:
@@ -716,6 +730,7 @@ public Builder mergeFrom(
                 internalGetMutableSynthesizeSpeechConfigs()
                     .getMutableMap()
                     .put(synthesizeSpeechConfigs__.getKey(), synthesizeSpeechConfigs__.getValue());
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -770,6 +785,7 @@ public boolean getEnableTextToSpeech() {
     public Builder setEnableTextToSpeech(boolean value) {
 
       enableTextToSpeech_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -786,7 +802,7 @@ public Builder setEnableTextToSpeech(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearEnableTextToSpeech() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       enableTextToSpeech_ = false;
       onChanged();
       return this;
@@ -825,8 +841,8 @@ public int getOutputAudioEncodingValue() {
      * @return This builder for chaining.
      */
     public Builder setOutputAudioEncodingValue(int value) {
-
       outputAudioEncoding_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -845,9 +861,8 @@ public Builder setOutputAudioEncodingValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.OutputAudioEncoding getOutputAudioEncoding() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.OutputAudioEncoding result =
-          com.google.cloud.dialogflow.v2beta1.OutputAudioEncoding.valueOf(outputAudioEncoding_);
+          com.google.cloud.dialogflow.v2beta1.OutputAudioEncoding.forNumber(outputAudioEncoding_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.OutputAudioEncoding.UNRECOGNIZED
           : result;
@@ -871,7 +886,7 @@ public Builder setOutputAudioEncoding(
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       outputAudioEncoding_ = value.getNumber();
       onChanged();
       return this;
@@ -890,7 +905,7 @@ public Builder setOutputAudioEncoding(
      * @return This builder for chaining.
      */
     public Builder clearOutputAudioEncoding() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       outputAudioEncoding_ = 0;
       onChanged();
       return this;
@@ -935,6 +950,7 @@ public int getSampleRateHertz() {
     public Builder setSampleRateHertz(int value) {
 
       sampleRateHertz_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -954,7 +970,7 @@ public Builder setSampleRateHertz(int value) {
      * @return This builder for chaining.
      */
     public Builder clearSampleRateHertz() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       sampleRateHertz_ = 0;
       onChanged();
       return this;
@@ -977,8 +993,6 @@ public Builder clearSampleRateHertz() {
     private com.google.protobuf.MapField<
             java.lang.String, com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig>
         internalGetMutableSynthesizeSpeechConfigs() {
-      onChanged();
-      ;
       if (synthesizeSpeechConfigs_ == null) {
         synthesizeSpeechConfigs_ =
             com.google.protobuf.MapField.newMapField(
@@ -987,6 +1001,8 @@ public Builder clearSampleRateHertz() {
       if (!synthesizeSpeechConfigs_.isMutable()) {
         synthesizeSpeechConfigs_ = synthesizeSpeechConfigs_.copy();
       }
+      bitField0_ |= 0x00000008;
+      onChanged();
       return synthesizeSpeechConfigs_;
     }
 
@@ -1054,9 +1070,10 @@ public boolean containsSynthesizeSpeechConfigs(java.lang.String key) {
      * </code>
      */
     @java.lang.Override
-    public com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig
+    public /* nullable */ com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig
         getSynthesizeSpeechConfigsOrDefault(
             java.lang.String key,
+            /* nullable */
             com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
@@ -1093,6 +1110,7 @@ public boolean containsSynthesizeSpeechConfigs(java.lang.String key) {
     }
 
     public Builder clearSynthesizeSpeechConfigs() {
+      bitField0_ = (bitField0_ & ~0x00000008);
       internalGetMutableSynthesizeSpeechConfigs().getMutableMap().clear();
       return this;
     }
@@ -1121,6 +1139,7 @@ public Builder removeSynthesizeSpeechConfigs(java.lang.String key) {
     public java.util.Map<
             java.lang.String, com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig>
         getMutableSynthesizeSpeechConfigs() {
+      bitField0_ |= 0x00000008;
       return internalGetMutableSynthesizeSpeechConfigs().getMutableMap();
     }
     /**
@@ -1144,8 +1163,8 @@ public Builder putSynthesizeSpeechConfigs(
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableSynthesizeSpeechConfigs().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000008;
       return this;
     }
     /**
@@ -1165,6 +1184,7 @@ public Builder putAllSynthesizeSpeechConfigs(
         java.util.Map<java.lang.String, com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig>
             values) {
       internalGetMutableSynthesizeSpeechConfigs().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000008;
       return this;
     }
 
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TextToSpeechSettingsOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TextToSpeechSettingsOrBuilder.java
index 6216c78e7d23..5dc6fde1b23c 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TextToSpeechSettingsOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TextToSpeechSettingsOrBuilder.java
@@ -143,7 +143,6 @@ public interface TextToSpeechSettingsOrBuilder
    * map&lt;string, .google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig&gt; synthesize_speech_configs = 4 [(.google.api.field_behavior) = OPTIONAL];
    * </code>
    */
-
   /* nullable */
   com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig getSynthesizeSpeechConfigsOrDefault(
       java.lang.String key,
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TrainAgentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TrainAgentRequest.java
index 9e1417131bc8..fc94aad70e42 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TrainAgentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TrainAgentRequest.java
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object parent_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object parent_ = "";
   /**
    *
    *
@@ -322,8 +324,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       parent_ = "";
-
       return this;
     }
 
@@ -351,11 +353,20 @@ public com.google.cloud.dialogflow.v2beta1.TrainAgentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.TrainAgentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.TrainAgentRequest result =
           new com.google.cloud.dialogflow.v2beta1.TrainAgentRequest(this);
-      result.parent_ = parent_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.TrainAgentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.parent_ = parent_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -404,6 +415,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.TrainAgentRequest o
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -435,7 +447,7 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -455,6 +467,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object parent_ = "";
     /**
      *
@@ -528,8 +542,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -549,8 +563,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
-
       parent_ = getDefaultInstance().getParent();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -575,8 +589,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       parent_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateAnswerRecordRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateAnswerRecordRequest.java
index 2146973228fc..2ab9b5b7c2ca 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateAnswerRecordRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateAnswerRecordRequest.java
@@ -116,7 +116,9 @@ public com.google.cloud.dialogflow.v2beta1.AnswerRecord getAnswerRecord() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.AnswerRecordOrBuilder getAnswerRecordOrBuilder() {
-    return getAnswerRecord();
+    return answerRecord_ == null
+        ? com.google.cloud.dialogflow.v2beta1.AnswerRecord.getDefaultInstance()
+        : answerRecord_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -162,7 +164,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -382,16 +384,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (answerRecordBuilder_ == null) {
-        answerRecord_ = null;
-      } else {
-        answerRecord_ = null;
+      bitField0_ = 0;
+      answerRecord_ = null;
+      if (answerRecordBuilder_ != null) {
+        answerRecordBuilder_.dispose();
         answerRecordBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -422,20 +423,25 @@ public com.google.cloud.dialogflow.v2beta1.UpdateAnswerRecordRequest build() {
     public com.google.cloud.dialogflow.v2beta1.UpdateAnswerRecordRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.UpdateAnswerRecordRequest result =
           new com.google.cloud.dialogflow.v2beta1.UpdateAnswerRecordRequest(this);
-      if (answerRecordBuilder_ == null) {
-        result.answerRecord_ = answerRecord_;
-      } else {
-        result.answerRecord_ = answerRecordBuilder_.build();
-      }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.UpdateAnswerRecordRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.answerRecord_ =
+            answerRecordBuilder_ == null ? answerRecord_ : answerRecordBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -518,13 +524,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getAnswerRecordFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -544,6 +550,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2beta1.AnswerRecord answerRecord_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.AnswerRecord,
@@ -564,7 +572,7 @@ public Builder mergeFrom(
      * @return Whether the answerRecord field is set.
      */
     public boolean hasAnswerRecord() {
-      return answerRecordBuilder_ != null || answerRecord_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -605,11 +613,11 @@ public Builder setAnswerRecord(com.google.cloud.dialogflow.v2beta1.AnswerRecord
           throw new NullPointerException();
         }
         answerRecord_ = value;
-        onChanged();
       } else {
         answerRecordBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -627,11 +635,11 @@ public Builder setAnswerRecord(
         com.google.cloud.dialogflow.v2beta1.AnswerRecord.Builder builderForValue) {
       if (answerRecordBuilder_ == null) {
         answerRecord_ = builderForValue.build();
-        onChanged();
       } else {
         answerRecordBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -647,19 +655,19 @@ public Builder setAnswerRecord(
      */
     public Builder mergeAnswerRecord(com.google.cloud.dialogflow.v2beta1.AnswerRecord value) {
       if (answerRecordBuilder_ == null) {
-        if (answerRecord_ != null) {
-          answerRecord_ =
-              com.google.cloud.dialogflow.v2beta1.AnswerRecord.newBuilder(answerRecord_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && answerRecord_ != null
+            && answerRecord_
+                != com.google.cloud.dialogflow.v2beta1.AnswerRecord.getDefaultInstance()) {
+          getAnswerRecordBuilder().mergeFrom(value);
         } else {
           answerRecord_ = value;
         }
-        onChanged();
       } else {
         answerRecordBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -674,14 +682,13 @@ public Builder mergeAnswerRecord(com.google.cloud.dialogflow.v2beta1.AnswerRecor
      * </code>
      */
     public Builder clearAnswerRecord() {
-      if (answerRecordBuilder_ == null) {
-        answerRecord_ = null;
-        onChanged();
-      } else {
-        answerRecord_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      answerRecord_ = null;
+      if (answerRecordBuilder_ != null) {
+        answerRecordBuilder_.dispose();
         answerRecordBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -696,7 +703,7 @@ public Builder clearAnswerRecord() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.AnswerRecord.Builder getAnswerRecordBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getAnswerRecordFieldBuilder().getBuilder();
     }
@@ -766,7 +773,7 @@ public com.google.cloud.dialogflow.v2beta1.AnswerRecordOrBuilder getAnswerRecord
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -803,11 +810,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -822,11 +829,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -840,17 +847,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -863,14 +871,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * <code>.google.protobuf.FieldMask update_mask = 2;</code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -883,7 +890,7 @@ public Builder clearUpdateMask() {
      * <code>.google.protobuf.FieldMask update_mask = 2;</code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateContextRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateContextRequest.java
index 08b0776dc067..98074e626171 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateContextRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateContextRequest.java
@@ -116,7 +116,9 @@ public com.google.cloud.dialogflow.v2beta1.Context getContext() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.ContextOrBuilder getContextOrBuilder() {
-    return getContext();
+    return context_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Context.getDefaultInstance()
+        : context_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -165,7 +167,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -385,16 +387,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (contextBuilder_ == null) {
-        context_ = null;
-      } else {
-        context_ = null;
+      bitField0_ = 0;
+      context_ = null;
+      if (contextBuilder_ != null) {
+        contextBuilder_.dispose();
         contextBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -424,20 +425,23 @@ public com.google.cloud.dialogflow.v2beta1.UpdateContextRequest build() {
     public com.google.cloud.dialogflow.v2beta1.UpdateContextRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.UpdateContextRequest result =
           new com.google.cloud.dialogflow.v2beta1.UpdateContextRequest(this);
-      if (contextBuilder_ == null) {
-        result.context_ = context_;
-      } else {
-        result.context_ = contextBuilder_.build();
-      }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.UpdateContextRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.context_ = contextBuilder_ == null ? context_ : contextBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -519,13 +523,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getContextFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -545,6 +549,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2beta1.Context context_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.Context,
@@ -565,7 +571,7 @@ public Builder mergeFrom(
      * @return Whether the context field is set.
      */
     public boolean hasContext() {
-      return contextBuilder_ != null || context_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -606,11 +612,11 @@ public Builder setContext(com.google.cloud.dialogflow.v2beta1.Context value) {
           throw new NullPointerException();
         }
         context_ = value;
-        onChanged();
       } else {
         contextBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -627,11 +633,11 @@ public Builder setContext(com.google.cloud.dialogflow.v2beta1.Context value) {
     public Builder setContext(com.google.cloud.dialogflow.v2beta1.Context.Builder builderForValue) {
       if (contextBuilder_ == null) {
         context_ = builderForValue.build();
-        onChanged();
       } else {
         contextBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -647,19 +653,18 @@ public Builder setContext(com.google.cloud.dialogflow.v2beta1.Context.Builder bu
      */
     public Builder mergeContext(com.google.cloud.dialogflow.v2beta1.Context value) {
       if (contextBuilder_ == null) {
-        if (context_ != null) {
-          context_ =
-              com.google.cloud.dialogflow.v2beta1.Context.newBuilder(context_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && context_ != null
+            && context_ != com.google.cloud.dialogflow.v2beta1.Context.getDefaultInstance()) {
+          getContextBuilder().mergeFrom(value);
         } else {
           context_ = value;
         }
-        onChanged();
       } else {
         contextBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -674,14 +679,13 @@ public Builder mergeContext(com.google.cloud.dialogflow.v2beta1.Context value) {
      * </code>
      */
     public Builder clearContext() {
-      if (contextBuilder_ == null) {
-        context_ = null;
-        onChanged();
-      } else {
-        context_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      context_ = null;
+      if (contextBuilder_ != null) {
+        contextBuilder_.dispose();
         contextBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -696,7 +700,7 @@ public Builder clearContext() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Context.Builder getContextBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getContextFieldBuilder().getBuilder();
     }
@@ -767,7 +771,7 @@ public com.google.cloud.dialogflow.v2beta1.ContextOrBuilder getContextOrBuilder(
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -806,11 +810,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -826,11 +830,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -845,17 +849,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -869,14 +874,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -890,7 +894,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateConversationProfileRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateConversationProfileRequest.java
index 8f9958d54402..21315fd4eac2 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateConversationProfileRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateConversationProfileRequest.java
@@ -118,7 +118,9 @@ public com.google.cloud.dialogflow.v2beta1.ConversationProfile getConversationPr
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.ConversationProfileOrBuilder
       getConversationProfileOrBuilder() {
-    return getConversationProfile();
+    return conversationProfile_ == null
+        ? com.google.cloud.dialogflow.v2beta1.ConversationProfile.getDefaultInstance()
+        : conversationProfile_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -167,7 +169,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -389,16 +391,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (conversationProfileBuilder_ == null) {
-        conversationProfile_ = null;
-      } else {
-        conversationProfile_ = null;
+      bitField0_ = 0;
+      conversationProfile_ = null;
+      if (conversationProfileBuilder_ != null) {
+        conversationProfileBuilder_.dispose();
         conversationProfileBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -430,20 +431,27 @@ public com.google.cloud.dialogflow.v2beta1.UpdateConversationProfileRequest buil
     public com.google.cloud.dialogflow.v2beta1.UpdateConversationProfileRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.UpdateConversationProfileRequest result =
           new com.google.cloud.dialogflow.v2beta1.UpdateConversationProfileRequest(this);
-      if (conversationProfileBuilder_ == null) {
-        result.conversationProfile_ = conversationProfile_;
-      } else {
-        result.conversationProfile_ = conversationProfileBuilder_.build();
-      }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.UpdateConversationProfileRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.conversationProfile_ =
+            conversationProfileBuilder_ == null
+                ? conversationProfile_
+                : conversationProfileBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -529,13 +537,13 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getConversationProfileFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -555,6 +563,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2beta1.ConversationProfile conversationProfile_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.ConversationProfile,
@@ -575,7 +585,7 @@ public Builder mergeFrom(
      * @return Whether the conversationProfile field is set.
      */
     public boolean hasConversationProfile() {
-      return conversationProfileBuilder_ != null || conversationProfile_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -617,11 +627,11 @@ public Builder setConversationProfile(
           throw new NullPointerException();
         }
         conversationProfile_ = value;
-        onChanged();
       } else {
         conversationProfileBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -639,11 +649,11 @@ public Builder setConversationProfile(
         com.google.cloud.dialogflow.v2beta1.ConversationProfile.Builder builderForValue) {
       if (conversationProfileBuilder_ == null) {
         conversationProfile_ = builderForValue.build();
-        onChanged();
       } else {
         conversationProfileBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -660,20 +670,19 @@ public Builder setConversationProfile(
     public Builder mergeConversationProfile(
         com.google.cloud.dialogflow.v2beta1.ConversationProfile value) {
       if (conversationProfileBuilder_ == null) {
-        if (conversationProfile_ != null) {
-          conversationProfile_ =
-              com.google.cloud.dialogflow.v2beta1.ConversationProfile.newBuilder(
-                      conversationProfile_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && conversationProfile_ != null
+            && conversationProfile_
+                != com.google.cloud.dialogflow.v2beta1.ConversationProfile.getDefaultInstance()) {
+          getConversationProfileBuilder().mergeFrom(value);
         } else {
           conversationProfile_ = value;
         }
-        onChanged();
       } else {
         conversationProfileBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -688,14 +697,13 @@ public Builder mergeConversationProfile(
      * </code>
      */
     public Builder clearConversationProfile() {
-      if (conversationProfileBuilder_ == null) {
-        conversationProfile_ = null;
-        onChanged();
-      } else {
-        conversationProfile_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      conversationProfile_ = null;
+      if (conversationProfileBuilder_ != null) {
+        conversationProfileBuilder_.dispose();
         conversationProfileBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -711,7 +719,7 @@ public Builder clearConversationProfile() {
      */
     public com.google.cloud.dialogflow.v2beta1.ConversationProfile.Builder
         getConversationProfileBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getConversationProfileFieldBuilder().getBuilder();
     }
@@ -783,7 +791,7 @@ public Builder clearConversationProfile() {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -822,11 +830,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -842,11 +850,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -861,17 +869,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -885,14 +894,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -906,7 +914,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateDocumentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateDocumentRequest.java
index 0feeddc9193f..690ca76533e1 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateDocumentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateDocumentRequest.java
@@ -116,7 +116,9 @@ public com.google.cloud.dialogflow.v2beta1.Document getDocument() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.DocumentOrBuilder getDocumentOrBuilder() {
-    return getDocument();
+    return document_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Document.getDefaultInstance()
+        : document_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -171,7 +173,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -391,16 +393,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (documentBuilder_ == null) {
-        document_ = null;
-      } else {
-        document_ = null;
+      bitField0_ = 0;
+      document_ = null;
+      if (documentBuilder_ != null) {
+        documentBuilder_.dispose();
         documentBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -430,20 +431,23 @@ public com.google.cloud.dialogflow.v2beta1.UpdateDocumentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.UpdateDocumentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.UpdateDocumentRequest result =
           new com.google.cloud.dialogflow.v2beta1.UpdateDocumentRequest(this);
-      if (documentBuilder_ == null) {
-        result.document_ = document_;
-      } else {
-        result.document_ = documentBuilder_.build();
-      }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.UpdateDocumentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.document_ = documentBuilder_ == null ? document_ : documentBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -525,13 +529,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getDocumentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -551,6 +555,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2beta1.Document document_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.Document,
@@ -571,7 +577,7 @@ public Builder mergeFrom(
      * @return Whether the document field is set.
      */
     public boolean hasDocument() {
-      return documentBuilder_ != null || document_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -612,11 +618,11 @@ public Builder setDocument(com.google.cloud.dialogflow.v2beta1.Document value) {
           throw new NullPointerException();
         }
         document_ = value;
-        onChanged();
       } else {
         documentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -634,11 +640,11 @@ public Builder setDocument(
         com.google.cloud.dialogflow.v2beta1.Document.Builder builderForValue) {
       if (documentBuilder_ == null) {
         document_ = builderForValue.build();
-        onChanged();
       } else {
         documentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -654,19 +660,18 @@ public Builder setDocument(
      */
     public Builder mergeDocument(com.google.cloud.dialogflow.v2beta1.Document value) {
       if (documentBuilder_ == null) {
-        if (document_ != null) {
-          document_ =
-              com.google.cloud.dialogflow.v2beta1.Document.newBuilder(document_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && document_ != null
+            && document_ != com.google.cloud.dialogflow.v2beta1.Document.getDefaultInstance()) {
+          getDocumentBuilder().mergeFrom(value);
         } else {
           document_ = value;
         }
-        onChanged();
       } else {
         documentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -681,14 +686,13 @@ public Builder mergeDocument(com.google.cloud.dialogflow.v2beta1.Document value)
      * </code>
      */
     public Builder clearDocument() {
-      if (documentBuilder_ == null) {
-        document_ = null;
-        onChanged();
-      } else {
-        document_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      document_ = null;
+      if (documentBuilder_ != null) {
+        documentBuilder_.dispose();
         documentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -703,7 +707,7 @@ public Builder clearDocument() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Document.Builder getDocumentBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getDocumentFieldBuilder().getBuilder();
     }
@@ -776,7 +780,7 @@ public com.google.cloud.dialogflow.v2beta1.DocumentOrBuilder getDocumentOrBuilde
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -819,11 +823,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -841,11 +845,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -862,17 +866,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -888,14 +893,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -911,7 +915,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateEntityTypeRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateEntityTypeRequest.java
index 1c524d43e316..64832940223c 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateEntityTypeRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateEntityTypeRequest.java
@@ -118,11 +118,15 @@ public com.google.cloud.dialogflow.v2beta1.EntityType getEntityType() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.EntityTypeOrBuilder getEntityTypeOrBuilder() {
-    return getEntityType();
+    return entityType_ == null
+        ? com.google.cloud.dialogflow.v2beta1.EntityType.getDefaultInstance()
+        : entityType_;
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -224,7 +228,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -453,18 +457,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (entityTypeBuilder_ == null) {
-        entityType_ = null;
-      } else {
-        entityType_ = null;
+      bitField0_ = 0;
+      entityType_ = null;
+      if (entityTypeBuilder_ != null) {
+        entityTypeBuilder_.dispose();
         entityTypeBuilder_ = null;
       }
       languageCode_ = "";
-
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -494,21 +496,26 @@ public com.google.cloud.dialogflow.v2beta1.UpdateEntityTypeRequest build() {
     public com.google.cloud.dialogflow.v2beta1.UpdateEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.UpdateEntityTypeRequest result =
           new com.google.cloud.dialogflow.v2beta1.UpdateEntityTypeRequest(this);
-      if (entityTypeBuilder_ == null) {
-        result.entityType_ = entityType_;
-      } else {
-        result.entityType_ = entityTypeBuilder_.build();
-      }
-      result.languageCode_ = languageCode_;
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.UpdateEntityTypeRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.entityType_ = entityTypeBuilder_ == null ? entityType_ : entityTypeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -560,6 +567,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.UpdateEntityTypeReq
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasUpdateMask()) {
@@ -594,19 +602,19 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getEntityTypeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -626,6 +634,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2beta1.EntityType entityType_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.EntityType,
@@ -646,7 +656,7 @@ public Builder mergeFrom(
      * @return Whether the entityType field is set.
      */
     public boolean hasEntityType() {
-      return entityTypeBuilder_ != null || entityType_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -687,11 +697,11 @@ public Builder setEntityType(com.google.cloud.dialogflow.v2beta1.EntityType valu
           throw new NullPointerException();
         }
         entityType_ = value;
-        onChanged();
       } else {
         entityTypeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -709,11 +719,11 @@ public Builder setEntityType(
         com.google.cloud.dialogflow.v2beta1.EntityType.Builder builderForValue) {
       if (entityTypeBuilder_ == null) {
         entityType_ = builderForValue.build();
-        onChanged();
       } else {
         entityTypeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -729,19 +739,18 @@ public Builder setEntityType(
      */
     public Builder mergeEntityType(com.google.cloud.dialogflow.v2beta1.EntityType value) {
       if (entityTypeBuilder_ == null) {
-        if (entityType_ != null) {
-          entityType_ =
-              com.google.cloud.dialogflow.v2beta1.EntityType.newBuilder(entityType_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && entityType_ != null
+            && entityType_ != com.google.cloud.dialogflow.v2beta1.EntityType.getDefaultInstance()) {
+          getEntityTypeBuilder().mergeFrom(value);
         } else {
           entityType_ = value;
         }
-        onChanged();
       } else {
         entityTypeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -756,14 +765,13 @@ public Builder mergeEntityType(com.google.cloud.dialogflow.v2beta1.EntityType va
      * </code>
      */
     public Builder clearEntityType() {
-      if (entityTypeBuilder_ == null) {
-        entityType_ = null;
-        onChanged();
-      } else {
-        entityType_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      entityType_ = null;
+      if (entityTypeBuilder_ != null) {
+        entityTypeBuilder_.dispose();
         entityTypeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -778,7 +786,7 @@ public Builder clearEntityType() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.EntityType.Builder getEntityTypeBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getEntityTypeFieldBuilder().getBuilder();
     }
@@ -903,8 +911,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -924,8 +932,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -950,8 +958,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -975,7 +983,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1014,11 +1022,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1034,11 +1042,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1053,17 +1061,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1077,14 +1086,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1098,7 +1106,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateEnvironmentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateEnvironmentRequest.java
index 0aaef4a230a3..6696d6d3a979 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateEnvironmentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateEnvironmentRequest.java
@@ -116,7 +116,9 @@ public com.google.cloud.dialogflow.v2beta1.Environment getEnvironment() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.EnvironmentOrBuilder getEnvironmentOrBuilder() {
-    return getEnvironment();
+    return environment_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Environment.getDefaultInstance()
+        : environment_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -165,11 +167,11 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   public static final int ALLOW_LOAD_TO_DRAFT_AND_DISCARD_CHANGES_FIELD_NUMBER = 3;
-  private boolean allowLoadToDraftAndDiscardChanges_;
+  private boolean allowLoadToDraftAndDiscardChanges_ = false;
   /**
    *
    *
@@ -422,20 +424,18 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (environmentBuilder_ == null) {
-        environment_ = null;
-      } else {
-        environment_ = null;
+      bitField0_ = 0;
+      environment_ = null;
+      if (environmentBuilder_ != null) {
+        environmentBuilder_.dispose();
         environmentBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       allowLoadToDraftAndDiscardChanges_ = false;
-
       return this;
     }
 
@@ -464,21 +464,28 @@ public com.google.cloud.dialogflow.v2beta1.UpdateEnvironmentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.UpdateEnvironmentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.UpdateEnvironmentRequest result =
           new com.google.cloud.dialogflow.v2beta1.UpdateEnvironmentRequest(this);
-      if (environmentBuilder_ == null) {
-        result.environment_ = environment_;
-      } else {
-        result.environment_ = environmentBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
-      }
-      result.allowLoadToDraftAndDiscardChanges_ = allowLoadToDraftAndDiscardChanges_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.UpdateEnvironmentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.environment_ =
+            environmentBuilder_ == null ? environment_ : environmentBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.allowLoadToDraftAndDiscardChanges_ = allowLoadToDraftAndDiscardChanges_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -564,19 +571,19 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getEnvironmentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 allowLoadToDraftAndDiscardChanges_ = input.readBool();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             default:
@@ -596,6 +603,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2beta1.Environment environment_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.Environment,
@@ -616,7 +625,7 @@ public Builder mergeFrom(
      * @return Whether the environment field is set.
      */
     public boolean hasEnvironment() {
-      return environmentBuilder_ != null || environment_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -657,11 +666,11 @@ public Builder setEnvironment(com.google.cloud.dialogflow.v2beta1.Environment va
           throw new NullPointerException();
         }
         environment_ = value;
-        onChanged();
       } else {
         environmentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -679,11 +688,11 @@ public Builder setEnvironment(
         com.google.cloud.dialogflow.v2beta1.Environment.Builder builderForValue) {
       if (environmentBuilder_ == null) {
         environment_ = builderForValue.build();
-        onChanged();
       } else {
         environmentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -699,19 +708,19 @@ public Builder setEnvironment(
      */
     public Builder mergeEnvironment(com.google.cloud.dialogflow.v2beta1.Environment value) {
       if (environmentBuilder_ == null) {
-        if (environment_ != null) {
-          environment_ =
-              com.google.cloud.dialogflow.v2beta1.Environment.newBuilder(environment_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && environment_ != null
+            && environment_
+                != com.google.cloud.dialogflow.v2beta1.Environment.getDefaultInstance()) {
+          getEnvironmentBuilder().mergeFrom(value);
         } else {
           environment_ = value;
         }
-        onChanged();
       } else {
         environmentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -726,14 +735,13 @@ public Builder mergeEnvironment(com.google.cloud.dialogflow.v2beta1.Environment
      * </code>
      */
     public Builder clearEnvironment() {
-      if (environmentBuilder_ == null) {
-        environment_ = null;
-        onChanged();
-      } else {
-        environment_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      environment_ = null;
+      if (environmentBuilder_ != null) {
+        environmentBuilder_.dispose();
         environmentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -748,7 +756,7 @@ public Builder clearEnvironment() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Environment.Builder getEnvironmentBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getEnvironmentFieldBuilder().getBuilder();
     }
@@ -819,7 +827,7 @@ public com.google.cloud.dialogflow.v2beta1.EnvironmentOrBuilder getEnvironmentOr
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -858,11 +866,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -878,11 +886,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -897,17 +905,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -921,14 +930,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -942,7 +950,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
@@ -1033,6 +1041,7 @@ public boolean getAllowLoadToDraftAndDiscardChanges() {
     public Builder setAllowLoadToDraftAndDiscardChanges(boolean value) {
 
       allowLoadToDraftAndDiscardChanges_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1053,7 +1062,7 @@ public Builder setAllowLoadToDraftAndDiscardChanges(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearAllowLoadToDraftAndDiscardChanges() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       allowLoadToDraftAndDiscardChanges_ = false;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateFulfillmentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateFulfillmentRequest.java
index efeb5e51bb47..6099682f5a6c 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateFulfillmentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateFulfillmentRequest.java
@@ -116,7 +116,9 @@ public com.google.cloud.dialogflow.v2beta1.Fulfillment getFulfillment() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.FulfillmentOrBuilder getFulfillmentOrBuilder() {
-    return getFulfillment();
+    return fulfillment_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Fulfillment.getDefaultInstance()
+        : fulfillment_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -168,7 +170,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -388,16 +390,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (fulfillmentBuilder_ == null) {
-        fulfillment_ = null;
-      } else {
-        fulfillment_ = null;
+      bitField0_ = 0;
+      fulfillment_ = null;
+      if (fulfillmentBuilder_ != null) {
+        fulfillmentBuilder_.dispose();
         fulfillmentBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -428,20 +429,25 @@ public com.google.cloud.dialogflow.v2beta1.UpdateFulfillmentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.UpdateFulfillmentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.UpdateFulfillmentRequest result =
           new com.google.cloud.dialogflow.v2beta1.UpdateFulfillmentRequest(this);
-      if (fulfillmentBuilder_ == null) {
-        result.fulfillment_ = fulfillment_;
-      } else {
-        result.fulfillment_ = fulfillmentBuilder_.build();
-      }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.UpdateFulfillmentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.fulfillment_ =
+            fulfillmentBuilder_ == null ? fulfillment_ : fulfillmentBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -524,13 +530,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getFulfillmentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -550,6 +556,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2beta1.Fulfillment fulfillment_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.Fulfillment,
@@ -570,7 +578,7 @@ public Builder mergeFrom(
      * @return Whether the fulfillment field is set.
      */
     public boolean hasFulfillment() {
-      return fulfillmentBuilder_ != null || fulfillment_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -611,11 +619,11 @@ public Builder setFulfillment(com.google.cloud.dialogflow.v2beta1.Fulfillment va
           throw new NullPointerException();
         }
         fulfillment_ = value;
-        onChanged();
       } else {
         fulfillmentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -633,11 +641,11 @@ public Builder setFulfillment(
         com.google.cloud.dialogflow.v2beta1.Fulfillment.Builder builderForValue) {
       if (fulfillmentBuilder_ == null) {
         fulfillment_ = builderForValue.build();
-        onChanged();
       } else {
         fulfillmentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -653,19 +661,19 @@ public Builder setFulfillment(
      */
     public Builder mergeFulfillment(com.google.cloud.dialogflow.v2beta1.Fulfillment value) {
       if (fulfillmentBuilder_ == null) {
-        if (fulfillment_ != null) {
-          fulfillment_ =
-              com.google.cloud.dialogflow.v2beta1.Fulfillment.newBuilder(fulfillment_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && fulfillment_ != null
+            && fulfillment_
+                != com.google.cloud.dialogflow.v2beta1.Fulfillment.getDefaultInstance()) {
+          getFulfillmentBuilder().mergeFrom(value);
         } else {
           fulfillment_ = value;
         }
-        onChanged();
       } else {
         fulfillmentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -680,14 +688,13 @@ public Builder mergeFulfillment(com.google.cloud.dialogflow.v2beta1.Fulfillment
      * </code>
      */
     public Builder clearFulfillment() {
-      if (fulfillmentBuilder_ == null) {
-        fulfillment_ = null;
-        onChanged();
-      } else {
-        fulfillment_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      fulfillment_ = null;
+      if (fulfillmentBuilder_ != null) {
+        fulfillmentBuilder_.dispose();
         fulfillmentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -702,7 +709,7 @@ public Builder clearFulfillment() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Fulfillment.Builder getFulfillmentBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getFulfillmentFieldBuilder().getBuilder();
     }
@@ -774,7 +781,7 @@ public com.google.cloud.dialogflow.v2beta1.FulfillmentOrBuilder getFulfillmentOr
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -815,11 +822,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -836,11 +843,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -856,17 +863,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -881,14 +889,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -903,7 +910,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateIntentRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateIntentRequest.java
index 490f6bebbef3..1e841eb3301e 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateIntentRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateIntentRequest.java
@@ -119,11 +119,15 @@ public com.google.cloud.dialogflow.v2beta1.Intent getIntent() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.IntentOrBuilder getIntentOrBuilder() {
-    return getIntent();
+    return intent_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Intent.getDefaultInstance()
+        : intent_;
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object languageCode_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object languageCode_ = "";
   /**
    *
    *
@@ -222,11 +226,11 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   public static final int INTENT_VIEW_FIELD_NUMBER = 4;
-  private int intentView_;
+  private int intentView_ = 0;
   /**
    *
    *
@@ -255,9 +259,8 @@ public int getIntentViewValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.IntentView getIntentView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.IntentView result =
-        com.google.cloud.dialogflow.v2beta1.IntentView.valueOf(intentView_);
+        com.google.cloud.dialogflow.v2beta1.IntentView.forNumber(intentView_);
     return result == null ? com.google.cloud.dialogflow.v2beta1.IntentView.UNRECOGNIZED : result;
   }
 
@@ -498,22 +501,19 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (intentBuilder_ == null) {
-        intent_ = null;
-      } else {
-        intent_ = null;
+      bitField0_ = 0;
+      intent_ = null;
+      if (intentBuilder_ != null) {
+        intentBuilder_.dispose();
         intentBuilder_ = null;
       }
       languageCode_ = "";
-
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       intentView_ = 0;
-
       return this;
     }
 
@@ -541,22 +541,29 @@ public com.google.cloud.dialogflow.v2beta1.UpdateIntentRequest build() {
     public com.google.cloud.dialogflow.v2beta1.UpdateIntentRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.UpdateIntentRequest result =
           new com.google.cloud.dialogflow.v2beta1.UpdateIntentRequest(this);
-      if (intentBuilder_ == null) {
-        result.intent_ = intent_;
-      } else {
-        result.intent_ = intentBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.languageCode_ = languageCode_;
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
-      }
-      result.intentView_ = intentView_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.UpdateIntentRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.intent_ = intentBuilder_ == null ? intent_ : intentBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.languageCode_ = languageCode_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.intentView_ = intentView_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -608,6 +615,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.UpdateIntentRequest
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasUpdateMask()) {
@@ -645,25 +653,25 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getIntentFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 languageCode_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 32:
               {
                 intentView_ = input.readEnum();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 32
             default:
@@ -683,6 +691,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2beta1.Intent intent_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.Intent,
@@ -703,7 +713,7 @@ public Builder mergeFrom(
      * @return Whether the intent field is set.
      */
     public boolean hasIntent() {
-      return intentBuilder_ != null || intent_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -744,11 +754,11 @@ public Builder setIntent(com.google.cloud.dialogflow.v2beta1.Intent value) {
           throw new NullPointerException();
         }
         intent_ = value;
-        onChanged();
       } else {
         intentBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -765,11 +775,11 @@ public Builder setIntent(com.google.cloud.dialogflow.v2beta1.Intent value) {
     public Builder setIntent(com.google.cloud.dialogflow.v2beta1.Intent.Builder builderForValue) {
       if (intentBuilder_ == null) {
         intent_ = builderForValue.build();
-        onChanged();
       } else {
         intentBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -785,19 +795,18 @@ public Builder setIntent(com.google.cloud.dialogflow.v2beta1.Intent.Builder buil
      */
     public Builder mergeIntent(com.google.cloud.dialogflow.v2beta1.Intent value) {
       if (intentBuilder_ == null) {
-        if (intent_ != null) {
-          intent_ =
-              com.google.cloud.dialogflow.v2beta1.Intent.newBuilder(intent_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && intent_ != null
+            && intent_ != com.google.cloud.dialogflow.v2beta1.Intent.getDefaultInstance()) {
+          getIntentBuilder().mergeFrom(value);
         } else {
           intent_ = value;
         }
-        onChanged();
       } else {
         intentBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -812,14 +821,13 @@ public Builder mergeIntent(com.google.cloud.dialogflow.v2beta1.Intent value) {
      * </code>
      */
     public Builder clearIntent() {
-      if (intentBuilder_ == null) {
-        intent_ = null;
-        onChanged();
-      } else {
-        intent_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      intent_ = null;
+      if (intentBuilder_ != null) {
+        intentBuilder_.dispose();
         intentBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -834,7 +842,7 @@ public Builder clearIntent() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Intent.Builder getIntentBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getIntentFieldBuilder().getBuilder();
     }
@@ -959,8 +967,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -980,8 +988,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
-
       languageCode_ = getDefaultInstance().getLanguageCode();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1006,8 +1014,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       languageCode_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1030,7 +1038,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1067,11 +1075,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1086,11 +1094,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1104,17 +1112,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1127,14 +1136,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * <code>.google.protobuf.FieldMask update_mask = 3;</code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1147,7 +1155,7 @@ public Builder clearUpdateMask() {
      * <code>.google.protobuf.FieldMask update_mask = 3;</code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
@@ -1224,8 +1232,8 @@ public int getIntentViewValue() {
      * @return This builder for chaining.
      */
     public Builder setIntentViewValue(int value) {
-
       intentView_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1242,9 +1250,8 @@ public Builder setIntentViewValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.IntentView getIntentView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.IntentView result =
-          com.google.cloud.dialogflow.v2beta1.IntentView.valueOf(intentView_);
+          com.google.cloud.dialogflow.v2beta1.IntentView.forNumber(intentView_);
       return result == null ? com.google.cloud.dialogflow.v2beta1.IntentView.UNRECOGNIZED : result;
     }
     /**
@@ -1263,7 +1270,7 @@ public Builder setIntentView(com.google.cloud.dialogflow.v2beta1.IntentView valu
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000008;
       intentView_ = value.getNumber();
       onChanged();
       return this;
@@ -1280,7 +1287,7 @@ public Builder setIntentView(com.google.cloud.dialogflow.v2beta1.IntentView valu
      * @return This builder for chaining.
      */
     public Builder clearIntentView() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       intentView_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateKnowledgeBaseRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateKnowledgeBaseRequest.java
index b94330f3333e..52bc6456512c 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateKnowledgeBaseRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateKnowledgeBaseRequest.java
@@ -116,7 +116,9 @@ public com.google.cloud.dialogflow.v2beta1.KnowledgeBase getKnowledgeBase() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.KnowledgeBaseOrBuilder getKnowledgeBaseOrBuilder() {
-    return getKnowledgeBase();
+    return knowledgeBase_ == null
+        ? com.google.cloud.dialogflow.v2beta1.KnowledgeBase.getDefaultInstance()
+        : knowledgeBase_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -171,7 +173,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -391,16 +393,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (knowledgeBaseBuilder_ == null) {
-        knowledgeBase_ = null;
-      } else {
-        knowledgeBase_ = null;
+      bitField0_ = 0;
+      knowledgeBase_ = null;
+      if (knowledgeBaseBuilder_ != null) {
+        knowledgeBaseBuilder_.dispose();
         knowledgeBaseBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -431,20 +432,25 @@ public com.google.cloud.dialogflow.v2beta1.UpdateKnowledgeBaseRequest build() {
     public com.google.cloud.dialogflow.v2beta1.UpdateKnowledgeBaseRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.UpdateKnowledgeBaseRequest result =
           new com.google.cloud.dialogflow.v2beta1.UpdateKnowledgeBaseRequest(this);
-      if (knowledgeBaseBuilder_ == null) {
-        result.knowledgeBase_ = knowledgeBase_;
-      } else {
-        result.knowledgeBase_ = knowledgeBaseBuilder_.build();
-      }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.UpdateKnowledgeBaseRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.knowledgeBase_ =
+            knowledgeBaseBuilder_ == null ? knowledgeBase_ : knowledgeBaseBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -527,13 +533,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getKnowledgeBaseFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -553,6 +559,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2beta1.KnowledgeBase knowledgeBase_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.KnowledgeBase,
@@ -573,7 +581,7 @@ public Builder mergeFrom(
      * @return Whether the knowledgeBase field is set.
      */
     public boolean hasKnowledgeBase() {
-      return knowledgeBaseBuilder_ != null || knowledgeBase_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -614,11 +622,11 @@ public Builder setKnowledgeBase(com.google.cloud.dialogflow.v2beta1.KnowledgeBas
           throw new NullPointerException();
         }
         knowledgeBase_ = value;
-        onChanged();
       } else {
         knowledgeBaseBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -636,11 +644,11 @@ public Builder setKnowledgeBase(
         com.google.cloud.dialogflow.v2beta1.KnowledgeBase.Builder builderForValue) {
       if (knowledgeBaseBuilder_ == null) {
         knowledgeBase_ = builderForValue.build();
-        onChanged();
       } else {
         knowledgeBaseBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -656,19 +664,19 @@ public Builder setKnowledgeBase(
      */
     public Builder mergeKnowledgeBase(com.google.cloud.dialogflow.v2beta1.KnowledgeBase value) {
       if (knowledgeBaseBuilder_ == null) {
-        if (knowledgeBase_ != null) {
-          knowledgeBase_ =
-              com.google.cloud.dialogflow.v2beta1.KnowledgeBase.newBuilder(knowledgeBase_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && knowledgeBase_ != null
+            && knowledgeBase_
+                != com.google.cloud.dialogflow.v2beta1.KnowledgeBase.getDefaultInstance()) {
+          getKnowledgeBaseBuilder().mergeFrom(value);
         } else {
           knowledgeBase_ = value;
         }
-        onChanged();
       } else {
         knowledgeBaseBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -683,14 +691,13 @@ public Builder mergeKnowledgeBase(com.google.cloud.dialogflow.v2beta1.KnowledgeB
      * </code>
      */
     public Builder clearKnowledgeBase() {
-      if (knowledgeBaseBuilder_ == null) {
-        knowledgeBase_ = null;
-        onChanged();
-      } else {
-        knowledgeBase_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      knowledgeBase_ = null;
+      if (knowledgeBaseBuilder_ != null) {
+        knowledgeBaseBuilder_.dispose();
         knowledgeBaseBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -705,7 +712,7 @@ public Builder clearKnowledgeBase() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.KnowledgeBase.Builder getKnowledgeBaseBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getKnowledgeBaseFieldBuilder().getBuilder();
     }
@@ -778,7 +785,7 @@ public com.google.cloud.dialogflow.v2beta1.KnowledgeBaseOrBuilder getKnowledgeBa
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -821,11 +828,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -843,11 +850,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -864,17 +871,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -890,14 +898,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -913,7 +920,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateParticipantRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateParticipantRequest.java
index 531d8f87bbef..1463a7293b50 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateParticipantRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateParticipantRequest.java
@@ -116,7 +116,9 @@ public com.google.cloud.dialogflow.v2beta1.Participant getParticipant() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.ParticipantOrBuilder getParticipantOrBuilder() {
-    return getParticipant();
+    return participant_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Participant.getDefaultInstance()
+        : participant_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -165,7 +167,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -385,16 +387,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (participantBuilder_ == null) {
-        participant_ = null;
-      } else {
-        participant_ = null;
+      bitField0_ = 0;
+      participant_ = null;
+      if (participantBuilder_ != null) {
+        participantBuilder_.dispose();
         participantBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -425,20 +426,25 @@ public com.google.cloud.dialogflow.v2beta1.UpdateParticipantRequest build() {
     public com.google.cloud.dialogflow.v2beta1.UpdateParticipantRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.UpdateParticipantRequest result =
           new com.google.cloud.dialogflow.v2beta1.UpdateParticipantRequest(this);
-      if (participantBuilder_ == null) {
-        result.participant_ = participant_;
-      } else {
-        result.participant_ = participantBuilder_.build();
-      }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.UpdateParticipantRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.participant_ =
+            participantBuilder_ == null ? participant_ : participantBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -521,13 +527,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getParticipantFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -547,6 +553,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2beta1.Participant participant_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.Participant,
@@ -567,7 +575,7 @@ public Builder mergeFrom(
      * @return Whether the participant field is set.
      */
     public boolean hasParticipant() {
-      return participantBuilder_ != null || participant_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -608,11 +616,11 @@ public Builder setParticipant(com.google.cloud.dialogflow.v2beta1.Participant va
           throw new NullPointerException();
         }
         participant_ = value;
-        onChanged();
       } else {
         participantBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -630,11 +638,11 @@ public Builder setParticipant(
         com.google.cloud.dialogflow.v2beta1.Participant.Builder builderForValue) {
       if (participantBuilder_ == null) {
         participant_ = builderForValue.build();
-        onChanged();
       } else {
         participantBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -650,19 +658,19 @@ public Builder setParticipant(
      */
     public Builder mergeParticipant(com.google.cloud.dialogflow.v2beta1.Participant value) {
       if (participantBuilder_ == null) {
-        if (participant_ != null) {
-          participant_ =
-              com.google.cloud.dialogflow.v2beta1.Participant.newBuilder(participant_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && participant_ != null
+            && participant_
+                != com.google.cloud.dialogflow.v2beta1.Participant.getDefaultInstance()) {
+          getParticipantBuilder().mergeFrom(value);
         } else {
           participant_ = value;
         }
-        onChanged();
       } else {
         participantBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -677,14 +685,13 @@ public Builder mergeParticipant(com.google.cloud.dialogflow.v2beta1.Participant
      * </code>
      */
     public Builder clearParticipant() {
-      if (participantBuilder_ == null) {
-        participant_ = null;
-        onChanged();
-      } else {
-        participant_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      participant_ = null;
+      if (participantBuilder_ != null) {
+        participantBuilder_.dispose();
         participantBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -699,7 +706,7 @@ public Builder clearParticipant() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Participant.Builder getParticipantBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getParticipantFieldBuilder().getBuilder();
     }
@@ -770,7 +777,7 @@ public com.google.cloud.dialogflow.v2beta1.ParticipantOrBuilder getParticipantOr
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -809,11 +816,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -829,11 +836,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -848,17 +855,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -872,14 +880,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -893,7 +900,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateSessionEntityTypeRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateSessionEntityTypeRequest.java
index 6f7b368f844f..fa7cd72ea8f9 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateSessionEntityTypeRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateSessionEntityTypeRequest.java
@@ -118,7 +118,9 @@ public com.google.cloud.dialogflow.v2beta1.SessionEntityType getSessionEntityTyp
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.SessionEntityTypeOrBuilder
       getSessionEntityTypeOrBuilder() {
-    return getSessionEntityType();
+    return sessionEntityType_ == null
+        ? com.google.cloud.dialogflow.v2beta1.SessionEntityType.getDefaultInstance()
+        : sessionEntityType_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -164,7 +166,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -386,16 +388,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (sessionEntityTypeBuilder_ == null) {
-        sessionEntityType_ = null;
-      } else {
-        sessionEntityType_ = null;
+      bitField0_ = 0;
+      sessionEntityType_ = null;
+      if (sessionEntityTypeBuilder_ != null) {
+        sessionEntityTypeBuilder_.dispose();
         sessionEntityTypeBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -427,20 +428,27 @@ public com.google.cloud.dialogflow.v2beta1.UpdateSessionEntityTypeRequest build(
     public com.google.cloud.dialogflow.v2beta1.UpdateSessionEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.UpdateSessionEntityTypeRequest result =
           new com.google.cloud.dialogflow.v2beta1.UpdateSessionEntityTypeRequest(this);
-      if (sessionEntityTypeBuilder_ == null) {
-        result.sessionEntityType_ = sessionEntityType_;
-      } else {
-        result.sessionEntityType_ = sessionEntityTypeBuilder_.build();
-      }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.cloud.dialogflow.v2beta1.UpdateSessionEntityTypeRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.sessionEntityType_ =
+            sessionEntityTypeBuilder_ == null
+                ? sessionEntityType_
+                : sessionEntityTypeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -526,13 +534,13 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getSessionEntityTypeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -552,6 +560,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2beta1.SessionEntityType sessionEntityType_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.SessionEntityType,
@@ -572,7 +582,7 @@ public Builder mergeFrom(
      * @return Whether the sessionEntityType field is set.
      */
     public boolean hasSessionEntityType() {
-      return sessionEntityTypeBuilder_ != null || sessionEntityType_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -614,11 +624,11 @@ public Builder setSessionEntityType(
           throw new NullPointerException();
         }
         sessionEntityType_ = value;
-        onChanged();
       } else {
         sessionEntityTypeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -636,11 +646,11 @@ public Builder setSessionEntityType(
         com.google.cloud.dialogflow.v2beta1.SessionEntityType.Builder builderForValue) {
       if (sessionEntityTypeBuilder_ == null) {
         sessionEntityType_ = builderForValue.build();
-        onChanged();
       } else {
         sessionEntityTypeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -657,19 +667,19 @@ public Builder setSessionEntityType(
     public Builder mergeSessionEntityType(
         com.google.cloud.dialogflow.v2beta1.SessionEntityType value) {
       if (sessionEntityTypeBuilder_ == null) {
-        if (sessionEntityType_ != null) {
-          sessionEntityType_ =
-              com.google.cloud.dialogflow.v2beta1.SessionEntityType.newBuilder(sessionEntityType_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && sessionEntityType_ != null
+            && sessionEntityType_
+                != com.google.cloud.dialogflow.v2beta1.SessionEntityType.getDefaultInstance()) {
+          getSessionEntityTypeBuilder().mergeFrom(value);
         } else {
           sessionEntityType_ = value;
         }
-        onChanged();
       } else {
         sessionEntityTypeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -684,14 +694,13 @@ public Builder mergeSessionEntityType(
      * </code>
      */
     public Builder clearSessionEntityType() {
-      if (sessionEntityTypeBuilder_ == null) {
-        sessionEntityType_ = null;
-        onChanged();
-      } else {
-        sessionEntityType_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      sessionEntityType_ = null;
+      if (sessionEntityTypeBuilder_ != null) {
+        sessionEntityTypeBuilder_.dispose();
         sessionEntityTypeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -707,7 +716,7 @@ public Builder clearSessionEntityType() {
      */
     public com.google.cloud.dialogflow.v2beta1.SessionEntityType.Builder
         getSessionEntityTypeBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getSessionEntityTypeFieldBuilder().getBuilder();
     }
@@ -778,7 +787,7 @@ public Builder clearSessionEntityType() {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -815,11 +824,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -834,11 +843,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -852,17 +861,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -875,14 +885,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * <code>.google.protobuf.FieldMask update_mask = 2;</code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -895,7 +904,7 @@ public Builder clearUpdateMask() {
      * <code>.google.protobuf.FieldMask update_mask = 2;</code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateVersionRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateVersionRequest.java
index cebe2eabef8a..068263716f5e 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateVersionRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateVersionRequest.java
@@ -128,7 +128,9 @@ public com.google.cloud.dialogflow.v2beta1.Version getVersion() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.VersionOrBuilder getVersionOrBuilder() {
-    return getVersion();
+    return version_ == null
+        ? com.google.cloud.dialogflow.v2beta1.Version.getDefaultInstance()
+        : version_;
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -177,7 +179,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return getUpdateMask();
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -397,16 +399,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (versionBuilder_ == null) {
-        version_ = null;
-      } else {
-        version_ = null;
+      bitField0_ = 0;
+      version_ = null;
+      if (versionBuilder_ != null) {
+        versionBuilder_.dispose();
         versionBuilder_ = null;
       }
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-      } else {
-        updateMask_ = null;
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
       return this;
@@ -436,20 +437,23 @@ public com.google.cloud.dialogflow.v2beta1.UpdateVersionRequest build() {
     public com.google.cloud.dialogflow.v2beta1.UpdateVersionRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.UpdateVersionRequest result =
           new com.google.cloud.dialogflow.v2beta1.UpdateVersionRequest(this);
-      if (versionBuilder_ == null) {
-        result.version_ = version_;
-      } else {
-        result.version_ = versionBuilder_.build();
-      }
-      if (updateMaskBuilder_ == null) {
-        result.updateMask_ = updateMask_;
-      } else {
-        result.updateMask_ = updateMaskBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.UpdateVersionRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.version_ = versionBuilder_ == null ? version_ : versionBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -531,13 +535,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getVersionFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -557,6 +561,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.cloud.dialogflow.v2beta1.Version version_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.Version,
@@ -581,7 +587,7 @@ public Builder mergeFrom(
      * @return Whether the version field is set.
      */
     public boolean hasVersion() {
-      return versionBuilder_ != null || version_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -630,11 +636,11 @@ public Builder setVersion(com.google.cloud.dialogflow.v2beta1.Version value) {
           throw new NullPointerException();
         }
         version_ = value;
-        onChanged();
       } else {
         versionBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -655,11 +661,11 @@ public Builder setVersion(com.google.cloud.dialogflow.v2beta1.Version value) {
     public Builder setVersion(com.google.cloud.dialogflow.v2beta1.Version.Builder builderForValue) {
       if (versionBuilder_ == null) {
         version_ = builderForValue.build();
-        onChanged();
       } else {
         versionBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -679,19 +685,18 @@ public Builder setVersion(com.google.cloud.dialogflow.v2beta1.Version.Builder bu
      */
     public Builder mergeVersion(com.google.cloud.dialogflow.v2beta1.Version value) {
       if (versionBuilder_ == null) {
-        if (version_ != null) {
-          version_ =
-              com.google.cloud.dialogflow.v2beta1.Version.newBuilder(version_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && version_ != null
+            && version_ != com.google.cloud.dialogflow.v2beta1.Version.getDefaultInstance()) {
+          getVersionBuilder().mergeFrom(value);
         } else {
           version_ = value;
         }
-        onChanged();
       } else {
         versionBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -710,14 +715,13 @@ public Builder mergeVersion(com.google.cloud.dialogflow.v2beta1.Version value) {
      * </code>
      */
     public Builder clearVersion() {
-      if (versionBuilder_ == null) {
-        version_ = null;
-        onChanged();
-      } else {
-        version_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      version_ = null;
+      if (versionBuilder_ != null) {
+        versionBuilder_.dispose();
         versionBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -736,7 +740,7 @@ public Builder clearVersion() {
      * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Version.Builder getVersionBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getVersionFieldBuilder().getBuilder();
     }
@@ -815,7 +819,7 @@ public com.google.cloud.dialogflow.v2beta1.VersionOrBuilder getVersionOrBuilder(
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return updateMaskBuilder_ != null || updateMask_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -854,11 +858,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -874,11 +878,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
-        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -893,17 +897,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (updateMask_ != null) {
-          updateMask_ =
-              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && updateMask_ != null
+            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
+          getUpdateMaskBuilder().mergeFrom(value);
         } else {
           updateMask_ = value;
         }
-        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -917,14 +922,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * </code>
      */
     public Builder clearUpdateMask() {
-      if (updateMaskBuilder_ == null) {
-        updateMask_ = null;
-        onChanged();
-      } else {
-        updateMask_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      updateMask_ = null;
+      if (updateMaskBuilder_ != null) {
+        updateMaskBuilder_.dispose();
         updateMaskBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -938,7 +942,7 @@ public Builder clearUpdateMask() {
      * </code>
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ValidationError.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ValidationError.java
index a39a0b577bf1..a7c83ecb5782 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ValidationError.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ValidationError.java
@@ -273,7 +273,7 @@ private Severity(int value) {
   }
 
   public static final int SEVERITY_FIELD_NUMBER = 1;
-  private int severity_;
+  private int severity_ = 0;
   /**
    *
    *
@@ -302,15 +302,16 @@ public int getSeverityValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.ValidationError.Severity getSeverity() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.ValidationError.Severity result =
-        com.google.cloud.dialogflow.v2beta1.ValidationError.Severity.valueOf(severity_);
+        com.google.cloud.dialogflow.v2beta1.ValidationError.Severity.forNumber(severity_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.ValidationError.Severity.UNRECOGNIZED
         : result;
   }
 
   public static final int ENTRIES_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringList entries_;
   /**
    *
@@ -420,7 +421,9 @@ public com.google.protobuf.ByteString getEntriesBytes(int index) {
   }
 
   public static final int ERROR_MESSAGE_FIELD_NUMBER = 4;
-  private volatile java.lang.Object errorMessage_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object errorMessage_ = "";
   /**
    *
    *
@@ -694,12 +697,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       severity_ = 0;
-
       entries_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       errorMessage_ = "";
-
       return this;
     }
 
@@ -727,18 +729,33 @@ public com.google.cloud.dialogflow.v2beta1.ValidationError build() {
     public com.google.cloud.dialogflow.v2beta1.ValidationError buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ValidationError result =
           new com.google.cloud.dialogflow.v2beta1.ValidationError(this);
-      int from_bitField0_ = bitField0_;
-      result.severity_ = severity_;
-      if (((bitField0_ & 0x00000001) != 0)) {
-        entries_ = entries_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000001);
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.entries_ = entries_;
-      result.errorMessage_ = errorMessage_;
       onBuilt();
       return result;
     }
 
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.ValidationError result) {
+      if (((bitField0_ & 0x00000002) != 0)) {
+        entries_ = entries_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000002);
+      }
+      result.entries_ = entries_;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ValidationError result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.severity_ = severity_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.errorMessage_ = errorMessage_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -791,7 +808,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ValidationError oth
       if (!other.entries_.isEmpty()) {
         if (entries_.isEmpty()) {
           entries_ = other.entries_;
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureEntriesIsMutable();
           entries_.addAll(other.entries_);
@@ -800,6 +817,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.ValidationError oth
       }
       if (!other.getErrorMessage().isEmpty()) {
         errorMessage_ = other.errorMessage_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -831,7 +849,7 @@ public Builder mergeFrom(
             case 8:
               {
                 severity_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 26:
@@ -844,7 +862,7 @@ public Builder mergeFrom(
             case 34:
               {
                 errorMessage_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 34
             default:
@@ -895,8 +913,8 @@ public int getSeverityValue() {
      * @return This builder for chaining.
      */
     public Builder setSeverityValue(int value) {
-
       severity_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -913,9 +931,8 @@ public Builder setSeverityValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.ValidationError.Severity getSeverity() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.ValidationError.Severity result =
-          com.google.cloud.dialogflow.v2beta1.ValidationError.Severity.valueOf(severity_);
+          com.google.cloud.dialogflow.v2beta1.ValidationError.Severity.forNumber(severity_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.ValidationError.Severity.UNRECOGNIZED
           : result;
@@ -936,7 +953,7 @@ public Builder setSeverity(com.google.cloud.dialogflow.v2beta1.ValidationError.S
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       severity_ = value.getNumber();
       onChanged();
       return this;
@@ -953,7 +970,7 @@ public Builder setSeverity(com.google.cloud.dialogflow.v2beta1.ValidationError.S
      * @return This builder for chaining.
      */
     public Builder clearSeverity() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       severity_ = 0;
       onChanged();
       return this;
@@ -963,9 +980,9 @@ public Builder clearSeverity() {
         com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureEntriesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         entries_ = new com.google.protobuf.LazyStringArrayList(entries_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
     /**
@@ -1196,7 +1213,7 @@ public Builder addAllEntries(java.lang.Iterable<java.lang.String> values) {
      */
     public Builder clearEntries() {
       entries_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1296,8 +1313,8 @@ public Builder setErrorMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       errorMessage_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1313,8 +1330,8 @@ public Builder setErrorMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearErrorMessage() {
-
       errorMessage_ = getDefaultInstance().getErrorMessage();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1335,8 +1352,8 @@ public Builder setErrorMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       errorMessage_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ValidationResult.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ValidationResult.java
index 655ef6bd61ca..20925323a44a 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ValidationResult.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ValidationResult.java
@@ -68,6 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int VALIDATION_ERRORS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.ValidationError> validationErrors_;
   /**
    *
@@ -337,6 +339,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (validationErrorsBuilder_ == null) {
         validationErrors_ = java.util.Collections.emptyList();
       } else {
@@ -371,7 +374,16 @@ public com.google.cloud.dialogflow.v2beta1.ValidationResult build() {
     public com.google.cloud.dialogflow.v2beta1.ValidationResult buildPartial() {
       com.google.cloud.dialogflow.v2beta1.ValidationResult result =
           new com.google.cloud.dialogflow.v2beta1.ValidationResult(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.ValidationResult result) {
       if (validationErrorsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           validationErrors_ = java.util.Collections.unmodifiableList(validationErrors_);
@@ -381,8 +393,10 @@ public com.google.cloud.dialogflow.v2beta1.ValidationResult buildPartial() {
       } else {
         result.validationErrors_ = validationErrorsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.ValidationResult result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Version.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Version.java
index 51081e3b0461..e748b1a4e65d 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Version.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Version.java
@@ -262,7 +262,9 @@ private VersionStatus(int value) {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -319,7 +321,9 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 2;
-  private volatile java.lang.Object description_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object description_ = "";
   /**
    *
    *
@@ -368,7 +372,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
   }
 
   public static final int VERSION_NUMBER_FIELD_NUMBER = 3;
-  private int versionNumber_;
+  private int versionNumber_ = 0;
   /**
    *
    *
@@ -435,11 +439,11 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
 
   public static final int STATUS_FIELD_NUMBER = 6;
-  private int status_;
+  private int status_ = 0;
   /**
    *
    *
@@ -474,9 +478,8 @@ public int getStatusValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.Version.VersionStatus getStatus() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.Version.VersionStatus result =
-        com.google.cloud.dialogflow.v2beta1.Version.VersionStatus.valueOf(status_);
+        com.google.cloud.dialogflow.v2beta1.Version.VersionStatus.forNumber(status_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.Version.VersionStatus.UNRECOGNIZED
         : result;
@@ -737,20 +740,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       description_ = "";
-
       versionNumber_ = 0;
-
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
       status_ = 0;
-
       return this;
     }
 
@@ -778,19 +777,32 @@ public com.google.cloud.dialogflow.v2beta1.Version build() {
     public com.google.cloud.dialogflow.v2beta1.Version buildPartial() {
       com.google.cloud.dialogflow.v2beta1.Version result =
           new com.google.cloud.dialogflow.v2beta1.Version(this);
-      result.name_ = name_;
-      result.description_ = description_;
-      result.versionNumber_ = versionNumber_;
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.status_ = status_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.Version result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.description_ = description_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.versionNumber_ = versionNumber_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.status_ = status_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -838,10 +850,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.Version other) {
       if (other == com.google.cloud.dialogflow.v2beta1.Version.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getVersionNumber() != 0) {
@@ -882,31 +896,31 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 description_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 versionNumber_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 34:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 48:
               {
                 status_ = input.readEnum();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 48
             default:
@@ -926,6 +940,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -999,8 +1015,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1020,8 +1036,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1046,8 +1062,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1113,8 +1129,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       description_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1130,8 +1146,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
-
       description_ = getDefaultInstance().getDescription();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1152,8 +1168,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       description_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1191,6 +1207,7 @@ public int getVersionNumber() {
     public Builder setVersionNumber(int value) {
 
       versionNumber_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1207,7 +1224,7 @@ public Builder setVersionNumber(int value) {
      * @return This builder for chaining.
      */
     public Builder clearVersionNumber() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       versionNumber_ = 0;
       onChanged();
       return this;
@@ -1234,7 +1251,7 @@ public Builder clearVersionNumber() {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1277,11 +1294,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1299,11 +1316,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
-        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1320,17 +1337,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
         } else {
           createTime_ = value;
         }
-        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1346,14 +1364,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * </code>
      */
     public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
         createTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1369,7 +1386,7 @@ public Builder clearCreateTime() {
      * </code>
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
@@ -1458,8 +1475,8 @@ public int getStatusValue() {
      * @return This builder for chaining.
      */
     public Builder setStatusValue(int value) {
-
       status_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1479,9 +1496,8 @@ public Builder setStatusValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.Version.VersionStatus getStatus() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.Version.VersionStatus result =
-          com.google.cloud.dialogflow.v2beta1.Version.VersionStatus.valueOf(status_);
+          com.google.cloud.dialogflow.v2beta1.Version.VersionStatus.forNumber(status_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.Version.VersionStatus.UNRECOGNIZED
           : result;
@@ -1505,7 +1521,7 @@ public Builder setStatus(com.google.cloud.dialogflow.v2beta1.Version.VersionStat
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000010;
       status_ = value.getNumber();
       onChanged();
       return this;
@@ -1525,7 +1541,7 @@ public Builder setStatus(com.google.cloud.dialogflow.v2beta1.Version.VersionStat
      * @return This builder for chaining.
      */
     public Builder clearStatus() {
-
+      bitField0_ = (bitField0_ & ~0x00000010);
       status_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/VoiceSelectionParams.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/VoiceSelectionParams.java
index a9411318e2fd..01848187a718 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/VoiceSelectionParams.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/VoiceSelectionParams.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -126,7 +128,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int SSML_GENDER_FIELD_NUMBER = 2;
-  private int ssmlGender_;
+  private int ssmlGender_ = 0;
   /**
    *
    *
@@ -165,9 +167,8 @@ public int getSsmlGenderValue() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.SsmlVoiceGender getSsmlGender() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2beta1.SsmlVoiceGender result =
-        com.google.cloud.dialogflow.v2beta1.SsmlVoiceGender.valueOf(ssmlGender_);
+        com.google.cloud.dialogflow.v2beta1.SsmlVoiceGender.forNumber(ssmlGender_);
     return result == null
         ? com.google.cloud.dialogflow.v2beta1.SsmlVoiceGender.UNRECOGNIZED
         : result;
@@ -384,10 +385,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       ssmlGender_ = 0;
-
       return this;
     }
 
@@ -415,12 +415,23 @@ public com.google.cloud.dialogflow.v2beta1.VoiceSelectionParams build() {
     public com.google.cloud.dialogflow.v2beta1.VoiceSelectionParams buildPartial() {
       com.google.cloud.dialogflow.v2beta1.VoiceSelectionParams result =
           new com.google.cloud.dialogflow.v2beta1.VoiceSelectionParams(this);
-      result.name_ = name_;
-      result.ssmlGender_ = ssmlGender_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.VoiceSelectionParams result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.ssmlGender_ = ssmlGender_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -469,6 +480,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.VoiceSelectionParam
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.ssmlGender_ != 0) {
@@ -503,13 +515,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 ssmlGender_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             default:
@@ -529,6 +541,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -602,8 +616,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -623,8 +637,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -649,8 +663,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -694,8 +708,8 @@ public int getSsmlGenderValue() {
      * @return This builder for chaining.
      */
     public Builder setSsmlGenderValue(int value) {
-
       ssmlGender_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -717,9 +731,8 @@ public Builder setSsmlGenderValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.dialogflow.v2beta1.SsmlVoiceGender getSsmlGender() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2beta1.SsmlVoiceGender result =
-          com.google.cloud.dialogflow.v2beta1.SsmlVoiceGender.valueOf(ssmlGender_);
+          com.google.cloud.dialogflow.v2beta1.SsmlVoiceGender.forNumber(ssmlGender_);
       return result == null
           ? com.google.cloud.dialogflow.v2beta1.SsmlVoiceGender.UNRECOGNIZED
           : result;
@@ -745,7 +758,7 @@ public Builder setSsmlGender(com.google.cloud.dialogflow.v2beta1.SsmlVoiceGender
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       ssmlGender_ = value.getNumber();
       onChanged();
       return this;
@@ -767,7 +780,7 @@ public Builder setSsmlGender(com.google.cloud.dialogflow.v2beta1.SsmlVoiceGender
      * @return This builder for chaining.
      */
     public Builder clearSsmlGender() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       ssmlGender_ = 0;
       onChanged();
       return this;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookRequest.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookRequest.java
index e7d274165a92..97db0008f5a6 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookRequest.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookRequest.java
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SESSION_FIELD_NUMBER = 4;
-  private volatile java.lang.Object session_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object session_ = "";
   /**
    *
    *
@@ -139,7 +141,9 @@ public com.google.protobuf.ByteString getSessionBytes() {
   }
 
   public static final int RESPONSE_ID_FIELD_NUMBER = 1;
-  private volatile java.lang.Object responseId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object responseId_ = "";
   /**
    *
    *
@@ -237,10 +241,14 @@ public com.google.cloud.dialogflow.v2beta1.QueryResult getQueryResult() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.QueryResultOrBuilder getQueryResultOrBuilder() {
-    return getQueryResult();
+    return queryResult_ == null
+        ? com.google.cloud.dialogflow.v2beta1.QueryResult.getDefaultInstance()
+        : queryResult_;
   }
 
   public static final int ALTERNATIVE_QUERY_RESULTS_FIELD_NUMBER = 5;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.QueryResult> alternativeQueryResults_;
   /**
    *
@@ -373,7 +381,9 @@ public boolean hasOriginalDetectIntentRequest() {
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.OriginalDetectIntentRequestOrBuilder
       getOriginalDetectIntentRequestOrBuilder() {
-    return getOriginalDetectIntentRequest();
+    return originalDetectIntentRequest_ == null
+        ? com.google.cloud.dialogflow.v2beta1.OriginalDetectIntentRequest.getDefaultInstance()
+        : originalDetectIntentRequest_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -627,14 +637,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       session_ = "";
-
       responseId_ = "";
-
-      if (queryResultBuilder_ == null) {
-        queryResult_ = null;
-      } else {
-        queryResult_ = null;
+      queryResult_ = null;
+      if (queryResultBuilder_ != null) {
+        queryResultBuilder_.dispose();
         queryResultBuilder_ = null;
       }
       if (alternativeQueryResultsBuilder_ == null) {
@@ -643,11 +651,10 @@ public Builder clear() {
         alternativeQueryResults_ = null;
         alternativeQueryResultsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
-      if (originalDetectIntentRequestBuilder_ == null) {
-        originalDetectIntentRequest_ = null;
-      } else {
-        originalDetectIntentRequest_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      originalDetectIntentRequest_ = null;
+      if (originalDetectIntentRequestBuilder_ != null) {
+        originalDetectIntentRequestBuilder_.dispose();
         originalDetectIntentRequestBuilder_ = null;
       }
       return this;
@@ -677,31 +684,46 @@ public com.google.cloud.dialogflow.v2beta1.WebhookRequest build() {
     public com.google.cloud.dialogflow.v2beta1.WebhookRequest buildPartial() {
       com.google.cloud.dialogflow.v2beta1.WebhookRequest result =
           new com.google.cloud.dialogflow.v2beta1.WebhookRequest(this);
-      int from_bitField0_ = bitField0_;
-      result.session_ = session_;
-      result.responseId_ = responseId_;
-      if (queryResultBuilder_ == null) {
-        result.queryResult_ = queryResult_;
-      } else {
-        result.queryResult_ = queryResultBuilder_.build();
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.WebhookRequest result) {
       if (alternativeQueryResultsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000008) != 0)) {
           alternativeQueryResults_ =
               java.util.Collections.unmodifiableList(alternativeQueryResults_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000008);
         }
         result.alternativeQueryResults_ = alternativeQueryResults_;
       } else {
         result.alternativeQueryResults_ = alternativeQueryResultsBuilder_.build();
       }
-      if (originalDetectIntentRequestBuilder_ == null) {
-        result.originalDetectIntentRequest_ = originalDetectIntentRequest_;
-      } else {
-        result.originalDetectIntentRequest_ = originalDetectIntentRequestBuilder_.build();
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.WebhookRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.session_ = session_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.responseId_ = responseId_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.queryResult_ =
+            queryResultBuilder_ == null ? queryResult_ : queryResultBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.originalDetectIntentRequest_ =
+            originalDetectIntentRequestBuilder_ == null
+                ? originalDetectIntentRequest_
+                : originalDetectIntentRequestBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -752,10 +774,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.WebhookRequest othe
         return this;
       if (!other.getSession().isEmpty()) {
         session_ = other.session_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getResponseId().isEmpty()) {
         responseId_ = other.responseId_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasQueryResult()) {
@@ -765,7 +789,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.WebhookRequest othe
         if (!other.alternativeQueryResults_.isEmpty()) {
           if (alternativeQueryResults_.isEmpty()) {
             alternativeQueryResults_ = other.alternativeQueryResults_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000008);
           } else {
             ensureAlternativeQueryResultsIsMutable();
             alternativeQueryResults_.addAll(other.alternativeQueryResults_);
@@ -778,7 +802,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.WebhookRequest othe
             alternativeQueryResultsBuilder_.dispose();
             alternativeQueryResultsBuilder_ = null;
             alternativeQueryResults_ = other.alternativeQueryResults_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000008);
             alternativeQueryResultsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getAlternativeQueryResultsFieldBuilder()
@@ -820,26 +844,26 @@ public Builder mergeFrom(
             case 10:
               {
                 responseId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getQueryResultFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(
                     getOriginalDetectIntentRequestFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 26
             case 34:
               {
                 session_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 34
             case 42:
@@ -966,8 +990,8 @@ public Builder setSession(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       session_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -993,8 +1017,8 @@ public Builder setSession(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSession() {
-
       session_ = getDefaultInstance().getSession();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1025,8 +1049,8 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       session_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1095,8 +1119,8 @@ public Builder setResponseId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       responseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1113,8 +1137,8 @@ public Builder setResponseId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearResponseId() {
-
       responseId_ = getDefaultInstance().getResponseId();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1136,8 +1160,8 @@ public Builder setResponseIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       responseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1161,7 +1185,7 @@ public Builder setResponseIdBytes(com.google.protobuf.ByteString value) {
      * @return Whether the queryResult field is set.
      */
     public boolean hasQueryResult() {
-      return queryResultBuilder_ != null || queryResult_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1200,11 +1224,11 @@ public Builder setQueryResult(com.google.cloud.dialogflow.v2beta1.QueryResult va
           throw new NullPointerException();
         }
         queryResult_ = value;
-        onChanged();
       } else {
         queryResultBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1221,11 +1245,11 @@ public Builder setQueryResult(
         com.google.cloud.dialogflow.v2beta1.QueryResult.Builder builderForValue) {
       if (queryResultBuilder_ == null) {
         queryResult_ = builderForValue.build();
-        onChanged();
       } else {
         queryResultBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1240,19 +1264,19 @@ public Builder setQueryResult(
      */
     public Builder mergeQueryResult(com.google.cloud.dialogflow.v2beta1.QueryResult value) {
       if (queryResultBuilder_ == null) {
-        if (queryResult_ != null) {
-          queryResult_ =
-              com.google.cloud.dialogflow.v2beta1.QueryResult.newBuilder(queryResult_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && queryResult_ != null
+            && queryResult_
+                != com.google.cloud.dialogflow.v2beta1.QueryResult.getDefaultInstance()) {
+          getQueryResultBuilder().mergeFrom(value);
         } else {
           queryResult_ = value;
         }
-        onChanged();
       } else {
         queryResultBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1266,14 +1290,13 @@ public Builder mergeQueryResult(com.google.cloud.dialogflow.v2beta1.QueryResult
      * <code>.google.cloud.dialogflow.v2beta1.QueryResult query_result = 2;</code>
      */
     public Builder clearQueryResult() {
-      if (queryResultBuilder_ == null) {
-        queryResult_ = null;
-        onChanged();
-      } else {
-        queryResult_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      queryResult_ = null;
+      if (queryResultBuilder_ != null) {
+        queryResultBuilder_.dispose();
         queryResultBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1287,7 +1310,7 @@ public Builder clearQueryResult() {
      * <code>.google.cloud.dialogflow.v2beta1.QueryResult query_result = 2;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.QueryResult.Builder getQueryResultBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getQueryResultFieldBuilder().getBuilder();
     }
@@ -1341,11 +1364,11 @@ public com.google.cloud.dialogflow.v2beta1.QueryResultOrBuilder getQueryResultOr
         alternativeQueryResults_ = java.util.Collections.emptyList();
 
     private void ensureAlternativeQueryResultsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         alternativeQueryResults_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.QueryResult>(
                 alternativeQueryResults_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000008;
       }
     }
 
@@ -1576,7 +1599,7 @@ public Builder addAllAlternativeQueryResults(
     public Builder clearAlternativeQueryResults() {
       if (alternativeQueryResultsBuilder_ == null) {
         alternativeQueryResults_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
       } else {
         alternativeQueryResultsBuilder_.clear();
@@ -1710,7 +1733,7 @@ public Builder removeAlternativeQueryResults(int index) {
                 com.google.cloud.dialogflow.v2beta1.QueryResult.Builder,
                 com.google.cloud.dialogflow.v2beta1.QueryResultOrBuilder>(
                 alternativeQueryResults_,
-                ((bitField0_ & 0x00000001) != 0),
+                ((bitField0_ & 0x00000008) != 0),
                 getParentForChildren(),
                 isClean());
         alternativeQueryResults_ = null;
@@ -1740,7 +1763,7 @@ public Builder removeAlternativeQueryResults(int index) {
      * @return Whether the originalDetectIntentRequest field is set.
      */
     public boolean hasOriginalDetectIntentRequest() {
-      return originalDetectIntentRequestBuilder_ != null || originalDetectIntentRequest_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -1785,11 +1808,11 @@ public Builder setOriginalDetectIntentRequest(
           throw new NullPointerException();
         }
         originalDetectIntentRequest_ = value;
-        onChanged();
       } else {
         originalDetectIntentRequestBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1808,11 +1831,11 @@ public Builder setOriginalDetectIntentRequest(
         com.google.cloud.dialogflow.v2beta1.OriginalDetectIntentRequest.Builder builderForValue) {
       if (originalDetectIntentRequestBuilder_ == null) {
         originalDetectIntentRequest_ = builderForValue.build();
-        onChanged();
       } else {
         originalDetectIntentRequestBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1830,20 +1853,20 @@ public Builder setOriginalDetectIntentRequest(
     public Builder mergeOriginalDetectIntentRequest(
         com.google.cloud.dialogflow.v2beta1.OriginalDetectIntentRequest value) {
       if (originalDetectIntentRequestBuilder_ == null) {
-        if (originalDetectIntentRequest_ != null) {
-          originalDetectIntentRequest_ =
-              com.google.cloud.dialogflow.v2beta1.OriginalDetectIntentRequest.newBuilder(
-                      originalDetectIntentRequest_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && originalDetectIntentRequest_ != null
+            && originalDetectIntentRequest_
+                != com.google.cloud.dialogflow.v2beta1.OriginalDetectIntentRequest
+                    .getDefaultInstance()) {
+          getOriginalDetectIntentRequestBuilder().mergeFrom(value);
         } else {
           originalDetectIntentRequest_ = value;
         }
-        onChanged();
       } else {
         originalDetectIntentRequestBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -1859,14 +1882,13 @@ public Builder mergeOriginalDetectIntentRequest(
      * </code>
      */
     public Builder clearOriginalDetectIntentRequest() {
-      if (originalDetectIntentRequestBuilder_ == null) {
-        originalDetectIntentRequest_ = null;
-        onChanged();
-      } else {
-        originalDetectIntentRequest_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      originalDetectIntentRequest_ = null;
+      if (originalDetectIntentRequestBuilder_ != null) {
+        originalDetectIntentRequestBuilder_.dispose();
         originalDetectIntentRequestBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1883,7 +1905,7 @@ public Builder clearOriginalDetectIntentRequest() {
      */
     public com.google.cloud.dialogflow.v2beta1.OriginalDetectIntentRequest.Builder
         getOriginalDetectIntentRequestBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getOriginalDetectIntentRequestFieldBuilder().getBuilder();
     }
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookResponse.java b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookResponse.java
index 9ec3f61cd901..1569c4eeff98 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookResponse.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookResponse.java
@@ -82,7 +82,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int FULFILLMENT_TEXT_FIELD_NUMBER = 1;
-  private volatile java.lang.Object fulfillmentText_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object fulfillmentText_ = "";
   /**
    *
    *
@@ -137,6 +139,8 @@ public com.google.protobuf.ByteString getFulfillmentTextBytes() {
   }
 
   public static final int FULFILLMENT_MESSAGES_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Intent.Message> fulfillmentMessages_;
   /**
    *
@@ -218,7 +222,9 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message getFulfillmentMessages
   }
 
   public static final int SOURCE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object source_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object source_ = "";
   /**
    *
    *
@@ -342,10 +348,12 @@ public com.google.protobuf.Struct getPayload() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() {
-    return getPayload();
+    return payload_ == null ? com.google.protobuf.Struct.getDefaultInstance() : payload_;
   }
 
   public static final int OUTPUT_CONTEXTS_FIELD_NUMBER = 5;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.Context> outputContexts_;
   /**
    *
@@ -481,11 +489,13 @@ public com.google.cloud.dialogflow.v2beta1.EventInput getFollowupEventInput() {
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.EventInputOrBuilder getFollowupEventInputOrBuilder() {
-    return getFollowupEventInput();
+    return followupEventInput_ == null
+        ? com.google.cloud.dialogflow.v2beta1.EventInput.getDefaultInstance()
+        : followupEventInput_;
   }
 
   public static final int LIVE_AGENT_HANDOFF_FIELD_NUMBER = 7;
-  private boolean liveAgentHandoff_;
+  private boolean liveAgentHandoff_ = false;
   /**
    *
    *
@@ -506,7 +516,7 @@ public boolean getLiveAgentHandoff() {
   }
 
   public static final int END_INTERACTION_FIELD_NUMBER = 8;
-  private boolean endInteraction_;
+  private boolean endInteraction_ = false;
   /**
    *
    *
@@ -526,6 +536,8 @@ public boolean getEndInteraction() {
   }
 
   public static final int SESSION_ENTITY_TYPES_FIELD_NUMBER = 10;
+
+  @SuppressWarnings("serial")
   private java.util.List<com.google.cloud.dialogflow.v2beta1.SessionEntityType> sessionEntityTypes_;
   /**
    *
@@ -918,21 +930,19 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       fulfillmentText_ = "";
-
       if (fulfillmentMessagesBuilder_ == null) {
         fulfillmentMessages_ = java.util.Collections.emptyList();
       } else {
         fulfillmentMessages_ = null;
         fulfillmentMessagesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       source_ = "";
-
-      if (payloadBuilder_ == null) {
-        payload_ = null;
-      } else {
-        payload_ = null;
+      payload_ = null;
+      if (payloadBuilder_ != null) {
+        payloadBuilder_.dispose();
         payloadBuilder_ = null;
       }
       if (outputContextsBuilder_ == null) {
@@ -941,24 +951,21 @@ public Builder clear() {
         outputContexts_ = null;
         outputContextsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
-      if (followupEventInputBuilder_ == null) {
-        followupEventInput_ = null;
-      } else {
-        followupEventInput_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      followupEventInput_ = null;
+      if (followupEventInputBuilder_ != null) {
+        followupEventInputBuilder_.dispose();
         followupEventInputBuilder_ = null;
       }
       liveAgentHandoff_ = false;
-
       endInteraction_ = false;
-
       if (sessionEntityTypesBuilder_ == null) {
         sessionEntityTypes_ = java.util.Collections.emptyList();
       } else {
         sessionEntityTypes_ = null;
         sessionEntityTypesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000004);
+      bitField0_ = (bitField0_ & ~0x00000100);
       return this;
     }
 
@@ -986,50 +993,68 @@ public com.google.cloud.dialogflow.v2beta1.WebhookResponse build() {
     public com.google.cloud.dialogflow.v2beta1.WebhookResponse buildPartial() {
       com.google.cloud.dialogflow.v2beta1.WebhookResponse result =
           new com.google.cloud.dialogflow.v2beta1.WebhookResponse(this);
-      int from_bitField0_ = bitField0_;
-      result.fulfillmentText_ = fulfillmentText_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.cloud.dialogflow.v2beta1.WebhookResponse result) {
       if (fulfillmentMessagesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           fulfillmentMessages_ = java.util.Collections.unmodifiableList(fulfillmentMessages_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.fulfillmentMessages_ = fulfillmentMessages_;
       } else {
         result.fulfillmentMessages_ = fulfillmentMessagesBuilder_.build();
       }
-      result.source_ = source_;
-      if (payloadBuilder_ == null) {
-        result.payload_ = payload_;
-      } else {
-        result.payload_ = payloadBuilder_.build();
-      }
       if (outputContextsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000010) != 0)) {
           outputContexts_ = java.util.Collections.unmodifiableList(outputContexts_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000010);
         }
         result.outputContexts_ = outputContexts_;
       } else {
         result.outputContexts_ = outputContextsBuilder_.build();
       }
-      if (followupEventInputBuilder_ == null) {
-        result.followupEventInput_ = followupEventInput_;
-      } else {
-        result.followupEventInput_ = followupEventInputBuilder_.build();
-      }
-      result.liveAgentHandoff_ = liveAgentHandoff_;
-      result.endInteraction_ = endInteraction_;
       if (sessionEntityTypesBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)) {
+        if (((bitField0_ & 0x00000100) != 0)) {
           sessionEntityTypes_ = java.util.Collections.unmodifiableList(sessionEntityTypes_);
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000100);
         }
         result.sessionEntityTypes_ = sessionEntityTypes_;
       } else {
         result.sessionEntityTypes_ = sessionEntityTypesBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.cloud.dialogflow.v2beta1.WebhookResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.fulfillmentText_ = fulfillmentText_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.source_ = source_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.payload_ = payloadBuilder_ == null ? payload_ : payloadBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.followupEventInput_ =
+            followupEventInputBuilder_ == null
+                ? followupEventInput_
+                : followupEventInputBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.liveAgentHandoff_ = liveAgentHandoff_;
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.endInteraction_ = endInteraction_;
+      }
     }
 
     @java.lang.Override
@@ -1080,13 +1105,14 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.WebhookResponse oth
         return this;
       if (!other.getFulfillmentText().isEmpty()) {
         fulfillmentText_ = other.fulfillmentText_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (fulfillmentMessagesBuilder_ == null) {
         if (!other.fulfillmentMessages_.isEmpty()) {
           if (fulfillmentMessages_.isEmpty()) {
             fulfillmentMessages_ = other.fulfillmentMessages_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureFulfillmentMessagesIsMutable();
             fulfillmentMessages_.addAll(other.fulfillmentMessages_);
@@ -1099,7 +1125,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.WebhookResponse oth
             fulfillmentMessagesBuilder_.dispose();
             fulfillmentMessagesBuilder_ = null;
             fulfillmentMessages_ = other.fulfillmentMessages_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             fulfillmentMessagesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getFulfillmentMessagesFieldBuilder()
@@ -1111,6 +1137,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.WebhookResponse oth
       }
       if (!other.getSource().isEmpty()) {
         source_ = other.source_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.hasPayload()) {
@@ -1120,7 +1147,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.WebhookResponse oth
         if (!other.outputContexts_.isEmpty()) {
           if (outputContexts_.isEmpty()) {
             outputContexts_ = other.outputContexts_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
             ensureOutputContextsIsMutable();
             outputContexts_.addAll(other.outputContexts_);
@@ -1133,7 +1160,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.WebhookResponse oth
             outputContextsBuilder_.dispose();
             outputContextsBuilder_ = null;
             outputContexts_ = other.outputContexts_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000010);
             outputContextsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getOutputContextsFieldBuilder()
@@ -1156,7 +1183,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.WebhookResponse oth
         if (!other.sessionEntityTypes_.isEmpty()) {
           if (sessionEntityTypes_.isEmpty()) {
             sessionEntityTypes_ = other.sessionEntityTypes_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000100);
           } else {
             ensureSessionEntityTypesIsMutable();
             sessionEntityTypes_.addAll(other.sessionEntityTypes_);
@@ -1169,7 +1196,7 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.WebhookResponse oth
             sessionEntityTypesBuilder_.dispose();
             sessionEntityTypesBuilder_ = null;
             sessionEntityTypes_ = other.sessionEntityTypes_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000100);
             sessionEntityTypesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getSessionEntityTypesFieldBuilder()
@@ -1208,7 +1235,7 @@ public Builder mergeFrom(
             case 10:
               {
                 fulfillmentText_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -1228,13 +1255,13 @@ public Builder mergeFrom(
             case 26:
               {
                 source_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(getPayloadFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 42:
@@ -1254,19 +1281,19 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getFollowupEventInputFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 50
             case 56:
               {
                 liveAgentHandoff_ = input.readBool();
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 56
             case 64:
               {
                 endInteraction_ = input.readBool();
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 64
             case 82:
@@ -1372,8 +1399,8 @@ public Builder setFulfillmentText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       fulfillmentText_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1392,8 +1419,8 @@ public Builder setFulfillmentText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFulfillmentText() {
-
       fulfillmentText_ = getDefaultInstance().getFulfillmentText();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1417,8 +1444,8 @@ public Builder setFulfillmentTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       fulfillmentText_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1427,11 +1454,11 @@ public Builder setFulfillmentTextBytes(com.google.protobuf.ByteString value) {
         fulfillmentMessages_ = java.util.Collections.emptyList();
 
     private void ensureFulfillmentMessagesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         fulfillmentMessages_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.Intent.Message>(
                 fulfillmentMessages_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -1684,7 +1711,7 @@ public Builder addAllFulfillmentMessages(
     public Builder clearFulfillmentMessages() {
       if (fulfillmentMessagesBuilder_ == null) {
         fulfillmentMessages_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         fulfillmentMessagesBuilder_.clear();
@@ -1833,7 +1860,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Builder addFulfillment
                 com.google.cloud.dialogflow.v2beta1.Intent.Message.Builder,
                 com.google.cloud.dialogflow.v2beta1.Intent.MessageOrBuilder>(
                 fulfillmentMessages_,
-                ((bitField0_ & 0x00000001) != 0),
+                ((bitField0_ & 0x00000002) != 0),
                 getParentForChildren(),
                 isClean());
         fulfillmentMessages_ = null;
@@ -1911,8 +1938,8 @@ public Builder setSource(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       source_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1931,8 +1958,8 @@ public Builder setSource(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSource() {
-
       source_ = getDefaultInstance().getSource();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1956,8 +1983,8 @@ public Builder setSourceBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       source_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1989,7 +2016,7 @@ public Builder setSourceBytes(com.google.protobuf.ByteString value) {
      * @return Whether the payload field is set.
      */
     public boolean hasPayload() {
-      return payloadBuilder_ != null || payload_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -2042,11 +2069,11 @@ public Builder setPayload(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         payload_ = value;
-        onChanged();
       } else {
         payloadBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -2070,11 +2097,11 @@ public Builder setPayload(com.google.protobuf.Struct value) {
     public Builder setPayload(com.google.protobuf.Struct.Builder builderForValue) {
       if (payloadBuilder_ == null) {
         payload_ = builderForValue.build();
-        onChanged();
       } else {
         payloadBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -2097,17 +2124,18 @@ public Builder setPayload(com.google.protobuf.Struct.Builder builderForValue) {
      */
     public Builder mergePayload(com.google.protobuf.Struct value) {
       if (payloadBuilder_ == null) {
-        if (payload_ != null) {
-          payload_ =
-              com.google.protobuf.Struct.newBuilder(payload_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && payload_ != null
+            && payload_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getPayloadBuilder().mergeFrom(value);
         } else {
           payload_ = value;
         }
-        onChanged();
       } else {
         payloadBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -2129,14 +2157,13 @@ public Builder mergePayload(com.google.protobuf.Struct value) {
      * <code>.google.protobuf.Struct payload = 4;</code>
      */
     public Builder clearPayload() {
-      if (payloadBuilder_ == null) {
-        payload_ = null;
-        onChanged();
-      } else {
-        payload_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      payload_ = null;
+      if (payloadBuilder_ != null) {
+        payloadBuilder_.dispose();
         payloadBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2158,7 +2185,7 @@ public Builder clearPayload() {
      * <code>.google.protobuf.Struct payload = 4;</code>
      */
     public com.google.protobuf.Struct.Builder getPayloadBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getPayloadFieldBuilder().getBuilder();
     }
@@ -2226,10 +2253,10 @@ public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() {
         java.util.Collections.emptyList();
 
     private void ensureOutputContextsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         outputContexts_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.Context>(outputContexts_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000010;
       }
     }
 
@@ -2478,7 +2505,7 @@ public Builder addAllOutputContexts(
     public Builder clearOutputContexts() {
       if (outputContextsBuilder_ == null) {
         outputContexts_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
       } else {
         outputContextsBuilder_.clear();
@@ -2623,7 +2650,7 @@ public com.google.cloud.dialogflow.v2beta1.Context.Builder addOutputContextsBuil
                 com.google.cloud.dialogflow.v2beta1.Context.Builder,
                 com.google.cloud.dialogflow.v2beta1.ContextOrBuilder>(
                 outputContexts_,
-                ((bitField0_ & 0x00000002) != 0),
+                ((bitField0_ & 0x00000010) != 0),
                 getParentForChildren(),
                 isClean());
         outputContexts_ = null;
@@ -2651,7 +2678,7 @@ public com.google.cloud.dialogflow.v2beta1.Context.Builder addOutputContextsBuil
      * @return Whether the followupEventInput field is set.
      */
     public boolean hasFollowupEventInput() {
-      return followupEventInputBuilder_ != null || followupEventInput_ != null;
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      *
@@ -2692,11 +2719,11 @@ public Builder setFollowupEventInput(com.google.cloud.dialogflow.v2beta1.EventIn
           throw new NullPointerException();
         }
         followupEventInput_ = value;
-        onChanged();
       } else {
         followupEventInputBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2714,11 +2741,11 @@ public Builder setFollowupEventInput(
         com.google.cloud.dialogflow.v2beta1.EventInput.Builder builderForValue) {
       if (followupEventInputBuilder_ == null) {
         followupEventInput_ = builderForValue.build();
-        onChanged();
       } else {
         followupEventInputBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2734,19 +2761,19 @@ public Builder setFollowupEventInput(
      */
     public Builder mergeFollowupEventInput(com.google.cloud.dialogflow.v2beta1.EventInput value) {
       if (followupEventInputBuilder_ == null) {
-        if (followupEventInput_ != null) {
-          followupEventInput_ =
-              com.google.cloud.dialogflow.v2beta1.EventInput.newBuilder(followupEventInput_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000020) != 0)
+            && followupEventInput_ != null
+            && followupEventInput_
+                != com.google.cloud.dialogflow.v2beta1.EventInput.getDefaultInstance()) {
+          getFollowupEventInputBuilder().mergeFrom(value);
         } else {
           followupEventInput_ = value;
         }
-        onChanged();
       } else {
         followupEventInputBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000020;
+      onChanged();
       return this;
     }
     /**
@@ -2761,14 +2788,13 @@ public Builder mergeFollowupEventInput(com.google.cloud.dialogflow.v2beta1.Event
      * <code>.google.cloud.dialogflow.v2beta1.EventInput followup_event_input = 6;</code>
      */
     public Builder clearFollowupEventInput() {
-      if (followupEventInputBuilder_ == null) {
-        followupEventInput_ = null;
-        onChanged();
-      } else {
-        followupEventInput_ = null;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      followupEventInput_ = null;
+      if (followupEventInputBuilder_ != null) {
+        followupEventInputBuilder_.dispose();
         followupEventInputBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2783,7 +2809,7 @@ public Builder clearFollowupEventInput() {
      * <code>.google.cloud.dialogflow.v2beta1.EventInput followup_event_input = 6;</code>
      */
     public com.google.cloud.dialogflow.v2beta1.EventInput.Builder getFollowupEventInputBuilder() {
-
+      bitField0_ |= 0x00000020;
       onChanged();
       return getFollowupEventInputFieldBuilder().getBuilder();
     }
@@ -2873,6 +2899,7 @@ public boolean getLiveAgentHandoff() {
     public Builder setLiveAgentHandoff(boolean value) {
 
       liveAgentHandoff_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2891,7 +2918,7 @@ public Builder setLiveAgentHandoff(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearLiveAgentHandoff() {
-
+      bitField0_ = (bitField0_ & ~0x00000040);
       liveAgentHandoff_ = false;
       onChanged();
       return this;
@@ -2932,6 +2959,7 @@ public boolean getEndInteraction() {
     public Builder setEndInteraction(boolean value) {
 
       endInteraction_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2949,7 +2977,7 @@ public Builder setEndInteraction(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearEndInteraction() {
-
+      bitField0_ = (bitField0_ & ~0x00000080);
       endInteraction_ = false;
       onChanged();
       return this;
@@ -2959,11 +2987,11 @@ public Builder clearEndInteraction() {
         sessionEntityTypes_ = java.util.Collections.emptyList();
 
     private void ensureSessionEntityTypesIsMutable() {
-      if (!((bitField0_ & 0x00000004) != 0)) {
+      if (!((bitField0_ & 0x00000100) != 0)) {
         sessionEntityTypes_ =
             new java.util.ArrayList<com.google.cloud.dialogflow.v2beta1.SessionEntityType>(
                 sessionEntityTypes_);
-        bitField0_ |= 0x00000004;
+        bitField0_ |= 0x00000100;
       }
     }
 
@@ -3239,7 +3267,7 @@ public Builder addAllSessionEntityTypes(
     public Builder clearSessionEntityTypes() {
       if (sessionEntityTypesBuilder_ == null) {
         sessionEntityTypes_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000100);
         onChanged();
       } else {
         sessionEntityTypesBuilder_.clear();
@@ -3402,7 +3430,7 @@ public Builder removeSessionEntityTypes(int index) {
                 com.google.cloud.dialogflow.v2beta1.SessionEntityType.Builder,
                 com.google.cloud.dialogflow.v2beta1.SessionEntityTypeOrBuilder>(
                 sessionEntityTypes_,
-                ((bitField0_ & 0x00000004) != 0),
+                ((bitField0_ & 0x00000100) != 0),
                 getParentForChildren(),
                 isClean());
         sessionEntityTypes_ = null;
diff --git a/java-dialogflow/samples/snippets/generated/com/google/cloud/dialogflow/v2/conversations/suggestconversationsummary/AsyncSuggestConversationSummary.java b/java-dialogflow/samples/snippets/generated/com/google/cloud/dialogflow/v2/conversations/suggestconversationsummary/AsyncSuggestConversationSummary.java
new file mode 100644
index 000000000000..9ff0d3356a2a
--- /dev/null
+++ b/java-dialogflow/samples/snippets/generated/com/google/cloud/dialogflow/v2/conversations/suggestconversationsummary/AsyncSuggestConversationSummary.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.dialogflow.v2.samples;
+
+// [START dialogflow_v2_generated_Conversations_SuggestConversationSummary_async]
+import com.google.api.core.ApiFuture;
+import com.google.cloud.dialogflow.v2.ConversationName;
+import com.google.cloud.dialogflow.v2.ConversationsClient;
+import com.google.cloud.dialogflow.v2.MessageName;
+import com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest;
+import com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse;
+
+public class AsyncSuggestConversationSummary {
+
+  public static void main(String[] args) throws Exception {
+    asyncSuggestConversationSummary();
+  }
+
+  public static void asyncSuggestConversationSummary() throws Exception {
+    // This snippet has been automatically generated and should be regarded as a code template only.
+    // It will require modifications to work:
+    // - It may require correct/in-range values for request initialization.
+    // - It may require specifying regional endpoints when creating the service client as shown in
+    // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+    try (ConversationsClient conversationsClient = ConversationsClient.create()) {
+      SuggestConversationSummaryRequest request =
+          SuggestConversationSummaryRequest.newBuilder()
+              .setConversation(
+                  ConversationName.ofProjectConversationName("[PROJECT]", "[CONVERSATION]")
+                      .toString())
+              .setLatestMessage(
+                  MessageName.ofProjectConversationMessageName(
+                          "[PROJECT]", "[CONVERSATION]", "[MESSAGE]")
+                      .toString())
+              .setContextSize(1116903569)
+              .build();
+      ApiFuture<SuggestConversationSummaryResponse> future =
+          conversationsClient.suggestConversationSummaryCallable().futureCall(request);
+      // Do something.
+      SuggestConversationSummaryResponse response = future.get();
+    }
+  }
+}
+// [END dialogflow_v2_generated_Conversations_SuggestConversationSummary_async]
diff --git a/java-dialogflow/samples/snippets/generated/com/google/cloud/dialogflow/v2/conversations/suggestconversationsummary/SyncSuggestConversationSummary.java b/java-dialogflow/samples/snippets/generated/com/google/cloud/dialogflow/v2/conversations/suggestconversationsummary/SyncSuggestConversationSummary.java
new file mode 100644
index 000000000000..8871be08f031
--- /dev/null
+++ b/java-dialogflow/samples/snippets/generated/com/google/cloud/dialogflow/v2/conversations/suggestconversationsummary/SyncSuggestConversationSummary.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.dialogflow.v2.samples;
+
+// [START dialogflow_v2_generated_Conversations_SuggestConversationSummary_sync]
+import com.google.cloud.dialogflow.v2.ConversationName;
+import com.google.cloud.dialogflow.v2.ConversationsClient;
+import com.google.cloud.dialogflow.v2.MessageName;
+import com.google.cloud.dialogflow.v2.SuggestConversationSummaryRequest;
+import com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse;
+
+public class SyncSuggestConversationSummary {
+
+  public static void main(String[] args) throws Exception {
+    syncSuggestConversationSummary();
+  }
+
+  public static void syncSuggestConversationSummary() throws Exception {
+    // This snippet has been automatically generated and should be regarded as a code template only.
+    // It will require modifications to work:
+    // - It may require correct/in-range values for request initialization.
+    // - It may require specifying regional endpoints when creating the service client as shown in
+    // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+    try (ConversationsClient conversationsClient = ConversationsClient.create()) {
+      SuggestConversationSummaryRequest request =
+          SuggestConversationSummaryRequest.newBuilder()
+              .setConversation(
+                  ConversationName.ofProjectConversationName("[PROJECT]", "[CONVERSATION]")
+                      .toString())
+              .setLatestMessage(
+                  MessageName.ofProjectConversationMessageName(
+                          "[PROJECT]", "[CONVERSATION]", "[MESSAGE]")
+                      .toString())
+              .setContextSize(1116903569)
+              .build();
+      SuggestConversationSummaryResponse response =
+          conversationsClient.suggestConversationSummary(request);
+    }
+  }
+}
+// [END dialogflow_v2_generated_Conversations_SuggestConversationSummary_sync]
diff --git a/java-dialogflow/samples/snippets/generated/com/google/cloud/dialogflow/v2/conversations/suggestconversationsummary/SyncSuggestConversationSummaryConversationname.java b/java-dialogflow/samples/snippets/generated/com/google/cloud/dialogflow/v2/conversations/suggestconversationsummary/SyncSuggestConversationSummaryConversationname.java
new file mode 100644
index 000000000000..1384d787ef4f
--- /dev/null
+++ b/java-dialogflow/samples/snippets/generated/com/google/cloud/dialogflow/v2/conversations/suggestconversationsummary/SyncSuggestConversationSummaryConversationname.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.dialogflow.v2.samples;
+
+// [START dialogflow_v2_generated_Conversations_SuggestConversationSummary_Conversationname_sync]
+import com.google.cloud.dialogflow.v2.ConversationName;
+import com.google.cloud.dialogflow.v2.ConversationsClient;
+import com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse;
+
+public class SyncSuggestConversationSummaryConversationname {
+
+  public static void main(String[] args) throws Exception {
+    syncSuggestConversationSummaryConversationname();
+  }
+
+  public static void syncSuggestConversationSummaryConversationname() throws Exception {
+    // This snippet has been automatically generated and should be regarded as a code template only.
+    // It will require modifications to work:
+    // - It may require correct/in-range values for request initialization.
+    // - It may require specifying regional endpoints when creating the service client as shown in
+    // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+    try (ConversationsClient conversationsClient = ConversationsClient.create()) {
+      ConversationName conversation =
+          ConversationName.ofProjectConversationName("[PROJECT]", "[CONVERSATION]");
+      SuggestConversationSummaryResponse response =
+          conversationsClient.suggestConversationSummary(conversation);
+    }
+  }
+}
+// [END dialogflow_v2_generated_Conversations_SuggestConversationSummary_Conversationname_sync]
diff --git a/java-dialogflow/samples/snippets/generated/com/google/cloud/dialogflow/v2/conversations/suggestconversationsummary/SyncSuggestConversationSummaryString.java b/java-dialogflow/samples/snippets/generated/com/google/cloud/dialogflow/v2/conversations/suggestconversationsummary/SyncSuggestConversationSummaryString.java
new file mode 100644
index 000000000000..bd7517990c96
--- /dev/null
+++ b/java-dialogflow/samples/snippets/generated/com/google/cloud/dialogflow/v2/conversations/suggestconversationsummary/SyncSuggestConversationSummaryString.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.dialogflow.v2.samples;
+
+// [START dialogflow_v2_generated_Conversations_SuggestConversationSummary_String_sync]
+import com.google.cloud.dialogflow.v2.ConversationName;
+import com.google.cloud.dialogflow.v2.ConversationsClient;
+import com.google.cloud.dialogflow.v2.SuggestConversationSummaryResponse;
+
+public class SyncSuggestConversationSummaryString {
+
+  public static void main(String[] args) throws Exception {
+    syncSuggestConversationSummaryString();
+  }
+
+  public static void syncSuggestConversationSummaryString() throws Exception {
+    // This snippet has been automatically generated and should be regarded as a code template only.
+    // It will require modifications to work:
+    // - It may require correct/in-range values for request initialization.
+    // - It may require specifying regional endpoints when creating the service client as shown in
+    // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+    try (ConversationsClient conversationsClient = ConversationsClient.create()) {
+      String conversation =
+          ConversationName.ofProjectConversationName("[PROJECT]", "[CONVERSATION]").toString();
+      SuggestConversationSummaryResponse response =
+          conversationsClient.suggestConversationSummary(conversation);
+    }
+  }
+}
+// [END dialogflow_v2_generated_Conversations_SuggestConversationSummary_String_sync]